MOD: imporved the geolocator