Changes from feedback.