Updated calculators