Modified to get current geolocation