Updated - geolocation commented