Calculation should include savings from