Modified Comment.class