Geolocation Improved