Uncommented the map section