changes according to Dominic's notes