Pull updateLocation into Listeners