storing changes
Persistance fix
Fixing some merge conflicts