Almost done.

Modified