Updating per PR review