Have the map like we want