Works with geolocation now