Changes from branch2. Added comment
Merged with branch2