Added some helper functions'
Committing merged file
Fixed merge conflicts