Removing of old with editing added
Merged