Addressed Caroline's comments, round 1