More implemenation  especially geolocation