move NOTZ out of branches