Got most of the geolocation back in