Added comment count switch