Newer upload method. Small changes on map.