final changes for geolocation