PR #2 feedback.