Small Changes to Calculation