upgraded to 3.5 and added geoloction