make changes according to comments