Updated costs, added discounting, fuel escalation