More work on map