removed conservation calculation from calculations.