Rework the way Number is handle in the Units