Calculation improvement