Changes according to review feedback