changes per PR comments