move to new flag value system.