Changes according Brian review notes