Changes based on first round of feedback from Connie Woodhouse.