UPDATED calculations are now working.