Pre geocoder commit