modified map saver
merge conflicts