Further work on map