Completely switched to new calculation approach