work on map code