Updates based on feedback from Peter in progress