Improved geolocation