location related code changes