geolocation rework