Version 2

Finished comments