changes according to review