Incorporated first round of feedback.