able to properly update location - refactor still needed