fixed geolocator and Entrance model