updated version working on geocoder