Integrated changes with a check on the request to check for location