Some changes in calculations.