Changes based on feedback from Alan