Changed per PR review