changes according to  mentor's feedback