more work on geolocation