working on map again