version-2

Contains the changes and comments