Added updateLocation