Changed how calculations are determined.