Now drawing the map correctly