Point #1

Modified