updating according to comments