updated CommentManager