another flag update (still WIP)