Changes according to review