more restructuring of the unit system