Further work on the map