started unified flag table adaptation