@hyperscale0/hsx 3.1.0 → 3.3.0

package/std/collections.hsx

@@ -1,8 +1,9 @@
 header collections
 
 instrument case(on: ref<financing.installments>[], agency: approval, overdue: duration = 3d, fee: percent = 20%) {
+  revisioned: true
   summary: "Refer an overdue installment without creating another debt."
-  fields { plan: ref<on>, slice: ref<on.slice>, payment: ref<on.payment>, eligibleAt: date = after(self.slice.dueAt, overdue), agencyFee: money = rate(self.payment.amount, fee) }
+  fields { assignedAgency: account of agency, plan: ref<on>, slice: ref<on.slice>, payment: ref<on.payment>, eligibleAt: date = after(self.slice.dueAt, overdue), agencyFee: money = rate(self.payment.amount, fee) }
   lifecycle { states: [opened, assigned, recovered, recalled, returned_uncollected], initial: opened }
   action create {
     due: { at: self.eligibleAt }
@@ -11,7 +12,7 @@ instrument case(on: ref<financing.installments>[], agency: approval, overdue: du
     requires unique "overdue_referral" on [self.slice]
   }
   action assign { from: opened, to: assigned, requires approval by agency }
-  action recover { from: assigned, to: recovered, actor: { party: agency }, requires self.payment.plan == self.plan, invoke: [{ reference: self.payment, action: pay, input: {} }, { reference: self.id, action: pay_fee, input: {} }] }
+  action recover { expansionLimit: 8192, from: assigned, to: recovered, actor: { party: agency }, requires self.payment.plan == self.plan, invoke: [{ reference: self.payment, action: pay, input: {} }, { reference: self.id, action: pay_fee, input: {} }] }
   action pay_fee { from: recovered, to: recovered, actor: { parent: current() }, moves self.agencyFee from self.plan.capital to agency }
   action recall { from: [opened, assigned], to: recalled }
   action return_uncollected { from: assigned, to: returned_uncollected, actor: { party: agency } }
@@ -20,12 +21,52 @@ instrument case(on: ref<financing.installments>[], agency: approval, overdue: du
 instrument contact(case: ref<collections.case>[], agency: party, max_contacts: integer = 10, window: duration = 30d, contact_from: integer(0, 23) = 8, contact_until: integer(1, 23) = 20, timezone: text = "Asia/Riyadh") {
   constraints { contact_from: less_than(contact_until) }
   summary: "An agency contact admitted against the locked rolling count and local hours."
-  fields { case: ref<case>, attemptedAt: date?, evidence: text, maximum: integer = max_contacts }
+  fields { agency: account of agency, case: ref<case>, attemptedAt: date?, evidence: text, maximum: integer = max_contacts }
   lifecycle { states: [recorded], initial: recorded }
   invariants count of { instrument: current(), reference: "case", anchor: self.case, states: [recorded], limit: 366, window: { field: attemptedAt, milliseconds: window } } <= self.maximum
   action create {
     actor: { party: agency }
     set: { attemptedAt: { field: self.now } }
-    requires self.case in [assigned]; requires hours self.now between contact_from and contact_until timezone timezone
+    requires self.agency == self.case.assignedAgency; requires self.case in [assigned]; requires hours self.now between contact_from and contact_until timezone timezone
+  }
+  records {
+    outcome: {
+      fields { contact: ref<parent>, agency: account of agency, outcome: enum(reached, no_answer, promise_to_pay, disputed, wrong_contact, refused), evidence: text, recordedAt: date? }
+      lifecycle { states: [recorded], initial: recorded }
+      action create {
+        actor: { party: agency }
+        requires self.agency == self.contact.case.assignedAgency
+        set: { recordedAt: { field: self.now } }
+      }
+    }
+  }
+}
+
+
+instrument reminder(on: ref<financing.installments>[], operator: party = programOperator, before_days: integer(0, 366) = 3, overdue_days: integer(1, 366) = 1, max_per_day: integer(1, 10) = 1, send_from: integer(0, 23) = 8, send_until: integer(1, 24) = 20, timezone: text = "Asia/Riyadh") {
+  constraints { send_from: less_than(send_until) }
+  summary: "Send an email to the installment borrower's stored contact address."
+  fields { slice: ref<on.slice> }
+  lifecycle { states: [ready], initial: ready }
+  action create { requires unique "installment_reminder" on [self.slice] }
+  action dispatch {
+    from: ready, to: ready, actor: { party: operator }
+    invoke: [{ reference: self.id, action: send, input: {} }]
+  }
+  action before_due {
+    from: ready, to: ready, actor: clock
+    due: { at: self.slice.dueAt, localDay: { days: before_days, direction: "before", hour: send_from, timezone: timezone } }
+    invoke: [{ selection: { instrument: current(), reference: "slice", anchor: self.slice, states: [ready], limit: 1, where: { slice.plan.status: { literal: "active" } } }, action: send, guard: { kind: compare, left: { field: self.slice.principalReceivable.balance }, operator: ">", right: { literal: "0" } }, input: {} }]
+  }
+  action overdue {
+    from: ready, to: ready, actor: clock
+    due: { at: self.slice.dueAt, localDay: { days: overdue_days, direction: "after", hour: send_from, timezone: timezone } }
+    invoke: [{ selection: { instrument: current(), reference: "slice", anchor: self.slice, states: [ready], limit: 1, where: { slice.plan.status: { literal: "active" } } }, action: send, guard: { kind: compare, left: { field: self.slice.principalReceivable.balance }, operator: ">", right: { literal: "0" } }, input: {} }]
+  }
+  action send {
+    from: ready, to: ready, actor: { parent: current() }
+    requires self.slice.plan in [active]
+    requires self.slice.principalReceivable.balance > "0"
+    reminder: { installment: self.slice, recipient: self.slice.plan.borrower, dueAt: self.slice.dueAt, channel: "email", template: "payment_reminder", beforeDays: before_days, overdueDays: overdue_days, maxPerDay: max_per_day, startHour: send_from, endHour: send_until, timezone: timezone }
   }
 }

package/std/escrow.hsx

@@ -1,20 +1,27 @@
 header escrow
 
 instrument hold(payer: party, payee: party, for: ref<marketplace.order>, accept_within: duration = 48h, fee: fee = { seller: 0%, tax: 0% }, dispute: policy = { refund_after: return_verified }) {
+  revisioned: true
   summary: "Hold an order's price through delivery, acceptance and verified return."
-  fields { payer: account of payer, payee: account of payee, order: ref<for>, price: money, held: account of self, deliveredAt: date? }
+  fields { payer: account of payer, payee: account of payee, order: ref<for>, price: money, held: account of self, deliveredAt: date?, buyerTopUp: money? }
   lifecycle { states: [pending, funded, delivered, disputed, return_verified, released, refunded, cancelled], initial: pending }
   action create {
     requires self.payer == self.order.buyer; requires self.payee == self.order.listing.seller; requires self.price == self.order.price
   }
   action fund {
     from: pending, to: funded, actor: { party: payer }
-    requires self.order in [placed]
-    moves self.price from payer to self.held
+    requires self.order in [quoted, placed]
+    invoke: [{ reference: self.order, action: commit, input: {} }, { selection: { instrument: all(marketplace.reservation), reference: "listing", anchor: self.order.listing, states: [active], limit: 1, where: { buyer: { field: self.payer } } }, action: credit, input: { funds: { field: self.id }, contribution: { field: self.price } } }, { reference: self.id, action: fund_remainder, input: {} }]
+  }
+  action fund_remainder {
+    from: funded, to: funded, actor: { parent: current() }
+    calculate: [{ target: buyerTopUp, op: subtract, base: { field: self.price }, subtract: [{ field: self.held.balance }] }]
+    moves self.buyerTopUp from payer to self.held
   }
   action confirm {
     from: pending, to: funded
     requires self.held.balance == self.price
+    invoke: [{ reference: self.order, action: commit, input: {} }]
   }
   action deliver {
     from: funded, to: delivered, actor: { party: payee }

package/std/financing.hsx

@@ -1,12 +1,13 @@
 header financing
 
-instrument installments(months: integer(1, 366), profit: percent, disburse_to: enum(funds, borrower) = funds, profit_earned: enum(on_payment, by_schedule, at_disbursement) = on_payment, apply: enum(fines_profit_principal, principal_profit, pro_rata) = fines_profit_principal, payoff_rebate: percent = 100%, down_payment: percent = 0%, funds: ref, approval: approval, borrower: party = party(person), capital: party = programOperator, profit_to: party = programOperator, limits: ref<financing.limits> = object(financing.limits)) {
+instrument installments(months: integer(1, 366), charge_limit: integer(1, 3) = 3, profit: percent, disburse_to: enum(funds, borrower) = funds, profit_earned: enum(on_payment, by_schedule, at_disbursement) = on_payment, apply: enum(fines_profit_principal, principal_profit, pro_rata) = fines_profit_principal, payoff_rebate: percent = 100%, write_off_after: duration = 90d, max_extension: duration = 90d, max_amendments: integer(0, 366) = 2, waiver_limit: percent = 100%, amendment_expiry: duration = 7d, payoff_quote_expiry: duration = 1h, allow_overdue: enum(allowed, blocked) = allowed, assessed_fines: enum(carry, require_waiver) = carry, down_payment: percent = 0%, funds: ref, approval: approval, borrower: party = party(person), capital: party = programOperator, profit_to: party = programOperator, limits: ref<financing.limits> = object(financing.limits)) {
+  revisioned: true
   summary: "Funding, profit recognition and payment order chosen by the program."
   fields {
     funds: ref<funds>, borrower: account of borrower, settlementIdentity: text, borrowerLimit: ref<limits>, portfolioLimit: ref<limits.portfolio>
     months: integer = months, dates: list(date, months)
     capital: account(capital, cash, "capital"), profitIncome: account(profit_to, cash, "profitIncome"), loss: account(capital, claim, "loss")
-    principalReturned: money?, profitReturned: money?, lossRecorded: money?
+    downPaymentRemaining: money?, downPaymentCredit: money?, principalReturned: money?, profitReturned: money?, lossRecorded: money?
     price: money = self.funds.price
     downPayment: money = rate(self.price, down_payment)
     principal: money = subtract(self.price, self.downPayment)
@@ -17,10 +18,14 @@ instrument installments(months: integer(1, 366), profit: percent, disburse_to: e
   invariants count of { instrument: all(financing.installments), reference: "borrowerLimit", anchor: self.borrowerLimit, states: [active], limit: 366 } <= self.borrowerLimit.activePlans
   invariants sum "principalReceivable.balance" of { instrument: all(financing.installments.slice), reference: "borrowerLimit", anchor: self.borrowerLimit, states: [pending, due, paid], limit: 366 } <= self.borrowerLimit.limit
   invariants sum "principalReceivable.balance" of { instrument: all(financing.installments.slice), reference: "portfolioLimit", anchor: self.portfolioLimit, states: [pending, due, paid], limit: 366 } <= self.portfolioLimit.limit
-  action create { requires self.borrower == self.funds.payer; requires self.borrowerLimit.borrower == self.funds.payer }
+  action create {
+    requires self.borrower == self.funds.payer; requires self.borrowerLimit.borrower == self.funds.payer
+    invoke: [{ range: { count: { literal: months }, maximum: months, bind: position }, instrument: slice, action: create, input: { plan: { field: self.id }, borrowerLimit: { field: self.borrowerLimit }, portfolioLimit: { field: self.portfolioLimit }, position: { field: position } } }]
+  }
   action sign {
-    from: quoted, to: signed, input { signedOffer: text, affordabilityReference: text }
+    from: quoted, to: signed, actor: { party: borrower }, input { signedOffer: text, affordabilityReference: text }
     requires count of { instrument: slice, reference: "plan", anchor: self.id, states: [draft], limit: 366 } == self.months
+    when funds has order { invoke: [{ reference: self.funds.order, action: commit, input: {} }] }
   }
   action disburse {
     from: signed, to: active
@@ -29,23 +34,35 @@ instrument installments(months: integer(1, 366), profit: percent, disburse_to: e
     requires self.portfolioLimit in [approved]
     when disburse_to is funds {
       requires self.funds in [pending]
-      moves self.downPayment from self.funds.payer to self.funds.held
-      moves self.principal from self.capital to self.funds.held
+      when funds has order { invoke: [{ selection: { instrument: all(marketplace.reservation), reference: "listing", anchor: self.funds.order.listing, states: [active], limit: 1, where: { buyer: { field: self.borrower } } }, action: credit, input: { funds: { field: self.funds }, contribution: { field: self.downPayment } } }] }
+      invoke: [{ reference: self.id, action: fund_down_payment, input: {} }]
     }
     when disburse_to is borrower { moves self.principal from self.capital to self.borrower }
     invoke: [{ selection: { instrument: slice, reference: "plan", anchor: self.id, states: [draft], limit: 366, order: [position] }, action: activate, input: {} }]
     when disburse_to is funds { invoke: [{ reference: self.funds, action: confirm, input: {} }] }
   }
+  action fund_down_payment {
+    from: active, to: active, actor: { parent: current() }
+    calculate: [{ target: downPaymentCredit, op: minimum, values: [{ field: self.funds.held.balance }, { field: self.downPayment }] }, { target: downPaymentRemaining, op: subtract, base: { field: self.downPayment }, subtract: [{ field: self.downPaymentCredit }] }]
+    moves self.downPaymentRemaining from self.funds.payer to self.funds.held
+    moves self.principal from self.capital to self.funds.held
+  }
   action complete {
     from: active, to: paid
     requires count of { instrument: slice, reference: "plan", anchor: self.id, states: [pending, due], limit: 366 } == 0
+    requires sum "receivable.balance" of { instrument: all(financing.late_charge), reference: "plan", anchor: self.id, states: [assessed, collected], limit: 366 } == "0"
+    requires sum "receivable.balance" of { instrument: all(financing.late_charge.cost), reference: "plan", anchor: self.id, states: [assessed, collected], limit: 366 } == "0"
   }
   action restore { from: [active, paid], to: active, actor: { parent: payment } }
   action payoff {
-    from: active, to: paid
+    from: active, to: paid, actor: { party: borrower }
+    input { quote: ref<payoff_quote> }
+    requires input.quote.plan == self.id; requires input.quote.revision == self.productRevision
+    deadline: { at: input.quote.expiresAt }
     calculate: [
       { target: "principalReturned", op: "aggregate", selection: { instrument: slice, reference: "plan", anchor: self.id, states: [pending, due], limit: 366 }, measure: { sum: "principalReceivable.balance" } }
     ]
+    invoke: [{ selection: { instrument: all(financing.late_charge), reference: "plan", anchor: self.id, states: [assessed, collected], limit: 366, order: [overdueAt] }, action: payoff, input: {} }, { selection: { instrument: all(financing.late_charge.cost), reference: "plan", anchor: self.id, states: [assessed, collected], limit: 366, order: [overdueAt] }, action: payoff, input: {} }]
     invoke: [{ selection: { instrument: slice, reference: "plan", anchor: self.id, states: [pending, due], limit: 366, order: [position] }, action: payoff, input: { identity: { field: self.settlementIdentity } } }, { reference: self.id, action: record_payoff, input: {} }]
   }
   action record_payoff {
@@ -67,7 +84,93 @@ instrument installments(months: integer(1, 366), profit: percent, disburse_to: e
     invoke: [{ instrument: settlement, action: create, input: { plan: { field: self.id }, identity: { field: input.identity }, principal: { field: input.principal }, profit: { field: input.profit }, loss: { literal: "0" }, kind: { literal: "cash" } } }]
   }
   action cancel { from: quoted, to: cancelled }
+  action void { from: signed, to: cancelled, actor: { party: borrower } }
   records {
+    payoff_quote: {
+      fields {
+        plan: ref<parent>, revision: text?, effectiveAt: date?, expiresAt: date = after(self.createdAt, payoff_quote_expiry)
+        principal: money?, earnedProfit: money?, unearnedProfit: money?, rebate: money?, fines: money?, costs: money?, gross: money?, amount: money?
+      }
+      lifecycle { states: [quoted], initial: quoted }
+      action create {
+        requires self.plan in [active]
+        set: { revision: { field: self.productRevision }, effectiveAt: { field: self.now } }
+        invoke: [
+          { selection: { instrument: slice, reference: "plan", anchor: self.plan, states: [pending], limit: 366 }, action: quote_pending, input: { quote: { field: self.id } } }
+          { selection: { instrument: slice, reference: "plan", anchor: self.plan, states: [due], limit: 366 }, action: quote_due, input: { quote: { field: self.id } } }
+          { reference: self.id, action: record, input: {} }
+        ]
+      }
+      action record {
+        from: quoted, to: quoted, actor: { parent: current() }
+        calculate: [
+          { target: principal, op: aggregate, selection: { instrument: slice, reference: "plan", anchor: self.plan, states: [pending, due, paid], limit: 366 }, measure: { sum: "principalReceivable.balance" } }
+          { target: earnedProfit, op: aggregate, selection: { instrument: slice, reference: "plan", anchor: self.plan, states: [pending, due, paid], limit: 366 }, measure: { sum: "profitEarned.balance" } }
+          { target: unearnedProfit, op: aggregate, selection: { instrument: slice, reference: "plan", anchor: self.plan, states: [pending, due, paid], limit: 366 }, measure: { sum: "profitReceivable.balance" } }
+          { target: rebate, op: aggregate, selection: { instrument: quote_piece, reference: "quote", anchor: self.id, states: [recorded], limit: 366 }, measure: { sum: "rebate" } }
+          { target: fines, op: aggregate, selection: { instrument: all(financing.late_charge), reference: "plan", anchor: self.plan, states: [assessed, collected], limit: 366 }, measure: { sum: "receivable.balance" } }
+          { target: costs, op: aggregate, selection: { instrument: all(financing.late_charge.cost), reference: "plan", anchor: self.plan, states: [assessed, collected], limit: 366 }, measure: { sum: "receivable.balance" } }
+          { target: gross, op: sum, values: [{ field: self.principal }, { field: self.earnedProfit }, { field: self.unearnedProfit }, { field: self.fines }, { field: self.costs }] }
+          { target: amount, op: subtract, base: { field: self.gross }, subtract: [{ field: self.rebate }] }
+        ]
+      }
+    }
+    quote_piece: {
+      fields { quote: ref<payoff_quote>, slice: ref<slice>, rebate: money = rate(self.slice.profitReceivable.balance, payoff_rebate) }
+      lifecycle { states: [recorded], initial: recorded }
+      action create { actor: { parent: slice }, input { quote: ref<payoff_quote>, slice: ref<slice> }, requires unique "payoff_slice_quote" on [self.quote, self.slice] }
+    }
+    amendment: {
+      fields {
+        plan: ref<parent>, dates: list(date, months), agreement: text, waiverPercent: percent, waiverEvidence: text, maximumWaiver: percent = waiver_limit
+        revision: text?, acceptedAt: date?, staleReason: text?, expiresAt: date = after(self.createdAt, amendment_expiry)
+        fineDisposition: enum(carry, require_waiver) = assessed_fines, addedProfit: money = 0 SAR
+        principalSnapshot: money?, earnedProfitSnapshot: money?, unearnedProfitSnapshot: money?, finesSnapshot: money?, costsSnapshot: money?
+        extension: duration = max_extension, maximum: integer = max_amendments
+      }
+      lifecycle { states: [proposed, applied, declined, withdrawn, expired, superseded], initial: proposed }
+      action create {
+        actor: { party: borrower }
+        requires self.plan in [active]; requires self.waiverPercent <= self.maximumWaiver
+        set: { revision: { field: self.productRevision } }
+        calculate: [
+          { target: principalSnapshot, op: aggregate, selection: { instrument: slice, reference: "plan", anchor: self.plan, states: [pending, due, paid], limit: 366 }, measure: { sum: "principalReceivable.balance" } }
+          { target: earnedProfitSnapshot, op: aggregate, selection: { instrument: slice, reference: "plan", anchor: self.plan, states: [pending, due, paid], limit: 366 }, measure: { sum: "profitEarned.balance" } }
+          { target: unearnedProfitSnapshot, op: aggregate, selection: { instrument: slice, reference: "plan", anchor: self.plan, states: [pending, due, paid], limit: 366 }, measure: { sum: "profitReceivable.balance" } }
+          { target: finesSnapshot, op: aggregate, selection: { instrument: all(financing.late_charge), reference: "plan", anchor: self.plan, states: [assessed, collected], limit: 366 }, measure: { sum: "receivable.balance" } }
+          { target: costsSnapshot, op: aggregate, selection: { instrument: all(financing.late_charge.cost), reference: "plan", anchor: self.plan, states: [assessed, collected], limit: 366 }, measure: { sum: "receivable.balance" } }
+        ]
+        requires count of { instrument: current(), reference: "plan", anchor: self.plan, states: [applied], limit: 366 } < self.maximum
+        invoke: [{ range: { count: { literal: months }, maximum: months, bind: position }, instrument: proposed_date, action: create, input: { amendment: { field: self.id }, position: { field: position } } }, { selection: { instrument: proposed_date, reference: "amendment", anchor: self.id, states: [recorded], limit: 366, where: { first: { literal: 0 } } }, action: check_order, input: {} }]
+      }
+      action accept {
+        from: proposed, to: applied, actor: { party: borrower }, deadline: { at: self.expiresAt }
+        requires self.plan in [active]; requires self.revision == self.productRevision
+        requires approval by approval
+        requires count of { instrument: current(), reference: "plan", anchor: self.plan, states: [applied], limit: 366 } < self.maximum
+        set: { acceptedAt: { field: self.now } }
+        when assessed_fines is require_waiver { requires self.waiverPercent == 10000 }
+        invoke: [{ selection: { instrument: all(financing.late_charge), reference: "plan", anchor: self.plan, states: [assessed, collected], limit: 366 }, action: waive_for_amendment, input: { amendment: { field: self.id } } }, { selection: { instrument: all(financing.late_charge.cost), reference: "plan", anchor: self.plan, states: [assessed, collected], limit: 366 }, action: waive_for_amendment, input: { amendment: { field: self.id } } }]
+        invoke: [{ selection: { instrument: all(collections.case), reference: "plan", anchor: self.plan, states: [opened, assigned], limit: 366 }, action: recall, input: {} }, { selection: { instrument: all(financing.late_charge.cost), reference: "plan", anchor: self.plan, states: [proposed], limit: 366 }, action: cancel, input: {} }, { selection: { instrument: all(financing.late_charge), reference: "plan", anchor: self.plan, states: [proposed], limit: 366 }, action: cancel, input: {} }]
+        invoke: [{ selection: { instrument: slice, reference: "plan", anchor: self.plan, states: [pending, due], limit: 366, order: [position] }, action: amend, input: { amendment: { field: self.id } } }]
+        invoke: [{ selection: { instrument: slice, reference: "plan", anchor: self.plan, states: [paid], limit: 366 }, action: verify_fixed_date, input: { amendment: { field: self.id } } }]
+      }
+      action withdraw { from: proposed, to: withdrawn, actor: { party: borrower } }
+      action decline { from: proposed, to: declined, actor: { party: approval } }
+      action expire { from: proposed, to: expired, actor: clock, due: { at: self.expiresAt } }
+      action supersede { from: proposed, to: superseded, requires self.revision != self.productRevision, set: { staleReason: { literal: "economic_revision_changed" } } }
+    }
+    proposed_date: {
+      fields { amendment: ref<amendment>, position: integer(1, months), date: date = at(self.amendment.dates, self.position), first: integer = divide(1, self.position), prior: integer = subtract(self.position, 1), previousPosition: integer = sum(self.prior, self.first), previous: date = at(self.amendment.dates, self.previousPosition) }
+      lifecycle { states: [recorded], initial: recorded }
+      action create { actor: { parent: amendment }, input { amendment: ref<amendment>, position: integer(1, months) }, requires self.date >= self.previous }
+      action check_order { from: recorded, to: recorded, actor: { parent: amendment }, requires self.date > self.previous }
+    }
+    date_change: {
+      fields { amendment: ref<amendment>, slice: ref<slice>, oldDate: date, newDate: date }
+      lifecycle { states: [recorded], initial: recorded }
+      action create { actor: { parent: slice }, input { amendment: ref<amendment>, slice: ref<slice>, oldDate: date, newDate: date }, requires unique "amended_slice" on [self.amendment, self.slice] }
+    }
     settlement: {
       fields { plan: ref<parent>, identity: text, principal: money, profit: money, loss: money, kind: enum(cash, loss)
         capital: account(capital, cash, "capital"), profitIncome: account(profit_to, cash, "profitIncome"), lossAccount: account(capital, claim, "loss") }
@@ -79,9 +182,10 @@ instrument installments(months: integer(1, 366), profit: percent, disburse_to: e
       }
     }
     slice: {
+      revisioned: true
       fields {
         plan: ref<parent>, borrowerLimit: ref<limits>, portfolioLimit: ref<limits.portfolio>, position: integer(1, months)
-        dueAt: date = at(self.plan.dates, self.position), lossEligibleAt: date = after(self.dueAt, 90d)
+        originalDueAt: date = at(self.plan.dates, self.position), dueAt: date?, nextDueAt: date?, previousDueAt: date?, previousPosition: integer?, previousDate: date?, extensionLimit: date = after(self.originalDueAt, max_extension), lossEligibleAt: date?
         principalBase: money = divide(self.plan.principal, months)
         principalAllocated: money = multiply(self.principalBase, months)
         principalRemainder: money = subtract(self.plan.principal, self.principalAllocated)
@@ -100,8 +204,44 @@ instrument installments(months: integer(1, 366), profit: percent, disburse_to: e
       }
       lifecycle { states: [draft, pending, due, paid, written_off], initial: draft }
       action create {
+        actor: { parent: parent }
+        input { plan: ref<parent>, borrowerLimit: ref<limits>, portfolioLimit: ref<limits.portfolio>, position: integer(1, months) }
+        set: { dueAt: { field: self.originalDueAt } }
+        invoke: [{ reference: self.id, action: refresh_loss_date, input: {} }]
         requires self.plan in [quoted]; requires unique "signed_position" on [self.plan, self.position]; requires self.borrowerLimit == self.plan.borrowerLimit; requires self.portfolioLimit == self.plan.portfolioLimit
       }
+      action quote_pending {
+        from: pending, to: pending, actor: { parent: payoff_quote }, input { quote: ref<payoff_quote> }
+        requires input.quote.plan == self.plan
+        invoke: [{ instrument: quote_piece, action: create, input: { quote: { field: input.quote }, slice: { field: self.id } } }]
+      }
+      action quote_due {
+        from: due, to: due, actor: { parent: payoff_quote }, input { quote: ref<payoff_quote> }
+        requires input.quote.plan == self.plan
+        invoke: [{ instrument: quote_piece, action: create, input: { quote: { field: input.quote }, slice: { field: self.id } } }]
+      }
+      action refresh_loss_date {
+        from: [draft, pending, due], to: draft, actor: { parent: current() }
+        calculate: [{ target: lossEligibleAt, op: shift, date: { field: self.dueAt }, milliseconds: { literal: write_off_after }, direction: after }]
+      }
+      action amend {
+        from: [pending, due], to: pending, actor: { parent: amendment }, input { amendment: ref<amendment> }
+        requires input.amendment.plan == self.plan
+        when allow_overdue is blocked { requires self.dueAt > self.now }
+        calculate: [
+          { target: nextDueAt, op: at, list: input.amendment.dates, position: { field: self.position } }
+          { target: lossEligibleAt, op: shift, date: { field: self.nextDueAt }, milliseconds: { literal: write_off_after }, direction: after }
+        ]
+        requires self.nextDueAt > self.now; requires self.nextDueAt >= self.dueAt; requires self.nextDueAt <= self.extensionLimit
+        set: { previousDueAt: { field: self.dueAt }, dueAt: { field: self.nextDueAt } }
+        invoke: [{ instrument: date_change, action: create, input: { amendment: { field: input.amendment }, slice: { field: self.id }, oldDate: { field: self.previousDueAt }, newDate: { field: self.nextDueAt } } }]
+        when profit_earned is by_schedule { invoke: [{ selection: { instrument: recognition, reference: "slice", anchor: self.id, states: [pending], limit: 1 }, action: reschedule, input: {} }] }
+      }
+      action verify_fixed_date {
+        from: paid, to: paid, actor: { parent: amendment }, input { amendment: ref<amendment> }
+        calculate: [{ target: nextDueAt, op: at, list: input.amendment.dates, position: { field: self.position } }]
+        requires self.nextDueAt == self.dueAt
+      }
       action activate {
         from: draft, to: pending, actor: { parent: parent }
         moves self.principal from self.debt to self.principalReceivable
@@ -113,21 +253,36 @@ instrument installments(months: integer(1, 366), profit: percent, disburse_to: e
         from: pending, to: due, actor: clock, due: { at: self.dueAt }
       }
       action collect {
-        from: [pending, due], to: due, actor: { parent: payment }
+        from: [pending, due], to: preserve, actor: { parent: payment }
         input { payment: ref<payment> }
         requires input.payment.plan == self.plan
         when profit_earned is on_payment { calculate: [{ target: collectibleProfit, op: sum, values: [{ field: self.profitReceivable.balance }] }] }
         when profit_earned is by_schedule { calculate: [{ target: collectibleProfit, op: sum, values: [{ field: self.profitEarned.balance }] }] }
         when profit_earned is at_disbursement { calculate: [{ target: collectibleProfit, op: sum, values: [{ field: self.profitEarned.balance }] }] }
-        when apply is fines_profit_principal {
-          invoke: [{ instrument: profit_piece, action: create, input: { slice: { field: self.id }, payment: { field: input.payment }, limit: { field: self.collectibleProfit } } }, { instrument: principal_piece, action: create, input: { slice: { field: self.id }, payment: { field: input.payment }, limit: { field: self.principalReceivable.balance } } }]
-        }
         when apply is principal_profit {
-          invoke: [{ instrument: principal_piece, action: create, input: { slice: { field: self.id }, payment: { field: input.payment }, limit: { field: self.principalReceivable.balance } } }, { instrument: profit_piece, action: create, input: { slice: { field: self.id }, payment: { field: input.payment }, limit: { field: self.collectibleProfit } } }]
+          invoke: [
+            { instrument: principal_piece, action: create, input: { slice: { field: self.id }, payment: { field: input.payment }, limit: { field: self.principalReceivable.balance } } }
+            { instrument: profit_piece, action: create, input: { slice: { field: self.id }, payment: { field: input.payment }, limit: { field: self.collectibleProfit } } }
+            { selection: { instrument: current(), reference: "plan", anchor: self.plan, states: [pending, due], limit: 1, where: { id: { field: self.id }, principalReceivable.balance: { literal: "0" }, profitReceivable.balance: { literal: "0" }, profitEarned.balance: { literal: "0" } } }, action: complete, input: {} }
+          ]
         }
       }
+      action collect_waterfall {
+        from: [pending, due], to: preserve, actor: { parent: payment }, input { payment: ref<payment> }
+        requires input.payment.plan == self.plan
+        when profit_earned is on_payment { calculate: [{ target: collectibleProfit, op: sum, values: [{ field: self.profitReceivable.balance }] }] }
+        when profit_earned is by_schedule { calculate: [{ target: collectibleProfit, op: sum, values: [{ field: self.profitEarned.balance }] }] }
+        when profit_earned is at_disbursement { calculate: [{ target: collectibleProfit, op: sum, values: [{ field: self.profitEarned.balance }] }] }
+        invoke: [
+          { selection: { instrument: all(financing.late_charge), reference: "slice", anchor: self.id, states: [assessed], limit: charge_limit, order: [overdueAt] }, action: collect, input: { payment: { field: input.payment } } }
+          { selection: { instrument: all(financing.late_charge.cost), reference: "plan", anchor: self.plan, states: [assessed], limit: charge_limit, order: [overdueAt], where: { assessment.slice: { field: self.id } } }, action: collect, input: { payment: { field: input.payment } } }
+          { instrument: profit_piece, action: create, input: { slice: { field: self.id }, payment: { field: input.payment }, limit: { field: self.collectibleProfit } } }
+          { instrument: principal_piece, action: create, input: { slice: { field: self.id }, payment: { field: input.payment }, limit: { field: self.principalReceivable.balance } } }
+          { selection: { instrument: current(), reference: "plan", anchor: self.plan, states: [pending, due], limit: 1, where: { id: { field: self.id }, principalReceivable.balance: { literal: "0" }, profitReceivable.balance: { literal: "0" }, profitEarned.balance: { literal: "0" } } }, action: complete, input: {} }
+        ]
+      }
       action collect_pro_rata {
-        from: [pending, due], to: due, actor: { parent: payment }, input { payment: ref<payment> }
+        from: [pending, due], to: preserve, actor: { parent: payment }, input { payment: ref<payment> }
         requires input.payment.plan == self.plan
         when profit_earned is on_payment { calculate: [{ target: collectibleProfit, op: sum, values: [{ field: self.profitReceivable.balance }] }] }
         when profit_earned is by_schedule { calculate: [{ target: collectibleProfit, op: sum, values: [{ field: self.profitEarned.balance }] }] }
@@ -141,13 +296,17 @@ instrument installments(months: integer(1, 366), profit: percent, disburse_to: e
           { target: profitPayment, op: minimum, values: [{ field: self.profitBudget }, { field: self.collectibleProfit }] }
           { target: principalPayment, op: subtract, base: { field: self.paymentBudget }, subtract: [{ field: self.profitPayment }] }
         ]
-        invoke: [{ instrument: principal_piece, action: create, input: { slice: { field: self.id }, payment: { field: input.payment }, limit: { field: self.principalPayment } } }, { instrument: profit_piece, action: create, input: { slice: { field: self.id }, payment: { field: input.payment }, limit: { field: self.profitPayment } } }]
+        invoke: [
+          { instrument: principal_piece, action: create, input: { slice: { field: self.id }, payment: { field: input.payment }, limit: { field: self.principalPayment } } }
+          { instrument: profit_piece, action: create, input: { slice: { field: self.id }, payment: { field: input.payment }, limit: { field: self.profitPayment } } }
+          { selection: { instrument: current(), reference: "plan", anchor: self.plan, states: [pending, due], limit: 1, where: { id: { field: self.id }, principalReceivable.balance: { literal: "0" }, profitReceivable.balance: { literal: "0" }, profitEarned.balance: { literal: "0" } } }, action: complete, input: {} }
+        ]
       }
       action complete {
         from: [pending, due], to: paid
         requires self.principalReceivable.balance == "0"; requires self.profitReceivable.balance == "0"; requires self.profitEarned.balance == "0"
       }
-      action restore { from: [pending, due, paid], to: due, actor: { parent: payment } }
+      action restore { from: [pending, due, paid], to: pending, actor: { parent: payment } }
       action payoff {
         from: [pending, due], to: paid, actor: { parent: parent }, input { identity: text }
         set: { payoffIdentity: { field: input.identity } }
@@ -167,16 +326,20 @@ instrument installments(months: integer(1, 366), profit: percent, disburse_to: e
       fields { slice: ref<slice>, dueAt: date = after(self.slice.dueAt, 0) }
       lifecycle { states: [pending, recognised], initial: pending }
       action create { actor: { parent: slice }, input { slice: ref<slice> }, requires unique "profit_recognition" on [self.slice] }
+      action reschedule { from: pending, to: pending, actor: { parent: slice } }
       action mature { from: pending, to: recognised, actor: clock, due: { at: self.dueAt }, moves self.slice.profitReceivable.balance from self.slice.profitReceivable to self.slice.profitEarned }
     }
     payment: {
+      revisioned: true
       fields { plan: ref<parent>, amount: money, paymentIdentity: text, held: account of self
         capital: account(capital, cash, "capital"), profitIncome: account(profit_to, cash, "profitIncome"), loss: account(capital, claim, "loss")
         outstandingPrincipal: money?, outstandingProfit: money?, outstandingFines: money?, outstandingCosts: money?, outstandingTotal: money?, principalReturned: money?, profitReturned: money?, lossRecorded: money? }
 
       lifecycle { states: [pending, paid, refunded], initial: pending }
       action create { input { plan: ref<parent>, amount: money, paymentIdentity: text } requires self.plan in [active]; requires unique "payment_identity" on [self.plan, self.paymentIdentity] }
+      // 366 slices * (1 + 3 fines * 3 + 3 costs * 3 + 2 pieces + 1 completion), plus recording.
       action pay {
+        expansionLimit: 8192
         from: pending, to: paid
         calculate: [{ target: outstandingPrincipal, op: aggregate, selection: { instrument: slice, reference: "plan", anchor: self.plan, states: [pending, due, paid], limit: 366, order: [position] }, measure: { sum: "principalReceivable.balance" } }]
         when profit_earned is on_payment { calculate: [{ target: outstandingProfit, op: aggregate, selection: { instrument: slice, reference: "plan", anchor: self.plan, states: [pending, due, paid], limit: 366, order: [position] }, measure: { sum: "profitReceivable.balance" } }] }
@@ -190,14 +353,13 @@ instrument installments(months: integer(1, 366), profit: percent, disburse_to: e
         requires self.plan in [active]; requires self.amount <= self.outstandingTotal
         moves self.amount from self.plan.borrower to self.held
         when apply is principal_profit {
-          invoke: [{ selection: { instrument: slice, reference: "plan", anchor: self.plan, states: [pending, due], limit: 366, order: [position] }, action: collect, input: { payment: { field: self.id } } }]
+          invoke: [{ selection: { instrument: slice, reference: "plan", anchor: self.plan, states: [pending, due], limit: 366, order: [position] }, action: collect, guard: { kind: compare, left: { field: self.held.balance }, operator: ">", right: { literal: "0" } }, input: { payment: { field: self.id } } }]
         }
         when apply is fines_profit_principal {
-          invoke: [{ selection: { instrument: all(financing.late_charge), reference: "plan", anchor: self.plan, states: [assessed, collected], limit: 366, order: [overdueAt] }, action: collect, input: { payment: { field: self.id } } }, { selection: { instrument: all(financing.late_charge.cost), reference: "plan", anchor: self.plan, states: [assessed, collected], limit: 366, order: [overdueAt] }, action: collect, input: { payment: { field: self.id } } }]
-          invoke: [{ selection: { instrument: slice, reference: "plan", anchor: self.plan, states: [pending, due], limit: 366, order: [position] }, action: collect, input: { payment: { field: self.id } } }]
+          invoke: [{ selection: { instrument: slice, reference: "plan", anchor: self.plan, states: [pending, due], limit: 366, order: [position] }, action: collect_waterfall, guard: { kind: compare, left: { field: self.held.balance }, operator: ">", right: { literal: "0" } }, input: { payment: { field: self.id } } }]
         }
         when apply is pro_rata {
-          invoke: [{ selection: { instrument: slice, reference: "plan", anchor: self.plan, states: [pending, due], limit: 366, order: [position] }, action: collect_pro_rata, input: { payment: { field: self.id } } }]
+          invoke: [{ selection: { instrument: slice, reference: "plan", anchor: self.plan, states: [pending, due], limit: 366, order: [position] }, action: collect_pro_rata, guard: { kind: compare, left: { field: self.held.balance }, operator: ">", right: { literal: "0" } }, input: { payment: { field: self.id } } }]
         }
         invoke: [{ reference: self.id, action: record, input: {} }]
       }
@@ -217,9 +379,10 @@ instrument installments(months: integer(1, 366), profit: percent, disburse_to: e
       }
     }
     principal_piece: {
-      fields { slice: ref<slice>, payment: ref<payment>, limit: money, amount: money = minimum(self.payment.held.balance, self.slice.principalReceivable.balance, self.limit) }
+      fields { slice: ref<slice>, payment: ref<payment>, limit: money, amount: money? }
       lifecycle { states: [paid, refunded], initial: paid }
       action create {
+        calculate: [{ target: amount, op: minimum, values: [{ field: self.payment.held.balance }, { field: self.slice.principalReceivable.balance }, { field: self.limit }] }]
         actor: { parent: slice }
         input { slice: ref<slice>, payment: ref<payment>, limit: money }
         requires unique "principal_receipt" on [self.slice, self.payment]
@@ -231,9 +394,10 @@ instrument installments(months: integer(1, 366), profit: percent, disburse_to: e
       }
     }
     profit_piece: {
-      fields { slice: ref<slice>, payment: ref<payment>, limit: money, amount: money = minimum(self.payment.held.balance, self.limit) }
+      fields { slice: ref<slice>, payment: ref<payment>, limit: money, amount: money? }
       lifecycle { states: [paid, refunded], initial: paid }
       action create {
+        calculate: [{ target: amount, op: minimum, values: [{ field: self.payment.held.balance }, { field: self.limit }] }]
         actor: { parent: slice }
         input { slice: ref<slice>, payment: ref<payment>, limit: money }
         requires unique "profit_receipt" on [self.slice, self.payment]
@@ -254,13 +418,14 @@ instrument installments(months: integer(1, 366), profit: percent, disburse_to: e
 }
 
 instrument late_charge(on: ref<financing.installments>[], grace: duration = 3d, fine: money = 50 SAR, cap: money = 25 SAR, fines_to: party = programOperator, costs_to: party = programOperator, approval: approval = programOperator, borrower: party = party(person)) {
+  revisioned: true
   summary: "Separate approved fine and evidenced recovery claims on an overdue installment."
   fields {
-    plan: ref<on>, slice: ref<on.slice>, borrower: account of borrower, fine: money = fine, overdueAt: date = after(self.slice.dueAt, grace)
+    plan: ref<on>, slice: ref<on.slice>, borrower: account of borrower, fine: money = fine, overdueAt: date?
     receivable: account(self, claim), debt: account(borrower, claim, contra, "debt")
   }
   lifecycle { states: [proposed, assessed, collected, waived, refunded], initial: proposed }
-  action create { requires unique "late_assessment" on [self.slice]; requires self.borrower == self.slice.plan.borrower; requires self.plan == self.slice.plan }
+  action create { calculate: [{ target: overdueAt, op: shift, date: { field: self.slice.dueAt }, milliseconds: { literal: grace }, direction: after }], requires unique "late_assessment" on [self.slice, self.overdueAt]; requires self.borrower == self.slice.plan.borrower; requires self.plan == self.slice.plan }
   action assess {
     from: proposed, to: assessed, due: { at: self.overdueAt }
     requires self.slice.principalReceivable.balance > "0"; requires approval by approval
@@ -272,9 +437,20 @@ instrument late_charge(on: ref<financing.installments>[], grace: duration = 3d,
     requires input.payment.plan == self.plan
     invoke: [{ instrument: receipt, action: create, input: { assessment: { field: self.id }, payment: { field: input.payment } } }, { selection: { instrument: current(), reference: "plan", anchor: self.plan, states: [assessed], limit: 1, where: { id: { field: self.id }, receivable.balance: { literal: "0" } } }, action: finish, input: {} }]
   }
+  action payoff {
+    from: [assessed, collected], to: collected
+    requires self.plan in [paid]
+    moves self.receivable.balance from self.plan.borrower to fines_to
+    moves self.receivable.balance from self.receivable to self.debt
+  }
   action finish { from: assessed, to: collected, actor: { parent: current() }, requires self.receivable.balance == "0" }
   action cancel { from: proposed, to: waived }
-  action waive { from: assessed, to: waived, moves self.receivable.balance from self.receivable to self.debt }
+  action waive_for_amendment {
+    from: [assessed, collected], to: assessed, actor: { parent: child(on, amendment) }, input { amendment: ref<on.amendment> }
+    requires input.amendment.plan == self.plan; requires input.amendment in [applied]
+    invoke: [{ instrument: waiver, action: create, input: { assessment: { field: self.id }, amendment: { field: input.amendment } } }]
+  }
+  action waive { from: [assessed, collected], to: waived, input { reason: text, evidence: text }, requires approval by approval, moves self.receivable.balance from self.receivable to self.debt }
   action refund {
     from: [assessed, collected], to: assessed, input { payment: ref<on.payment> }
     requires input.payment in [paid, refunded]
@@ -282,20 +458,31 @@ instrument late_charge(on: ref<financing.installments>[], grace: duration = 3d,
     invoke: [{ selection: { instrument: receipt, reference: "payment", anchor: input.payment, states: [paid], limit: 1, where: { assessment: { field: self.id } } }, action: refund, input: {} }, { selection: { instrument: current(), reference: "plan", anchor: self.plan, states: [assessed], limit: 1, where: { id: { field: self.id }, receivable.balance: { literal: "0" } } }, action: finish, input: {} }]
   }
   records {
+    waiver: {
+      fields { assessment: ref<parent>, amendment: ref<on.amendment>, amount: money? }
+      lifecycle { states: [recorded], initial: recorded }
+      action create {
+        actor: { parent: parent }, input { assessment: ref<parent>, amendment: ref<on.amendment> }
+        calculate: [{ target: amount, op: rate, base: { field: self.assessment.receivable.balance }, bps: { field: self.amendment.waiverPercent }, rounding: floor }]
+        requires unique "amendment_waiver" on [self.assessment, self.amendment]
+        moves self.amount from self.assessment.receivable to self.assessment.debt
+      }
+    }
     receipt: {
-      fields { assessment: ref<parent>, payment: ref<on.payment>, amount: money = minimum(self.payment.held.balance, self.assessment.receivable.balance) }
+      fields { assessment: ref<parent>, payment: ref<on.payment>, amount: money? }
       lifecycle { states: [paid, refunded], initial: paid }
-      action create { actor: { parent: parent }, input { assessment: ref<parent>, payment: ref<on.payment> }, requires input.payment.plan == self.assessment.plan; requires unique "fine_receipt" on [self.assessment, self.payment]; moves self.amount from self.payment.held to fines_to; moves self.amount from self.assessment.receivable to self.assessment.debt }
+      action create { calculate: [{ target: amount, op: minimum, values: [{ field: self.payment.held.balance }, { field: self.assessment.receivable.balance }] }], actor: { parent: parent }, input { assessment: ref<parent>, payment: ref<on.payment> }, requires input.payment.plan == self.assessment.plan; requires unique "fine_receipt" on [self.assessment, self.payment]; moves self.amount from self.payment.held to fines_to; moves self.amount from self.assessment.receivable to self.assessment.debt }
       action refund { from: paid, to: refunded, actor: { parent: parent }, moves self.amount from fines_to to self.payment.plan.borrower; moves self.amount from self.assessment.debt to self.assessment.receivable }
     }
 
     cost: {
+      revisioned: true
       fields {
-        plan: ref<on>, assessment: ref<parent>, overdueAt: date = after(self.assessment.slice.dueAt, grace), evidence: text, evidencedCost: money, amount: money = minimum(self.evidencedCost, cap)
+        plan: ref<on>, assessment: ref<parent>, overdueAt: date?, evidence: text, evidencedCost: money, amount: money = minimum(self.evidencedCost, cap)
         receivable: account(self, claim), debt: account(borrower, claim, contra, "debt")
       }
       lifecycle { states: [proposed, assessed, collected, waived, refunded], initial: proposed }
-      action create { requires unique "recovery_assessment" on [self.assessment]; requires self.plan == self.assessment.plan }
+      action create { calculate: [{ target: overdueAt, op: shift, date: { field: self.assessment.overdueAt }, milliseconds: { literal: 0 }, direction: after }], requires unique "recovery_assessment" on [self.assessment]; requires self.plan == self.assessment.plan }
       action assess {
         from: proposed, to: assessed, due: { at: self.assessment.overdueAt }
         requires self.assessment.slice.principalReceivable.balance > "0"; requires approval by approval
@@ -307,9 +494,20 @@ instrument late_charge(on: ref<financing.installments>[], grace: duration = 3d,
         requires input.payment.plan == self.plan
         invoke: [{ instrument: receipt, action: create, input: { assessment: { field: self.id }, payment: { field: input.payment } } }, { selection: { instrument: current(), reference: "plan", anchor: self.plan, states: [assessed], limit: 1, where: { id: { field: self.id }, receivable.balance: { literal: "0" } } }, action: finish, input: {} }]
       }
+      action payoff {
+        from: [assessed, collected], to: collected
+        requires self.plan in [paid]
+        moves self.receivable.balance from self.plan.borrower to costs_to
+        moves self.receivable.balance from self.receivable to self.debt
+      }
       action finish { from: assessed, to: collected, actor: { parent: current() }, requires self.receivable.balance == "0" }
       action cancel { from: proposed, to: waived }
-      action waive { from: assessed, to: waived, moves self.receivable.balance from self.receivable to self.debt }
+      action waive_for_amendment {
+        from: [assessed, collected], to: assessed, actor: { parent: child(on, amendment) }, input { amendment: ref<on.amendment> }
+        requires input.amendment.plan == self.plan; requires input.amendment in [applied]
+        invoke: [{ instrument: waiver, action: create, input: { assessment: { field: self.id }, amendment: { field: input.amendment } } }]
+      }
+      action waive { from: [assessed, collected], to: waived, input { reason: text, evidence: text }, requires approval by approval, moves self.receivable.balance from self.receivable to self.debt }
       action refund {
         from: [assessed, collected], to: assessed, input { payment: ref<on.payment> }
         requires input.payment in [paid, refunded]
@@ -317,10 +515,20 @@ instrument late_charge(on: ref<financing.installments>[], grace: duration = 3d,
         invoke: [{ selection: { instrument: receipt, reference: "payment", anchor: input.payment, states: [paid], limit: 1, where: { assessment: { field: self.id } } }, action: refund, input: {} }, { selection: { instrument: current(), reference: "plan", anchor: self.plan, states: [assessed], limit: 1, where: { id: { field: self.id }, receivable.balance: { literal: "0" } } }, action: finish, input: {} }]
       }
       records {
+        waiver: {
+          fields { assessment: ref<parent>, amendment: ref<on.amendment>, amount: money? }
+          lifecycle { states: [recorded], initial: recorded }
+          action create {
+            actor: { parent: parent }, input { assessment: ref<parent>, amendment: ref<on.amendment> }
+            calculate: [{ target: amount, op: rate, base: { field: self.assessment.receivable.balance }, bps: { field: self.amendment.waiverPercent }, rounding: floor }]
+            requires unique "amendment_waiver" on [self.assessment, self.amendment]
+            moves self.amount from self.assessment.receivable to self.assessment.debt
+          }
+        }
         receipt: {
-          fields { assessment: ref<parent>, payment: ref<on.payment>, amount: money = minimum(self.payment.held.balance, self.assessment.receivable.balance) }
+          fields { assessment: ref<parent>, payment: ref<on.payment>, amount: money? }
           lifecycle { states: [paid, refunded], initial: paid }
-          action create { actor: { parent: parent }, input { assessment: ref<parent>, payment: ref<on.payment> }, requires input.payment.plan == self.assessment.plan; requires unique "cost_receipt" on [self.assessment, self.payment]; moves self.amount from self.payment.held to costs_to; moves self.amount from self.assessment.receivable to self.assessment.debt }
+          action create { calculate: [{ target: amount, op: minimum, values: [{ field: self.payment.held.balance }, { field: self.assessment.receivable.balance }] }], actor: { parent: parent }, input { assessment: ref<parent>, payment: ref<on.payment> }, requires input.payment.plan == self.assessment.plan; requires unique "cost_receipt" on [self.assessment, self.payment]; moves self.amount from self.payment.held to costs_to; moves self.amount from self.assessment.receivable to self.assessment.debt }
           action refund { from: paid, to: refunded, actor: { parent: parent }, moves self.amount from costs_to to self.payment.plan.borrower; moves self.amount from self.assessment.debt to self.assessment.receivable }
         }
       }