Calculation controller changes