Add more flags in comments