Use new flag for getting unit status