Continuing work on map