Added Geolocation and Simple Imput