more work on map