changes per PR review.