Changed lat/long to location