actually actually actually add flags support