Revised calculations