Working on map upgrade