Working on the separation of accrual and deferral