diff --git a/.gas-snapshot b/.gas-snapshot
index 01599df8..ceda2802 100644
--- a/.gas-snapshot
+++ b/.gas-snapshot
@@ -1,41 +1,40 @@
 AccountDelegate:test_isAccountDelegate_account_doesnt_exist() (gas: 26743)
-AccountDelegate:test_isAccountDelegate_false() (gas: 397522)
-AccountDelegate:test_isAccountDelegate_true() (gas: 395492)
-AccountDelegate:test_isAccountDelegate_zero_address_caller() (gas: 28007)
-AccountOwner:test_isAccountOwner_account_doesnt_exist() (gas: 29956)
-AccountOwner:test_isAccountOwner_false() (gas: 235147)
-AccountOwner:test_isAccountOwner_true() (gas: 235137)
-AccountOwner:test_isAccountOwner_zero_address_caller() (gas: 15655)
-CanExecute:test_canExecute_false_insufficent_account_credit() (gas: 420873)
-CanExecute:test_canExecute_false_invalid_signature() (gas: 455235)
-CanExecute:test_canExecute_false_invalid_signer() (gas: 448226)
-CanExecute:test_canExecute_false_maxExecutorFee_exceeded() (gas: 403715)
-CanExecute:test_canExecute_false_nonce_used() (gas: 1028822)
-CanExecute:test_canExecute_false_require_verify_condition_not_met() (gas: 538394)
-CanExecute:test_canExecute_false_trusted_executor() (gas: 444510)
-CanExecute:test_canExecute_true() (gas: 444127)
-CommitOrder:test_commitOrder() (gas: 585317)
-CommitOrder:test_commitOrder_Unauthorized() (gas: 37886)
-CommitOrder:test_commitOrder_insufficient_collateral() (gas: 425911)
-CommitOrder:test_commitOrder_invalid_market() (gas: 44570)
-Conditions:test_isOrderFeeBelow() (gas: 154736)
+AccountDelegate:test_isAccountDelegate_false() (gas: 397544)
+AccountDelegate:test_isAccountDelegate_true() (gas: 395514)
+AccountDelegate:test_isAccountDelegate_zero_address_caller() (gas: 28029)
+AccountOwner:test_isAccountOwner_account_doesnt_exist() (gas: 29978)
+AccountOwner:test_isAccountOwner_false() (gas: 235169)
+AccountOwner:test_isAccountOwner_true() (gas: 235159)
+AccountOwner:test_isAccountOwner_zero_address_caller() (gas: 15677)
+CanExecute:test_canExecute_false_insufficent_account_credit() (gas: 420895)
+CanExecute:test_canExecute_false_invalid_signature() (gas: 455279)
+CanExecute:test_canExecute_false_invalid_signer() (gas: 448270)
+CanExecute:test_canExecute_false_maxExecutorFee_exceeded() (gas: 403759)
+CanExecute:test_canExecute_false_nonce_used() (gas: 1028844)
+CanExecute:test_canExecute_false_require_verify_condition_not_met() (gas: 538438)
+CanExecute:test_canExecute_false_trusted_executor() (gas: 444532)
+CanExecute:test_canExecute_true() (gas: 444149)
+CommitOrder:test_commitOrder() (gas: 585339)
+CommitOrder:test_commitOrder_Unauthorized() (gas: 37908)
+CommitOrder:test_commitOrder_insufficient_collateral() (gas: 425933)
+CommitOrder:test_commitOrder_invalid_market() (gas: 44592)
+Conditions:test_isOrderFeeBelow() (gas: 154802)
 Conditions:test_isPositionSizeAbove() (gas: 24623)
 Conditions:test_isPositionSizeBelow() (gas: 24532)
-Conditions:test_isPriceAbove() (gas: 175902)
-Conditions:test_isPriceBelow() (gas: 175911)
-Conditions:test_isTimestampAfter() (gas: 13222)
+Conditions:test_isPriceAbove() (gas: 175726)
+Conditions:test_isPriceBelow() (gas: 175643)
+Conditions:test_isTimestampAfter() (gas: 13288)
 Conditions:test_isTimestampBefore() (gas: 13310)
-Credit:test_credit(uint256) (runs: 256, μ: 108122, ~: 117896)
-Credit:test_credit_AccountDoesNotExist() (gas: 32903)
-Credit:test_credit_event() (gas: 102432)
-Debit:test_debit(uint256) (runs: 256, μ: 138566, ~: 148572)
-Debit:test_debit_InsufficientBalance() (gas: 125707)
-Debit:test_debit_Unauthorized() (gas: 125756)
-Debit:test_debit_event() (gas: 106793)
-DeploymentTest:test_deploy() (gas: 4507664)
-DeploymentTest:test_deploy_perps_market_proxy_zero_address() (gas: 58569)
-DeploymentTest:test_deploy_spot_market_proxy_zero_address() (gas: 55972)
-DeploymentTest:test_deploy_susd_proxy_zero_address() (gas: 55959)
+Credit:test_credit(uint256) (runs: 256, μ: 94026, ~: 103617)
+Credit:test_credit_event() (gas: 88153)
+Debit:test_debit(uint256) (runs: 256, μ: 135804, ~: 145727)
+Debit:test_debit_InsufficientBalance() (gas: 122862)
+Debit:test_debit_Unauthorized() (gas: 122911)
+Debit:test_debit_event() (gas: 104517)
+DeploymentTest:test_deploy() (gas: 4562614)
+DeploymentTest:test_deploy_perps_market_proxy_zero_address() (gas: 58650)
+DeploymentTest:test_deploy_spot_market_proxy_zero_address() (gas: 56053)
+DeploymentTest:test_deploy_susd_proxy_zero_address() (gas: 56040)
 DepositCollateral:test_depositCollateral() (gas: 433746)
 DepositCollateral:test_depositCollateral_availableMargin() (gas: 437913)
 DepositCollateral:test_depositCollateral_collateralAmount() (gas: 433866)
@@ -49,17 +48,17 @@ EIP712Test:test_constructor() (gas: 164)
 EIP712Test:test_domainNameAndVersion() (gas: 1261)
 EIP712Test:test_eip712Domain() (gas: 187)
 EIP712Test:test_hashTypedData() (gas: 187)
-Execute:test_execute_CannotExecuteOrder_invalid_acceptablePrice() (gas: 322429)
-Execute:test_execute_CannotExecuteOrder_invalid_settlementStrategyId() (gas: 103642)
-Execute:test_execute_CannotExecuteOrder_too_leveraged() (gas: 469075)
-Execute:test_execute_event() (gas: 635760)
-Execute:test_execute_order_committed() (gas: 632327)
-Fee:test_fee_exceeds_account_credit() (gas: 139299)
-Fee:test_fee_exceeds_maxExecutorFee() (gas: 138861)
-Fee:test_fee_imposed() (gas: 722628)
-FulfillOracleQuery:test_fulfillOracleQuery(bytes) (runs: 256, μ: 31345, ~: 31337)
-FulfillOracleQuery:test_fulfillOracleQuery_refund(bytes) (runs: 256, μ: 40368, ~: 40360)
-FulfillOracleQuery:test_fulfillOracleQuery_revert(bytes) (runs: 256, μ: 32992, ~: 32984)
+Execute:test_execute_CannotExecuteOrder_invalid_acceptablePrice() (gas: 322451)
+Execute:test_execute_CannotExecuteOrder_invalid_settlementStrategyId() (gas: 103664)
+Execute:test_execute_CannotExecuteOrder_too_leveraged() (gas: 469097)
+Execute:test_execute_event() (gas: 635782)
+Execute:test_execute_order_committed() (gas: 632349)
+Fee:test_fee_exceeds_account_credit() (gas: 125042)
+Fee:test_fee_exceeds_maxExecutorFee() (gas: 124604)
+Fee:test_fee_imposed() (gas: 719871)
+FulfillOracleQuery:test_fulfillOracleQuery(bytes) (runs: 256, μ: 31280, ~: 31272)
+FulfillOracleQuery:test_fulfillOracleQuery_refund(bytes) (runs: 256, μ: 40303, ~: 40295)
+FulfillOracleQuery:test_fulfillOracleQuery_revert(bytes) (runs: 256, μ: 32927, ~: 32919)
 MathLibTest:test_abs128() (gas: 448)
 MathLibTest:test_abs256() (gas: 458)
 MathLibTest:test_fuzz_abs128(int128) (runs: 256, μ: 578, ~: 603)
@@ -68,12 +67,12 @@ MathLibTest:test_fuzz_toInt256(uint256) (runs: 256, μ: 1054, ~: 438)
 MathLibTest:test_isSameSign() (gas: 999)
 MathLibTest:test_toInt256() (gas: 3347)
 MathLibTest:test_toInt256_overflow() (gas: 3251)
-MockUpgrade:test_upgrade() (gas: 4531858)
-MockUpgrade:test_upgrade_credit_state(uint256) (runs: 256, μ: 4624658, ~: 4624658)
-MockUpgrade:test_upgrade_nonce_state(uint256) (runs: 256, μ: 4565599, ~: 4565599)
-MockUpgrade:test_upgrade_only_pDAO() (gas: 4517003)
-MulticallFulfillOracleQuery:test_fulfillOracleQuery_multicall(bytes) (runs: 256, μ: 34629, ~: 34564)
-MulticallFulfillOracleQuery:test_fulfillOracleQuery_multicall_double_spend(bytes) (runs: 256, μ: 47723, ~: 47597)
+MockUpgrade:test_upgrade() (gas: 4586818)
+MockUpgrade:test_upgrade_credit_state(uint256) (runs: 256, μ: 4665339, ~: 4665339)
+MockUpgrade:test_upgrade_nonce_state(uint256) (runs: 256, μ: 4620625, ~: 4620625)
+MockUpgrade:test_upgrade_only_pDAO() (gas: 4571918)
+MulticallFulfillOracleQuery:test_fulfillOracleQuery_multicall(bytes) (runs: 256, μ: 34586, ~: 34521)
+MulticallFulfillOracleQuery:test_fulfillOracleQuery_multicall_double_spend(bytes) (runs: 256, μ: 47615, ~: 47489)
 MulticallablePayableTest:testMulticallableBenchmark() (gas: 29229)
 MulticallablePayableTest:testMulticallableOriginalBenchmark() (gas: 38407)
 MulticallablePayableTest:testMulticallablePreservesMsgSender() (gas: 11065)
@@ -85,28 +84,28 @@ MulticallablePayableTest:testMulticallableRevertWithMessage() (gas: 13406)
 MulticallablePayableTest:testMulticallableRevertWithMessage(string) (runs: 256, μ: 14013, ~: 13861)
 MulticallablePayableTest:testMulticallableRevertWithNothing() (gas: 11633)
 MulticallablePayableTest:testMulticallableWithNoData() (gas: 6266)
-NonceBitmapTest:test_fuzz_invalidateUnorderedNonces(uint256) (runs: 256, μ: 58021, ~: 58021)
-NonceBitmapTest:test_hasUnorderedNonceBeenUsed() (gas: 59750)
-NonceBitmapTest:test_invalidateUnorderedNonces() (gas: 83097)
-NonceBitmapTest:test_invalidateUnorderedNonces_Only_Owner_Delegate() (gas: 196511)
-NonceBitmapTest:test_invalidateUnorderedNonces_Unauthorized() (gas: 35551)
-NonceBitmapTest:test_invalidateUnorderedNonces_event() (gas: 58299)
-ReduceOnly:test_reduce_only() (gas: 634049)
-ReduceOnly:test_reduce_only_same_sign() (gas: 77843)
-ReduceOnly:test_reduce_only_truncate_size_down() (gas: 634189)
-ReduceOnly:test_reduce_only_truncate_size_up() (gas: 614734)
-ReduceOnly:test_reduce_only_when_position_doesnt_exist() (gas: 166297)
-ReduceOnly:test_reduce_only_zero_size_delta() (gas: 166331)
-RemoveUpgradability:test_removeUpgradability() (gas: 4502323)
+NonceBitmapTest:test_fuzz_invalidateUnorderedNonces(uint256) (runs: 256, μ: 58065, ~: 58065)
+NonceBitmapTest:test_hasUnorderedNonceBeenUsed() (gas: 59816)
+NonceBitmapTest:test_invalidateUnorderedNonces() (gas: 83141)
+NonceBitmapTest:test_invalidateUnorderedNonces_Only_Owner_Delegate() (gas: 196599)
+NonceBitmapTest:test_invalidateUnorderedNonces_Unauthorized() (gas: 35573)
+NonceBitmapTest:test_invalidateUnorderedNonces_event() (gas: 58321)
+ReduceOnly:test_reduce_only() (gas: 634071)
+ReduceOnly:test_reduce_only_same_sign() (gas: 77865)
+ReduceOnly:test_reduce_only_truncate_size_down() (gas: 634211)
+ReduceOnly:test_reduce_only_truncate_size_up() (gas: 614756)
+ReduceOnly:test_reduce_only_when_position_doesnt_exist() (gas: 166319)
+ReduceOnly:test_reduce_only_zero_size_delta() (gas: 166353)
+RemoveUpgradability:test_removeUpgradability() (gas: 4557239)
 SignatureCheckerLibTest:test_isValidSignatureNowCalldata(address,bytes32,bytes) (runs: 256, μ: 3487, ~: 3474)
-VerifyConditions:test_max_condition_size_exceeded() (gas: 51295)
-VerifyConditions:test_verifyConditions_InvalidConditionSelector() (gas: 19063)
-VerifyConditions:test_verify_conditions_not_verified() (gas: 127946)
-VerifyConditions:test_verify_conditions_verified() (gas: 175726)
-VerifySignature:test_verifySignature(uint256) (runs: 256, μ: 30169, ~: 30169)
-VerifySignature:test_verifySignature_false_private_key() (gas: 32833)
-VerifySigner:test_verifySigner() (gas: 30896)
-VerifySigner:test_verifySigner_false() (gas: 33604)
+VerifyConditions:test_max_condition_size_exceeded() (gas: 51317)
+VerifyConditions:test_verifyConditions_InvalidConditionSelector() (gas: 19085)
+VerifyConditions:test_verify_conditions_not_verified() (gas: 127879)
+VerifyConditions:test_verify_conditions_verified() (gas: 175681)
+VerifySignature:test_verifySignature(uint256) (runs: 256, μ: 30191, ~: 30191)
+VerifySignature:test_verifySignature_false_private_key() (gas: 32855)
+VerifySigner:test_verifySigner() (gas: 30918)
+VerifySigner:test_verifySigner_false() (gas: 33626)
 WithdrawCollateral:test_withdrawCollateral() (gas: 539651)
 WithdrawCollateral:test_withdrawCollateral_insufficient_account_collateral_balance() (gas: 445868)
 WithdrawCollateral:test_withdrawCollateral_zap() (gas: 936156)
diff --git a/lcov.info b/lcov.info
index 02edabf5..e969df75 100644
--- a/lcov.info
+++ b/lcov.info
@@ -6,47 +6,47 @@ DA:100,0
 DA:101,0
 DA:103,0
 DA:112,0
+FN:78,DeployBase_Andromeda.run
+FNDA:0,DeployBase_Andromeda.run
+DA:79,0
+DA:80,0
+DA:82,0
+DA:91,0
 FN:144,DeployBaseGoerli_KwentaFork.run
 FNDA:0,DeployBaseGoerli_KwentaFork.run
 DA:145,0
 DA:146,0
 DA:148,0
 DA:157,0
-FN:57,DeployBase_Synthetix.run
-FNDA:0,DeployBase_Synthetix.run
-DA:58,0
-DA:59,0
-DA:61,0
-DA:70,0
-FN:120,DeployBaseGoerli_Andromeda.run
-FNDA:0,DeployBaseGoerli_Andromeda.run
-DA:121,0
-DA:122,0
-DA:124,0
-DA:133,0
 FN:186,DeployOptimismGoerli_Synthetix.run
 FNDA:0,DeployOptimismGoerli_Synthetix.run
 DA:187,0
 DA:188,0
 DA:190,0
 DA:199,0
-FN:78,DeployBase_Andromeda.run
-FNDA:0,DeployBase_Andromeda.run
-DA:79,0
-DA:80,0
-DA:82,0
-DA:91,0
+FN:28,Setup.deploySystem
+FNDA:4,Setup.deploySystem
+DA:36,85
+DA:46,82
+DA:49,82
 FN:165,DeployOptimism_Synthetix.run
 FNDA:0,DeployOptimism_Synthetix.run
 DA:166,0
 DA:167,0
 DA:169,0
 DA:178,0
-FN:28,Setup.deploySystem
-FNDA:4,Setup.deploySystem
-DA:36,86
-DA:46,83
-DA:49,83
+FN:57,DeployBase_Synthetix.run
+FNDA:0,DeployBase_Synthetix.run
+DA:58,0
+DA:59,0
+DA:61,0
+DA:70,0
+FN:120,DeployBaseGoerli_Andromeda.run
+FNDA:0,DeployBaseGoerli_Andromeda.run
+DA:121,0
+DA:122,0
+DA:124,0
+DA:133,0
 FNF:8
 FNH:1
 LF:31
@@ -56,18 +56,27 @@ BRH:0
 end_of_record
 TN:
 SF:script/Upgrade.s.sol
+FN:69,DeployBaseGoerli_Synthetix.run
+FNDA:0,DeployBaseGoerli_Synthetix.run
+DA:70,0
+DA:71,0
+DA:73,0
+DA:82,0
 FN:156,DeployOptimismGoerli_Synthetix.run
 FNDA:0,DeployOptimismGoerli_Synthetix.run
 DA:157,0
 DA:158,0
 DA:160,0
 DA:169,0
-FN:93,DeployBaseGoerli_KwentaFork.run
-FNDA:0,DeployBaseGoerli_KwentaFork.run
-DA:94,0
-DA:95,0
-DA:97,0
-DA:106,0
+FN:25,Setup.deployImplementation
+FNDA:0,Setup.deployImplementation
+DA:33,0
+FN:135,DeployOptimism_Synthetix.run
+FNDA:0,DeployOptimism_Synthetix.run
+DA:136,0
+DA:137,0
+DA:139,0
+DA:148,0
 FN:48,DeployBase_Synthetix.run
 FNDA:0,DeployBase_Synthetix.run
 DA:49,0
@@ -80,21 +89,12 @@ DA:115,0
 DA:116,0
 DA:118,0
 DA:127,0
-FN:69,DeployBaseGoerli_Synthetix.run
-FNDA:0,DeployBaseGoerli_Synthetix.run
-DA:70,0
-DA:71,0
-DA:73,0
-DA:82,0
-FN:135,DeployOptimism_Synthetix.run
-FNDA:0,DeployOptimism_Synthetix.run
-DA:136,0
-DA:137,0
-DA:139,0
-DA:148,0
-FN:25,Setup.deployImplementation
-FNDA:0,Setup.deployImplementation
-DA:33,0
+FN:93,DeployBaseGoerli_KwentaFork.run
+FNDA:0,DeployBaseGoerli_KwentaFork.run
+DA:94,0
+DA:95,0
+DA:97,0
+DA:106,0
 FNF:7
 FNH:0
 LF:25
@@ -104,247 +104,260 @@ BRH:0
 end_of_record
 TN:
 SF:src/Engine.sol
-FN:136,Engine._authorizeUpgrade
+FN:140,Engine.zap
+FNDA:0,Engine.zap
+DA:141,0
+FN:149,Engine._authorizeUpgrade
 FNDA:516,Engine._authorizeUpgrade
-DA:141,516
-BRDA:141,0,0,1
-BRDA:141,0,1,515
-DA:142,515
-BRDA:142,1,0,1
-BRDA:142,1,1,514
-FN:150,Engine.isAccountOwner
+DA:154,516
+BRDA:154,0,0,1
+BRDA:154,0,1,515
+DA:155,515
+BRDA:155,1,0,1
+BRDA:155,1,1,514
+FN:163,Engine.isAccountOwner
 FNDA:4,Engine.isAccountOwner
-DA:156,267
-DA:157,266
-FN:161,Engine.isAccountDelegate
+DA:169,267
+DA:170,266
+FN:174,Engine.isAccountDelegate
 FNDA:3,Engine.isAccountDelegate
-DA:167,3
-FN:172,Engine._isAccountOwnerOrDelegate
+DA:180,3
+FN:185,Engine._isAccountOwnerOrDelegate
 FNDA:543,Engine._isAccountOwnerOrDelegate
-DA:177,543
-DA:178,543
-FN:188,Engine.invalidateUnorderedNonces
+DA:190,543
+DA:191,543
+FN:201,Engine.invalidateUnorderedNonces
 FNDA:518,Engine.invalidateUnorderedNonces
-DA:193,518
-BRDA:193,2,0,517
-BRDA:193,2,1,1
-DA:199,517
-DA:201,517
-DA:203,1
-FN:208,Engine.hasUnorderedNonceBeenUsed
+DA:206,518
+BRDA:206,2,0,517
+BRDA:206,2,1,1
+DA:212,517
+DA:214,517
+DA:216,1
+FN:221,Engine.hasUnorderedNonceBeenUsed
 FNDA:772,Engine.hasUnorderedNonceBeenUsed
-DA:214,793
-DA:218,793
-DA:235,793
-FN:250,Engine._bitmapPositions
+DA:227,793
+DA:231,793
+DA:248,793
+FN:263,Engine._bitmapPositions
 FNDA:806,Engine._bitmapPositions
-DA:259,806
-DA:263,806
-FN:271,Engine._useUnorderedNonce
+DA:272,806
+DA:276,806
+FN:284,Engine._useUnorderedNonce
 FNDA:13,Engine._useUnorderedNonce
-DA:272,13
-DA:276,13
-DA:284,13
-DA:307,13
-BRDA:307,3,0,-
-BRDA:307,3,1,13
-FN:315,Engine.modifyCollateral
+DA:285,13
+DA:289,13
+DA:297,13
+DA:320,13
+BRDA:320,3,0,-
+BRDA:320,3,1,13
+FN:328,Engine.modifyCollateral
 FNDA:59,Engine.modifyCollateral
-DA:320,59
-DA:322,59
-BRDA:322,4,0,56
-BRDA:322,4,1,3
-DA:323,56
-DA:327,3
-BRDA:327,5,0,-
-BRDA:327,5,1,3
-DA:329,3
-FN:336,Engine.modifyCollateralZap
+DA:333,59
+DA:335,59
+BRDA:335,4,0,56
+BRDA:335,4,1,3
+DA:336,56
+DA:340,3
+BRDA:340,5,0,-
+BRDA:340,5,1,3
+DA:342,3
+FN:349,Engine.modifyCollateralZap
 FNDA:2,Engine.modifyCollateralZap
-DA:341,2
-BRDA:341,6,0,-
-BRDA:341,6,1,1
-DA:345,1
-DA:347,1
-DA:349,1
-DA:353,1
-BRDA:353,7,0,-
-BRDA:353,7,1,1
-DA:355,1
+DA:354,2
+BRDA:354,6,0,-
+BRDA:354,6,1,1
+DA:358,1
+DA:360,1
 DA:362,1
-DA:364,1
-FN:368,Engine._depositCollateral
+DA:366,1
+BRDA:366,7,0,-
+BRDA:366,7,1,1
+DA:368,1
+DA:375,1
+DA:378,1
+FN:382,Engine._depositCollateral
 FNDA:56,Engine._depositCollateral
-DA:377,56
-DA:379,55
-DA:381,55
-FN:384,Engine._withdrawCollateral
+DA:391,56
+DA:393,55
+DA:395,55
+FN:398,Engine._withdrawCollateral
 FNDA:3,Engine._withdrawCollateral
-DA:391,3
-DA:395,1
-FN:403,Engine._getSynthAddress
+DA:405,3
+DA:409,1
+FN:417,Engine._getSynthAddress
 FNDA:59,Engine._getSynthAddress
-DA:408,59
-FN:418,Engine.commitOrder
+DA:422,59
+FN:432,Engine.commitOrder
 FNDA:4,Engine.commitOrder
-DA:433,4
-BRDA:433,8,0,3
-BRDA:433,8,1,1
-DA:434,3
-DA:444,1
-FN:448,Engine._commitOrder
+DA:447,4
+BRDA:447,8,0,3
+BRDA:447,8,1,1
+DA:448,3
+DA:458,1
+FN:462,Engine._commitOrder
 FNDA:13,Engine._commitOrder
-DA:457,13
-FN:475,Engine.creditAccount
-FNDA:776,Engine.creditAccount
-DA:483,776
-BRDA:483,9,0,1
-BRDA:483,9,1,775
-DA:484,1
-DA:487,775
-DA:490,775
-DA:492,653
-FN:496,Engine.debitAccount
+DA:471,13
+FN:489,Engine.creditAccount
+FNDA:775,Engine.creditAccount
+DA:493,775
+DA:496,775
+DA:498,656
+FN:502,Engine.creditAccountZap
+FNDA:0,Engine.creditAccountZap
+DA:508,0
+DA:510,0
+DA:512,0
+FN:516,Engine.debitAccount
 FNDA:259,Engine.debitAccount
-DA:500,259
-BRDA:500,10,0,1
-BRDA:500,10,1,258
-DA:502,258
-DA:504,139
-FN:514,Engine._debit
+DA:520,259
+BRDA:520,9,0,1
+BRDA:520,9,1,258
+DA:522,258
+DA:524,144
+FN:528,Engine.debitAccountZap
+FNDA:0,Engine.debitAccountZap
+DA:533,0
+BRDA:533,10,0,-
+BRDA:533,10,1,-
+DA:536,0
+DA:539,0
+DA:542,0
+DA:544,0
+FN:547,Engine._debit
 FNDA:259,Engine._debit
-DA:517,259
-BRDA:517,11,0,105
-BRDA:517,11,1,154
-DA:521,154
-DA:524,154
-FN:532,Engine.execute
+DA:550,259
+BRDA:550,11,0,100
+BRDA:550,11,1,159
+DA:553,159
+DA:556,159
+FN:564,Engine.execute
 FNDA:15,Engine.execute
-DA:547,15
-BRDA:547,12,0,2
-BRDA:547,12,1,13
-DA:550,13
-DA:558,13
-BRDA:558,13,0,1
-BRDA:558,13,1,13
-DA:561,13
-DA:564,13
-BRDA:564,14,0,2
-BRDA:564,14,1,3
-DA:565,6
-DA:571,6
-BRDA:571,15,0,2
-BRDA:571,15,1,4
-DA:572,2
-DA:578,4
-BRDA:578,16,0,1
-BRDA:578,16,1,3
-DA:579,1
-DA:588,3
-BRDA:588,17,0,2
-BRDA:588,17,1,3
+DA:579,15
+BRDA:579,12,0,2
+BRDA:579,12,1,13
+DA:582,13
+DA:590,13
+BRDA:590,13,0,1
+BRDA:590,13,1,13
+DA:593,13
+DA:596,13
+BRDA:596,14,0,2
+BRDA:596,14,1,3
+DA:597,6
+DA:603,6
+BRDA:603,15,0,2
+BRDA:603,15,1,4
 DA:604,2
-DA:609,10
-DA:619,7
-FN:627,Engine.canExecute
+DA:610,4
+BRDA:610,16,0,1
+BRDA:610,16,1,3
+DA:611,1
+DA:620,3
+BRDA:620,17,0,2
+BRDA:620,17,1,3
+DA:636,2
+DA:641,10
+DA:651,7
+FN:659,Engine.canExecute
 FNDA:10,Engine.canExecute
-DA:634,25
-BRDA:634,18,0,2
-BRDA:634,18,1,23
-DA:637,23
-BRDA:637,19,0,2
-BRDA:637,19,1,21
-DA:640,21
-BRDA:640,20,0,2
-BRDA:640,20,1,19
-DA:641,2
-DA:646,19
-BRDA:646,21,0,1
-BRDA:646,21,1,18
-DA:649,18
-BRDA:649,22,0,1
-BRDA:649,22,1,17
-DA:652,17
-BRDA:652,23,0,1
-BRDA:652,23,1,-
-DA:655,1
-BRDA:655,24,0,1
-BRDA:655,24,1,-
-DA:659,16
-BRDA:659,25,0,1
-BRDA:659,25,1,15
-DA:662,15
-FN:670,Engine.verifySigner
+DA:666,25
+BRDA:666,18,0,2
+BRDA:666,18,1,23
+DA:669,23
+BRDA:669,19,0,2
+BRDA:669,19,1,21
+DA:672,21
+BRDA:672,20,0,2
+BRDA:672,20,1,19
+DA:673,2
+DA:678,19
+BRDA:678,21,0,1
+BRDA:678,21,1,18
+DA:681,18
+BRDA:681,22,0,1
+BRDA:681,22,1,17
+DA:684,17
+BRDA:684,23,0,1
+BRDA:684,23,1,-
+DA:687,1
+BRDA:687,24,0,1
+BRDA:687,24,1,-
+DA:691,16
+BRDA:691,25,0,1
+BRDA:691,25,1,15
+DA:694,15
+FN:702,Engine.verifySigner
 FNDA:2,Engine.verifySigner
-DA:676,21
-FN:680,Engine.verifySignature
+DA:708,21
+FN:712,Engine.verifySignature
 FNDA:257,Engine.verifySignature
-DA:684,275
-FN:692,Engine.verifyConditions
+DA:716,275
+FN:724,Engine.verifyConditions
 FNDA:4,Engine.verifyConditions
-DA:698,5
-DA:699,5
-BRDA:699,26,0,1
-BRDA:699,26,1,4
-DA:700,1
-DA:703,4
-DA:704,14
-DA:705,14
-DA:708,14
-DA:714,14
-DA:715,12
-DA:716,10
-DA:717,7
-DA:718,5
-DA:719,4
-DA:720,3
-DA:721,2
-BRDA:713,27,0,2
-BRDA:713,27,1,11
-DA:725,13
-DA:728,13
-BRDA:728,28,0,2
-BRDA:728,28,1,11
-DA:731,11
-DA:734,1
-DA:738,1
-FN:746,Engine.isTimestampAfter
+DA:730,5
+DA:731,5
+BRDA:731,26,0,1
+BRDA:731,26,1,4
+DA:732,1
+DA:735,4
+DA:736,14
+DA:737,14
+DA:740,14
+DA:746,14
+DA:747,12
+DA:748,10
+DA:749,7
+DA:750,5
+DA:751,4
+DA:752,3
+DA:753,2
+BRDA:745,27,0,2
+BRDA:745,27,1,11
+DA:757,13
+DA:760,13
+BRDA:760,28,0,2
+BRDA:760,28,1,11
+DA:763,11
+DA:766,1
+DA:770,1
+FN:778,Engine.isTimestampAfter
 FNDA:6,Engine.isTimestampAfter
-DA:752,6
-FN:756,Engine.isTimestampBefore
+DA:784,6
+FN:788,Engine.isTimestampBefore
 FNDA:5,Engine.isTimestampBefore
-DA:762,5
-FN:766,Engine.isPriceAbove
+DA:794,5
+FN:798,Engine.isPriceAbove
 FNDA:6,Engine.isPriceAbove
-DA:772,6
-DA:777,6
-FN:781,Engine.isPriceBelow
+DA:804,6
+DA:809,6
+FN:813,Engine.isPriceBelow
 FNDA:6,Engine.isPriceBelow
-DA:787,6
-DA:792,6
-FN:796,Engine.isMarketOpen
+DA:819,6
+DA:824,6
+FN:828,Engine.isMarketOpen
 FNDA:1,Engine.isMarketOpen
-DA:802,1
-FN:806,Engine.isPositionSizeAbove
+DA:834,1
+FN:838,Engine.isPositionSizeAbove
 FNDA:4,Engine.isPositionSizeAbove
-DA:811,4
-DA:812,4
-DA:814,4
-FN:818,Engine.isPositionSizeBelow
+DA:843,4
+DA:844,4
+DA:846,4
+FN:850,Engine.isPositionSizeBelow
 FNDA:4,Engine.isPositionSizeBelow
-DA:823,4
-DA:824,4
-DA:826,4
-FN:830,Engine.isOrderFeeBelow
+DA:855,4
+DA:856,4
+DA:858,4
+FN:862,Engine.isOrderFeeBelow
 FNDA:4,Engine.isOrderFeeBelow
-DA:836,4
-DA:841,4
-FNF:31
+DA:868,4
+DA:873,4
+FNF:34
 FNH:31
-LF:115
-LH:115
+LF:122
+LH:113
 BRF:58
-BRH:52
+BRH:50
 end_of_record
 TN:
 SF:src/libraries/ConditionalOrderHashLib.sol
@@ -586,16 +599,16 @@ BRH:0
 end_of_record
 TN:
 SF:test/utils/Bootstrap.sol
-FN:207,BootstrapOptimism.init
-FNDA:0,BootstrapOptimism.init
-DA:220,0
-DA:229,0
-DA:238,0
+FN:252,BootstrapOptimismGoerli.init
+FNDA:0,BootstrapOptimismGoerli.init
+DA:265,0
+DA:274,0
+DA:283,0
 FN:297,BootstrapBase.init
-FNDA:82,BootstrapBase.init
-DA:310,82
-DA:319,82
-DA:328,82
+FNDA:81,BootstrapBase.init
+DA:310,81
+DA:319,81
+DA:328,81
 FN:342,BootstrapBaseGoerli.init
 FNDA:0,BootstrapBaseGoerli.init
 DA:355,0
@@ -677,11 +690,11 @@ DA:194,0
 DA:195,0
 DA:200,0
 DA:202,0
-FN:252,BootstrapOptimismGoerli.init
-FNDA:0,BootstrapOptimismGoerli.init
-DA:265,0
-DA:274,0
-DA:283,0
+FN:207,BootstrapOptimism.init
+FNDA:0,BootstrapOptimism.init
+DA:220,0
+DA:229,0
+DA:238,0
 FNF:8
 FNH:1
 LF:80
@@ -750,8 +763,8 @@ end_of_record
 TN:
 SF:test/utils/SynthMinter.sol
 FN:18,SynthMinter.mint_sUSD
-FNDA:125,SynthMinter.mint_sUSD
-DA:19,125
+FNDA:124,SynthMinter.mint_sUSD
+DA:19,124
 FNF:1
 FNH:1
 LF:1
@@ -773,9 +786,6 @@ BRH:0
 end_of_record
 TN:
 SF:test/utils/mocks/EIP7412Mock.sol
-FN:24,EIP7412MockRevert.fulfillOracleQuery
-FNDA:256,EIP7412MockRevert.fulfillOracleQuery
-DA:25,256
 FN:9,EIP7412Mock.fulfillOracleQuery
 FNDA:768,EIP7412Mock.fulfillOracleQuery
 DA:10,768
@@ -791,6 +801,9 @@ DA:18,256
 DA:19,256
 BRDA:19,1,0,256
 BRDA:19,1,1,-
+FN:24,EIP7412MockRevert.fulfillOracleQuery
+FNDA:256,EIP7412MockRevert.fulfillOracleQuery
+DA:25,256
 FNF:3
 FNH:3
 LF:6