make changes acc. to comments