Added some local changes
Fixing merging