Made changes based on Derek's first round of feedback.