Addressing CR feedback.