making modifications according to comments