commented and updated
Merged