Changes according review notes