re-adding map changes to master