changes to CommentWS