misc: change to new flag variable