changed from locations to lat/long