Addressing some feedback.