Updated flags
Merge