Changed updateLocation (tested as working)