Reordered unit fields