Saving before merging with Tamas' new version