Some of the changes after feedback from Jaqueline