Changes according Dominic review notes