update location handling
update location handling