diff --git a/.gas-snapshot b/.gas-snapshot
index 171e0eb5..17ffae23 100644
--- a/.gas-snapshot
+++ b/.gas-snapshot
@@ -1,25 +1,25 @@
-IntegrationTestCaveats:testInvalidCaveatLength() (gas: 130019)
-IntegrationTestCaveats:testInvalidCaveats() (gas: 162299)
-IntegrationTestCaveats:testOriginateUnapprovedFulfiller() (gas: 332433)
-IntegrationTestCaveats:testOriginateWBorrowerApproval() (gas: 283300)
-IntegrationTestCaveats:testOriginateWCaveatsAsBorrower() (gas: 308844)
-IntegrationTestCaveats:testOriginateWCaveatsExpired() (gas: 159528)
-IntegrationTestCaveats:testOriginateWCaveatsIncrementedNonce() (gas: 168043)
-IntegrationTestCaveats:testOriginateWCaveatsInvalidSalt() (gas: 317621)
-IntegrationTestCaveats:testOriginateWCaveatsInvalidSaltManual() (gas: 142201)
-IntegrationTestCaveats:testOriginateWLenderApproval() (gas: 283614)
-IntegrationTestCaveats:testRefinanceAsLender() (gas: 1053618)
-IntegrationTestCaveats:testRefinanceCaveatFailure() (gas: 407763)
-IntegrationTestCaveats:testRefinanceLoanStartAtBlockTimestampInvalidLoan() (gas: 347604)
-IntegrationTestCaveats:testRefinanceUnapprovedFulfiller() (gas: 456421)
-IntegrationTestCaveats:testRefinanceWCaveatsInvalidSalt() (gas: 377103)
-IntegrationTestCaveats:testRefinanceWLenderApproval() (gas: 402755)
-ModuleTesting:testFixedTermDutchAuctionSettlement() (gas: 437989)
-ModuleTesting:testFixedTermDutchAuctionSettlementAuctionNotStarted() (gas: 441365)
-ModuleTesting:testFixedTermDutchAuctionSettlementGetSettlementAuctionExpired() (gas: 440758)
-ModuleTesting:testFixedTermDutchAuctionSettlementNotValid() (gas: 437043)
-ModuleTesting:testFixedTermDutchAuctionSettlementValid() (gas: 437950)
-ModuleTesting:testModuleValidation() (gas: 1262841)
+IntegrationTestCaveats:testInvalidCaveatLength() (gas: 130086)
+IntegrationTestCaveats:testInvalidCaveats() (gas: 162366)
+IntegrationTestCaveats:testOriginateUnapprovedFulfiller() (gas: 332567)
+IntegrationTestCaveats:testOriginateWBorrowerApproval() (gas: 283456)
+IntegrationTestCaveats:testOriginateWCaveatsAsBorrower() (gas: 308978)
+IntegrationTestCaveats:testOriginateWCaveatsExpired() (gas: 159595)
+IntegrationTestCaveats:testOriginateWCaveatsIncrementedNonce() (gas: 168066)
+IntegrationTestCaveats:testOriginateWCaveatsInvalidSalt() (gas: 317755)
+IntegrationTestCaveats:testOriginateWCaveatsInvalidSaltManual() (gas: 142246)
+IntegrationTestCaveats:testOriginateWLenderApproval() (gas: 283770)
+IntegrationTestCaveats:testRefinanceAsLender() (gas: 1053752)
+IntegrationTestCaveats:testRefinanceCaveatFailure() (gas: 407964)
+IntegrationTestCaveats:testRefinanceLoanStartAtBlockTimestampInvalidLoan() (gas: 347805)
+IntegrationTestCaveats:testRefinanceUnapprovedFulfiller() (gas: 456578)
+IntegrationTestCaveats:testRefinanceWCaveatsInvalidSalt() (gas: 377260)
+IntegrationTestCaveats:testRefinanceWLenderApproval() (gas: 402978)
+ModuleTesting:testFixedTermDutchAuctionSettlement() (gas: 438123)
+ModuleTesting:testFixedTermDutchAuctionSettlementAuctionNotStarted() (gas: 441499)
+ModuleTesting:testFixedTermDutchAuctionSettlementGetSettlementAuctionExpired() (gas: 440892)
+ModuleTesting:testFixedTermDutchAuctionSettlementNotValid() (gas: 437177)
+ModuleTesting:testFixedTermDutchAuctionSettlementValid() (gas: 438084)
+ModuleTesting:testModuleValidation() (gas: 1262975)
 PausableNonReentrantImpl:test() (gas: 2464)
 PausableNonReentrantImpl:testReentrancy() (gas: 2757)
 TestBorrowerEnforcer:testBERevertAdditionalTransfersFromBorrower() (gas: 76462)
@@ -32,12 +32,12 @@ TestCustodian:testCannotMintInvalidLoanValidCustodian() (gas: 77943)
 TestCustodian:testCustodianCannotBeAuthorized() (gas: 141967)
 TestCustodian:testCustodySelector() (gas: 2717132)
 TestCustodian:testDefaultCustodySelectorRevert() (gas: 72478)
-TestCustodian:testGenerateOrderInvalidPostRepayment() (gas: 172811)
-TestCustodian:testGenerateOrderInvalidPostSettlement() (gas: 163090)
-TestCustodian:testGenerateOrderRepay() (gas: 176971)
-TestCustodian:testGenerateOrderRepayAsRepayApprovedBorrower() (gas: 193439)
-TestCustodian:testGenerateOrderRepayERC1155AndERC20() (gas: 875233)
-TestCustodian:testGenerateOrderRepayERC1155AndERC20HandlerAuthorized() (gas: 804051)
+TestCustodian:testGenerateOrderInvalidPostRepayment() (gas: 172899)
+TestCustodian:testGenerateOrderInvalidPostSettlement() (gas: 163178)
+TestCustodian:testGenerateOrderRepay() (gas: 177059)
+TestCustodian:testGenerateOrderRepayAsRepayApprovedBorrower() (gas: 193527)
+TestCustodian:testGenerateOrderRepayERC1155AndERC20() (gas: 875677)
+TestCustodian:testGenerateOrderRepayERC1155AndERC20HandlerAuthorized() (gas: 804495)
 TestCustodian:testGenerateOrderRepayInvalidHookAddress() (gas: 97556)
 TestCustodian:testGenerateOrderRepayInvalidHookReturnType() (gas: 91917)
 TestCustodian:testGenerateOrderRepayNotBorrower() (gas: 106827)
@@ -45,7 +45,7 @@ TestCustodian:testGenerateOrderSettlement() (gas: 154891)
 TestCustodian:testGenerateOrderSettlementHandlerAuthorized() (gas: 160288)
 TestCustodian:testGenerateOrderSettlementNoActiveLoan() (gas: 163374)
 TestCustodian:testGenerateOrderSettlementUnauthorized() (gas: 101809)
-TestCustodian:testGenerateOrdersWithLoanStartAtBlockTimestampInvalidLoan() (gas: 461377)
+TestCustodian:testGenerateOrdersWithLoanStartAtBlockTimestampInvalidLoan() (gas: 461511)
 TestCustodian:testGetBorrower() (gas: 78603)
 TestCustodian:testInvalidAction() (gas: 179690)
 TestCustodian:testInvalidActionRepayInActiveLoan() (gas: 130036)
@@ -57,12 +57,12 @@ TestCustodian:testMintWithApprovalSetNotAuthorized() (gas: 66842)
 TestCustodian:testName() (gas: 7077)
 TestCustodian:testNonPayableFunctions() (gas: 215289)
 TestCustodian:testOnlySeaport() (gas: 17918)
-TestCustodian:testPreviewOrderNoActiveLoan() (gas: 105714)
-TestCustodian:testPreviewOrderRepay() (gas: 229749)
-TestCustodian:testPreviewOrderSettlement() (gas: 191710)
-TestCustodian:testPreviewOrderSettlementInvalidFufliller() (gas: 108205)
-TestCustodian:testPreviewOrderSettlementInvalidRepayer() (gas: 116898)
-TestCustodian:testRatifyOrder() (gas: 183792)
+TestCustodian:testPreviewOrderNoActiveLoan() (gas: 105670)
+TestCustodian:testPreviewOrderRepay() (gas: 229793)
+TestCustodian:testPreviewOrderSettlement() (gas: 191754)
+TestCustodian:testPreviewOrderSettlementInvalidFufliller() (gas: 108161)
+TestCustodian:testPreviewOrderSettlementInvalidRepayer() (gas: 116854)
+TestCustodian:testRatifyOrder() (gas: 183880)
 TestCustodian:testSeaportMetadata() (gas: 8588)
 TestCustodian:testSupportsInterface() (gas: 9428)
 TestCustodian:testSymbol() (gas: 7194)
@@ -73,81 +73,82 @@ TestLenderEnforcer:testLERevertInvalidLoanTerms() (gas: 81096)
 TestLenderEnforcer:testLEValidLoanTerms() (gas: 72169)
 TestLenderEnforcer:testLEValidLoanTermsAnyBorrower() (gas: 72234)
 TestLenderEnforcer:testLEValidLoanTermsWithAdditionalTransfers() (gas: 73525)
-TestLoanCombinations:testLoan20For721SimpleInterestDutchFixedRepay() (gas: 592318)
-TestLoanCombinations:testLoan20for20SimpleInterestDutchFixedRepay() (gas: 599531)
-TestLoanCombinations:testLoan721for20SimpleInterestDutchFixedRepay() (gas: 589682)
-TestLoanCombinations:testLoanAstariaSettlementRepay() (gas: 579566)
-TestNewLoan:testBuyNowPayLater() (gas: 3018379)
-TestNewLoan:testNewLoanAs1271ProxyAccountSender() (gas: 874045)
-TestNewLoan:testNewLoanAs1271ProxyAccountThirdPartyFiller() (gas: 885070)
-TestNewLoan:testNewLoanERC721CollateralDefaultTerms2() (gas: 429501)
-TestNewLoan:testNewLoanRefinance() (gas: 589822)
-TestNewLoan:testNewLoanViaOriginatorBorrowerApprovalAndLenderApproval() (gas: 324529)
-TestNewLoan:testNewLoanViaOriginatorLenderApproval() (gas: 383347)
-TestNewLoan:testSettleLoan() (gas: 641934)
+TestLoanCombinations:testLoan20For721SimpleInterestDutchFixedRepay() (gas: 592496)
+TestLoanCombinations:testLoan20for20SimpleInterestDutchFixedRepay() (gas: 599709)
+TestLoanCombinations:testLoan721for20SimpleInterestDutchFixedRepay() (gas: 589927)
+TestLoanCombinations:testLoanAstariaSettlementRepay() (gas: 579744)
+TestNewLoan:testBuyNowPayLater() (gas: 3018513)
+TestNewLoan:testNewLoanAs1271ProxyAccountSender() (gas: 874179)
+TestNewLoan:testNewLoanAs1271ProxyAccountThirdPartyFiller() (gas: 885204)
+TestNewLoan:testNewLoanERC721CollateralDefaultTerms2() (gas: 429635)
+TestNewLoan:testNewLoanRefinance() (gas: 589971)
+TestNewLoan:testNewLoanViaOriginatorBorrowerApprovalAndLenderApproval() (gas: 324707)
+TestNewLoan:testNewLoanViaOriginatorLenderApproval() (gas: 383503)
+TestNewLoan:testSettleLoan() (gas: 642156)
 TestPausableNonReentrant:testNotOwner() (gas: 21276)
 TestPausableNonReentrant:testPauseAndUnpause() (gas: 22643)
 TestPausableNonReentrant:testReentrancy() (gas: 15404)
 TestPausableNonReentrant:testUnpauseWhenNotPaused() (gas: 12604)
-TestRepayLoan:testRepayLoanApprovedRepayer() (gas: 666539)
-TestRepayLoan:testRepayLoanBase() (gas: 599361)
-TestRepayLoan:testRepayLoanGenerateOrderNotSeaport() (gas: 438643)
-TestRepayLoan:testRepayLoanInSettlement() (gas: 585543)
-TestRepayLoan:testRepayLoanInvalidRepayer() (gas: 603553)
-TestRepayLoan:testRepayLoanThatDoesNotExist() (gas: 857388)
+TestRepayLoan:testRepayLoanApprovedRepayer() (gas: 666673)
+TestRepayLoan:testRepayLoanBase() (gas: 599539)
+TestRepayLoan:testRepayLoanGenerateOrderNotSeaport() (gas: 438777)
+TestRepayLoan:testRepayLoanInSettlement() (gas: 585633)
+TestRepayLoan:testRepayLoanInvalidRepayer() (gas: 603643)
+TestRepayLoan:testRepayLoanThatDoesNotExist() (gas: 857698)
 TestSimpleInterestPricing:test_calculateInterest() (gas: 869870)
 TestSimpleInterestPricing:test_getPaymentConsideration() (gas: 916886)
 TestSimpleInterestPricing:test_getRefinanceConsideration() (gas: 907796)
-TestStarport:testAcquireTokensFail() (gas: 60386)
-TestStarport:testAcquireTokensSuccess() (gas: 162757)
-TestStarport:testActive() (gas: 69291)
-TestStarport:testAdditionalTransfers() (gas: 300688)
-TestStarport:testAdditionalTransfersOriginate() (gas: 275384)
-TestStarport:testAdditionalTransfersRefinance() (gas: 218115)
-TestStarport:testApplyRefinanceConsiderationToLoanMalformed() (gas: 129820)
-TestStarport:testCannotIssueSameLoanTwice() (gas: 363991)
-TestStarport:testCannotOriginateWhilePaused() (gas: 73523)
-TestStarport:testCannotSettleInvalidLoan() (gas: 74881)
-TestStarport:testCannotSettleUnlessValidCustodian() (gas: 70919)
-TestStarport:testCaveatEnforcerRevert() (gas: 102534)
-TestStarport:testDefaultFeeRake1() (gas: 387913)
-TestStarport:testDefaultFeeRake2() (gas: 450256)
-TestStarport:testDefaultFeeRakeExoticDebt() (gas: 397546)
-TestStarport:testEIP712Signing() (gas: 83056)
-TestStarport:testExoticDebtWithCustomPricingAndRepayment() (gas: 1237672)
-TestStarport:testExoticDebtWithCustomPricingAndSettlement() (gas: 1695711)
-TestStarport:testExoticDebtWithNoCaveatsNotAsBorrower() (gas: 376594)
-TestStarport:testIncrementCaveatNonce() (gas: 35183)
-TestStarport:testInitializedFlagSetProperly() (gas: 67416)
-TestStarport:testInvalidAdditionalTransfersOriginate() (gas: 230359)
-TestStarport:testInvalidAdditionalTransfersRefinance() (gas: 170675)
-TestStarport:testInvalidAmountCollateral() (gas: 165901)
-TestStarport:testInvalidAmountCollateral721() (gas: 165901)
-TestStarport:testInvalidItemType() (gas: 151849)
-TestStarport:testInvalidTransferLengthCollateral() (gas: 154118)
-TestStarport:testInvalidTransferLengthDebt() (gas: 175917)
-TestStarport:testInvalidateCaveatSalt() (gas: 33450)
-TestStarport:testNonDefaultCustodianCustodyCallFails() (gas: 264200)
-TestStarport:testNonDefaultCustodianCustodyCallSuccess() (gas: 290347)
+TestStarport:testAcquireTokensFail() (gas: 60473)
+TestStarport:testAcquireTokensSuccess() (gas: 162844)
+TestStarport:testActive() (gas: 69358)
+TestStarport:testAdditionalTransfers() (gas: 300755)
+TestStarport:testAdditionalTransfersOriginate() (gas: 275540)
+TestStarport:testAdditionalTransfersRefinance() (gas: 218107)
+TestStarport:testApplyRefinanceConsiderationToLoanMalformed() (gas: 129484)
+TestStarport:testCannotIssueSameLoanTwice() (gas: 364125)
+TestStarport:testCannotOriginateWhilePaused() (gas: 73479)
+TestStarport:testCannotSettleInvalidLoan() (gas: 74969)
+TestStarport:testCannotSettleUnlessValidCustodian() (gas: 71007)
+TestStarport:testCaveatEnforcerRevert() (gas: 102601)
+TestStarport:testDefaultFeeRake1() (gas: 383458)
+TestStarport:testDefaultFeeRake2() (gas: 445821)
+TestStarport:testDefaultFeeRakeExoticDebt() (gas: 394368)
+TestStarport:testEIP712Signing() (gas: 83109)
+TestStarport:testExcessiveFeeRake() (gas: 19992)
+TestStarport:testExoticDebtWithCustomPricingAndRepayment() (gas: 1237783)
+TestStarport:testExoticDebtWithCustomPricingAndSettlement() (gas: 1695822)
+TestStarport:testExoticDebtWithNoCaveatsNotAsBorrower() (gas: 376639)
+TestStarport:testIncrementCaveatNonce() (gas: 35117)
+TestStarport:testInitializedFlagSetProperly() (gas: 67372)
+TestStarport:testInvalidAdditionalTransfersOriginate() (gas: 230426)
+TestStarport:testInvalidAdditionalTransfersRefinance() (gas: 170667)
+TestStarport:testInvalidAmountCollateral() (gas: 165968)
+TestStarport:testInvalidAmountCollateral721() (gas: 165968)
+TestStarport:testInvalidItemType() (gas: 151916)
+TestStarport:testInvalidTransferLengthCollateral() (gas: 154185)
+TestStarport:testInvalidTransferLengthDebt() (gas: 175984)
+TestStarport:testInvalidateCaveatSalt() (gas: 33428)
+TestStarport:testNonDefaultCustodianCustodyCallFails() (gas: 264267)
+TestStarport:testNonDefaultCustodianCustodyCallSuccess() (gas: 290392)
 TestStarport:testNonPayableFunctions() (gas: 114479)
-TestStarport:testOverrideFeeRake() (gas: 384236)
-TestStarport:testPause() (gas: 18193)
+TestStarport:testOverrideFeeRake() (gas: 379873)
+TestStarport:testPause() (gas: 18127)
 TestStarport:testRefinancePostRepaymentFails() (gas: 127765)
-TestStarport:testStargateGetOwner() (gas: 8786)
-TestStarport:testTokenNoCodeCollateral() (gas: 150640)
-TestStarport:testTokenNoCodeDebt() (gas: 180913)
-TestStarport:testUnpause() (gas: 17275)
+TestStarport:testStargateGetOwner() (gas: 8851)
+TestStarport:testTokenNoCodeCollateral() (gas: 150707)
+TestStarport:testTokenNoCodeDebt() (gas: 180980)
+TestStarport:testUnpause() (gas: 17187)
 TestStrategistOriginator:testEncodeWithAccountCounter() (gas: 12429)
 TestStrategistOriginator:testIncrementCounterAsStrategist() (gas: 38457)
 TestStrategistOriginator:testIncrementCounterNotAuthorized() (gas: 13468)
-TestStrategistOriginator:testInvalidCollateral() (gas: 210360)
-TestStrategistOriginator:testInvalidDeadline() (gas: 216181)
-TestStrategistOriginator:testInvalidDebt() (gas: 212068)
-TestStrategistOriginator:testInvalidDebtAmountAskingMoreThanOffered() (gas: 212552)
-TestStrategistOriginator:testInvalidDebtAmountOfferingZero() (gas: 212772)
-TestStrategistOriginator:testInvalidDebtAmountRequestingZero() (gas: 212707)
-TestStrategistOriginator:testInvalidDebtLength() (gas: 211362)
-TestStrategistOriginator:testInvalidOffer() (gas: 427117)
-TestStrategistOriginator:testInvalidSigner() (gas: 214522)
+TestStrategistOriginator:testInvalidCollateral() (gas: 210516)
+TestStrategistOriginator:testInvalidDeadline() (gas: 216337)
+TestStrategistOriginator:testInvalidDebt() (gas: 212224)
+TestStrategistOriginator:testInvalidDebtAmountAskingMoreThanOffered() (gas: 212708)
+TestStrategistOriginator:testInvalidDebtAmountOfferingZero() (gas: 212928)
+TestStrategistOriginator:testInvalidDebtAmountRequestingZero() (gas: 212863)
+TestStrategistOriginator:testInvalidDebtLength() (gas: 211518)
+TestStrategistOriginator:testInvalidOffer() (gas: 427273)
+TestStrategistOriginator:testInvalidSigner() (gas: 214678)
 TestStrategistOriginator:testSetStrategist() (gas: 17852)
-TestStrategistOriginator:testWithdraw() (gas: 167733)
+TestStrategistOriginator:testWithdraw() (gas: 167733)
\ No newline at end of file