diff --git a/.gas-snapshot b/.gas-snapshot
index 7270aa79..dec78ae2 100644
--- a/.gas-snapshot
+++ b/.gas-snapshot
@@ -1,18 +1,18 @@
-DiffFuzzTestStarportLib:testSpentToReceived((uint8,address,uint256,uint256)[]) (runs: 256, μ: 880533, ~: 883411)
-DiffFuzzTestStarportLib:testUnboundSpentToReceived((uint8,address,uint256,uint256)[]) (runs: 256, μ: 232912, ~: 237832)
-IntegrationTestCaveats:testOriginateUnapprovedFulfiller() (gas: 341166)
-IntegrationTestCaveats:testOriginateWBorrowerApproval() (gas: 298037)
-IntegrationTestCaveats:testOriginateWCaveats() (gas: 272104)
-IntegrationTestCaveats:testOriginateWCaveatsIncrementedNonce() (gas: 200214)
-IntegrationTestCaveats:testOriginateWCaveatsInvalidSalt() (gas: 257759)
-IntegrationTestCaveats:testOriginateWCaveatsInvalidSaltManual() (gas: 175780)
-IntegrationTestCaveats:testOriginateWLenderApproval() (gas: 298091)
-IntegrationTestCaveats:testRefinanceAsLender() (gas: 1042171)
-IntegrationTestCaveats:testRefinanceCaveatFailure() (gas: 408353)
-IntegrationTestCaveats:testRefinanceLoanStartAtBlockTimestampInvalidLoan() (gas: 377358)
-IntegrationTestCaveats:testRefinanceUnapprovedFulfiller() (gas: 465660)
-IntegrationTestCaveats:testRefinanceWCaveatsInvalidSalt() (gas: 386773)
-IntegrationTestCaveats:testRefinanceWLenderApproval() (gas: 411275)
+DiffFuzzTestStarportLib:testSpentToReceived((uint8,address,uint256,uint256)[]) (runs: 256, μ: 39030, ~: 36917)
+DiffFuzzTestStarportLib:testUnboundSpentToReceived((uint8,address,uint256,uint256)[]) (runs: 256, μ: 232924, ~: 237832)
+IntegrationTestCaveats:testOriginateUnapprovedFulfiller() (gas: 360651)
+IntegrationTestCaveats:testOriginateWBorrowerApproval() (gas: 317522)
+IntegrationTestCaveats:testOriginateWCaveats() (gas: 291589)
+IntegrationTestCaveats:testOriginateWCaveatsIncrementedNonce() (gas: 200135)
+IntegrationTestCaveats:testOriginateWCaveatsInvalidSalt() (gas: 296729)
+IntegrationTestCaveats:testOriginateWCaveatsInvalidSaltManual() (gas: 175701)
+IntegrationTestCaveats:testOriginateWLenderApproval() (gas: 317576)
+IntegrationTestCaveats:testRefinanceAsLender() (gas: 1081141)
+IntegrationTestCaveats:testRefinanceCaveatFailure() (gas: 427423)
+IntegrationTestCaveats:testRefinanceLoanStartAtBlockTimestampInvalidLoan() (gas: 376864)
+IntegrationTestCaveats:testRefinanceUnapprovedFulfiller() (gas: 484730)
+IntegrationTestCaveats:testRefinanceWCaveatsInvalidSalt() (gas: 405843)
+IntegrationTestCaveats:testRefinanceWLenderApproval() (gas: 430345)
 PausableNonReentrantImpl:test() (gas: 2442)
 PausableNonReentrantImpl:testReentrancy() (gas: 2735)
 TestBorrowerEnforcer:testBERevertAdditionalTransfers() (gas: 73195)
@@ -28,8 +28,8 @@ TestCustodian:testGenerateOrderInvalidPostRepayment() (gas: 171272)
 TestCustodian:testGenerateOrderInvalidPostSettlement() (gas: 155932)
 TestCustodian:testGenerateOrderRepay() (gas: 175262)
 TestCustodian:testGenerateOrderRepayAsRepayApprovedBorrower() (gas: 191396)
-TestCustodian:testGenerateOrderRepayERC1155AndERC20AndNative() (gas: 827029)
-TestCustodian:testGenerateOrderRepayERC1155AndERC20AndNativeHandlerAuthorized() (gas: 744385)
+TestCustodian:testGenerateOrderRepayERC1155AndERC20AndNative() (gas: 885484)
+TestCustodian:testGenerateOrderRepayERC1155AndERC20AndNativeHandlerAuthorized() (gas: 799902)
 TestCustodian:testGenerateOrderRepayInvalidHookAddress() (gas: 90248)
 TestCustodian:testGenerateOrderRepayInvalidHookReturnType() (gas: 84652)
 TestCustodian:testGenerateOrderRepayNotBorrower() (gas: 99148)
@@ -37,12 +37,12 @@ TestCustodian:testGenerateOrderSettlement() (gas: 147611)
 TestCustodian:testGenerateOrderSettlementHandlerAuthorized() (gas: 153168)
 TestCustodian:testGenerateOrderSettlementNoActiveLoan() (gas: 155828)
 TestCustodian:testGenerateOrderSettlementUnauthorized() (gas: 94388)
-TestCustodian:testGenerateOrdersWithLoanStartAtBlockTimestampInvalidLoan() (gas: 452795)
+TestCustodian:testGenerateOrdersWithLoanStartAtBlockTimestampInvalidLoan() (gas: 472280)
 TestCustodian:testGetBorrower() (gas: 76322)
 TestCustodian:testInvalidAction() (gas: 114520)
 TestCustodian:testInvalidActionRepayInActiveLoan() (gas: 117469)
 TestCustodian:testInvalidActionSettleActiveLoan() (gas: 117429)
-TestCustodian:testMintWithApprovalSetAsBorrower() (gas: 356360)
+TestCustodian:testMintWithApprovalSetAsBorrower() (gas: 355945)
 TestCustodian:testMintWithApprovalSetAsBorrowerInvalidLoan() (gas: 58579)
 TestCustodian:testMintWithApprovalSetNotAuthorized() (gas: 74561)
 TestCustodian:testName() (gas: 7076)
@@ -60,61 +60,62 @@ TestCustodian:testSupportsInterface() (gas: 9428)
 TestCustodian:testSymbol() (gas: 7127)
 TestCustodian:testTokenURI() (gas: 64906)
 TestCustodian:testTokenURIInvalidLoan() (gas: 13218)
+TestFuzzOrigination:testFuzzNewOrigination((address,address,address,(uint8,address,uint256,uint256)[])) (runs: 256, μ: 719304, ~: 724811)
 TestLenderEnforcer:testLERevertAdditionalTransfersFromLender() (gas: 73743)
 TestLenderEnforcer:testLERevertInvalidLoanTerms() (gas: 78341)
 TestLenderEnforcer:testLEValidLoanTerms() (gas: 69496)
 TestLenderEnforcer:testLEValidLoanTermsAnyBorrower() (gas: 69494)
 TestLenderEnforcer:testLEValidLoanTermsWithAdditionalTransfers() (gas: 70740)
-TestLoanCombinations:testLoan20For721SimpleInterestDutchFixedRepay() (gas: 542749)
-TestLoanCombinations:testLoan20for20SimpleInterestDutchFixedRepay() (gas: 530378)
-TestLoanCombinations:testLoan721for20SimpleInterestDutchFixedRepay() (gas: 560572)
-TestLoanCombinations:testLoanAstariaSettlementRepay() (gas: 550314)
-TestLoanCombinations:testLoanSimpleInterestEnglishFixed() (gas: 556092)
-TestNewLoan:testBuyNowPayLater() (gas: 2832773)
-TestNewLoan:testNewLoanERC721CollateralDefaultTerms2() (gas: 394391)
+TestLoanCombinations:testLoan20For721SimpleInterestDutchFixedRepay() (gas: 562234)
+TestLoanCombinations:testLoan20for20SimpleInterestDutchFixedRepay() (gas: 569348)
+TestLoanCombinations:testLoan721for20SimpleInterestDutchFixedRepay() (gas: 580057)
+TestLoanCombinations:testLoanAstariaSettlementRepay() (gas: 569799)
+TestLoanCombinations:testLoanSimpleInterestEnglishFixed() (gas: 575577)
+TestNewLoan:testBuyNowPayLater() (gas: 2871743)
+TestNewLoan:testNewLoanERC721CollateralDefaultTerms2() (gas: 413876)
 TestNewLoan:testNewLoanERC721CollateralLessDebtThanOffered() (gas: 2348)
 TestNewLoan:testNewLoanRefinanceNew() (gas: 207)
-TestNewLoan:testNewLoanViaOriginatorBorrowerApprovalAndLenderApproval() (gas: 305651)
-TestNewLoan:testNewLoanViaOriginatorLenderApproval() (gas: 358345)
-TestNewLoan:testSettleLoan() (gas: 611281)
+TestNewLoan:testNewLoanViaOriginatorBorrowerApprovalAndLenderApproval() (gas: 325136)
+TestNewLoan:testNewLoanViaOriginatorLenderApproval() (gas: 377830)
+TestNewLoan:testSettleLoan() (gas: 630766)
 TestPausableNonReentrant:testNotOwner() (gas: 21254)
 TestPausableNonReentrant:testPauseAndUnpause() (gas: 22555)
 TestPausableNonReentrant:testReentrancy() (gas: 15360)
 TestPausableNonReentrant:testUnpauseWhenNotPaused() (gas: 12582)
 TestRefStarportLib:testSpentToReceived() (gas: 13315)
 TestRefStarportLib:testValidateSalt(address,bytes32) (runs: 256, μ: 33865, ~: 33865)
-TestRepayLoan:testRepayLoanApprovedRepayer() (gas: 635203)
-TestRepayLoan:testRepayLoanBase() (gas: 571493)
-TestRepayLoan:testRepayLoanGenerateOrderNotSeaport() (gas: 402312)
-TestRepayLoan:testRepayLoanInSettlement() (gas: 549952)
-TestRepayLoan:testRepayLoanInvalidRepayer() (gas: 569739)
-TestRepayLoan:testRepayLoanThatDoesNotExist() (gas: 842793)
+TestRepayLoan:testRepayLoanApprovedRepayer() (gas: 654688)
+TestRepayLoan:testRepayLoanBase() (gas: 590978)
+TestRepayLoan:testRepayLoanGenerateOrderNotSeaport() (gas: 421797)
+TestRepayLoan:testRepayLoanInSettlement() (gas: 569437)
+TestRepayLoan:testRepayLoanInvalidRepayer() (gas: 589224)
+TestRepayLoan:testRepayLoanThatDoesNotExist() (gas: 862278)
 TestSimpleInterestPricing:test_calculateInterest() (gas: 800891)
 TestSimpleInterestPricing:test_getPaymentConsideration() (gas: 882219)
 TestSimpleInterestPricing:test_getRefinanceConsideration() (gas: 876412)
 TestStarport:testActive() (gas: 67122)
-TestStarport:testAdditionalTransfers() (gas: 295800)
+TestStarport:testAdditionalTransfers() (gas: 295306)
 TestStarport:testApplyRefinanceConsiderationToLoanMalformed() (gas: 76450)
-TestStarport:testCannotIssueSameLoanTwice() (gas: 336811)
+TestStarport:testCannotIssueSameLoanTwice() (gas: 355051)
 TestStarport:testCannotOriginateWhilePaused() (gas: 70790)
 TestStarport:testCannotSettleInvalidLoan() (gas: 72723)
 TestStarport:testCannotSettleUnlessValidCustodian() (gas: 68866)
 TestStarport:testCaveatEnforcerRevert() (gas: 124015)
-TestStarport:testDefaultFeeRake() (gas: 354905)
+TestStarport:testDefaultFeeRake() (gas: 354154)
 TestStarport:testExoticDebtWithNoCaveatsNotAsBorrower() (gas: 371048)
 TestStarport:testIncrementCaveatNonce() (gas: 34604)
 TestStarport:testInitializedFlagSetProperly() (gas: 65282)
-TestStarport:testInvalidAmountCollateral() (gas: 157834)
-TestStarport:testInvalidAmountCollateral721() (gas: 157811)
+TestStarport:testInvalidAmountCollateral() (gas: 157755)
+TestStarport:testInvalidAmountCollateral721() (gas: 157732)
 TestStarport:testInvalidItemType() (gas: 143733)
-TestStarport:testInvalidTransferLengthCollateral() (gas: 165890)
+TestStarport:testInvalidTransferLengthCollateral() (gas: 145911)
 TestStarport:testInvalidTransferLengthDebt() (gas: 170460)
 TestStarport:testInvalidateCaveatSalt() (gas: 32852)
 TestStarport:testName() (gas: 7216)
 TestStarport:testNonDefaultCustodianCustodyCallFails() (gas: 195113)
-TestStarport:testNonDefaultCustodianCustodyCallSuccess() (gas: 260897)
+TestStarport:testNonDefaultCustodianCustodyCallSuccess() (gas: 260482)
 TestStarport:testNonPayableFunctions() (gas: 180435)
-TestStarport:testOverrideFeeRake() (gas: 348638)
+TestStarport:testOverrideFeeRake() (gas: 348223)
 TestStarport:testPause() (gas: 17119)
 TestStarport:testSupportsInterface() (gas: 9203)
 TestStarport:testSymbol() (gas: 7149)
@@ -130,13 +131,13 @@ TestStrategistOriginator:testEncodeWithAccountCounter() (gas: 12307)
 TestStrategistOriginator:testGetStrategistData() (gas: 1471010)
 TestStrategistOriginator:testIncrementCounterAsStrategist() (gas: 18676)
 TestStrategistOriginator:testIncrementCounterNotAuthorized() (gas: 13467)
-TestStrategistOriginator:testInvalidCollateral() (gas: 206371)
-TestStrategistOriginator:testInvalidDeadline() (gas: 212100)
-TestStrategistOriginator:testInvalidDebt() (gas: 208055)
-TestStrategistOriginator:testInvalidDebtAmountAskingMoreThanOffered() (gas: 208503)
-TestStrategistOriginator:testInvalidDebtAmountOfferingZero() (gas: 188880)
-TestStrategistOriginator:testInvalidDebtAmountRequestingZero() (gas: 208756)
-TestStrategistOriginator:testInvalidDebtLength() (gas: 207383)
-TestStrategistOriginator:testInvalidOffer() (gas: 400727)
-TestStrategistOriginator:testInvalidSigner() (gas: 210594)
+TestStrategistOriginator:testInvalidCollateral() (gas: 206292)
+TestStrategistOriginator:testInvalidDeadline() (gas: 212021)
+TestStrategistOriginator:testInvalidDebt() (gas: 207976)
+TestStrategistOriginator:testInvalidDebtAmountAskingMoreThanOffered() (gas: 208424)
+TestStrategistOriginator:testInvalidDebtAmountOfferingZero() (gas: 208701)
+TestStrategistOriginator:testInvalidDebtAmountRequestingZero() (gas: 208677)
+TestStrategistOriginator:testInvalidDebtLength() (gas: 207304)
+TestStrategistOriginator:testInvalidOffer() (gas: 420212)
+TestStrategistOriginator:testInvalidSigner() (gas: 210515)
 TestStrategistOriginator:testSetStrategist() (gas: 17818)
\ No newline at end of file