Updates based on feedback from Jerome