changes according to ms review