Updated flags to allow for removed flags