Changes according the review notes