Changes based on feedback from Sara