refactoring and commenting out location updates
refactoring and commenting out location 2