Reorder calcul elements, to be more representative of the reality.