- huge revamp of cashflow model