New version of the map maker