Added updating location (untested)