ZH2006Swiss 4th review, added units and tau flags