I added comments to each function..
Fixing merge conflict