diff --git a/.gas-snapshot b/.gas-snapshot
index bdf034df..881bab8a 100644
--- a/.gas-snapshot
+++ b/.gas-snapshot
@@ -52,7 +52,7 @@ AccountTest:test_GetTokenInTokenOut_Multi_Pool() (gas: 11453)
 AccountTest:test_GetTokenInTokenOut_Single_Pool() (gas: 7468)
 AccountTest:test_GetTrackingCode() (gas: 5554)
 AccountTest:test_GetVerison() (gas: 16130)
-AccountTest:test_IsSameSign(int256,int256) (runs: 256, μ: 6233, ~: 6081)
+AccountTest:test_IsSameSign(int256,int256) (runs: 256, μ: 6232, ~: 6081)
 AccountTest:test_NonReentrant_Locked() (gas: 31079)
 AccountTest:test_NonReentrant_Unlocked() (gas: 460695)
 AccountTest:test_Ownership_Transfer() (gas: 96233)
@@ -108,8 +108,8 @@ FactoryTest:test_NewAccount_State() (gas: 323401)
 FactoryTest:test_Ownership_NonAccount() (gas: 10980)
 FactoryTest:test_Ownership_Transfer() (gas: 13152)
 FactoryTest:test_UpdateAccountOwnership_AccountDoesNotExist() (gas: 11402)
-FactoryTest:test_UpdateAccountOwnership_NewOwner_MultipleAccount(uint256) (runs: 256, μ: 498160, ~: 347341)
-FactoryTest:test_UpdateAccountOwnership_OldOwner_MultipleAccount(uint256) (runs: 256, μ: 805463, ~: 659300)
+FactoryTest:test_UpdateAccountOwnership_NewOwner_MultipleAccount(uint256) (runs: 256, μ: 492146, ~: 347341)
+FactoryTest:test_UpdateAccountOwnership_OldOwner_MultipleAccount(uint256) (runs: 256, μ: 795114, ~: 659300)
 FactoryTest:test_UpdateAccountOwnership_OldOwner_SingleAccount() (gas: 344143)
 FactoryTest:test_Upgrade_Implementation() (gas: 1034722)
 FactoryTest:test_Upgrade_Implementation_Event() (gas: 13041)
@@ -123,8 +123,8 @@ MarginBehaviorTest:test_Commands_CancelOffchainDelayedOrder() (gas: 1525694)
 MarginBehaviorTest:test_Commands_CancelOffchainDelayedOrder_NoneExists() (gas: 291382)
 MarginBehaviorTest:test_Commands_ClosePosition() (gas: 1673609)
 MarginBehaviorTest:test_Commands_ClosePositionWhen_NoneExists() (gas: 390785)
-MarginBehaviorTest:test_Commands_ModifyMarginInMarket_ExistingMarginInMarket(int256) (runs: 256, μ: 776662, ~: 715482)
-MarginBehaviorTest:test_Commands_ModifyMarginInMarket_NoExistingMarginInMarket(int256) (runs: 256, μ: 330306, ~: 242803)
+MarginBehaviorTest:test_Commands_ModifyMarginInMarket_ExistingMarginInMarket(int256) (runs: 256, μ: 777290, ~: 715482)
+MarginBehaviorTest:test_Commands_ModifyMarginInMarket_NoExistingMarginInMarket(int256) (runs: 256, μ: 329037, ~: 242803)
 MarginBehaviorTest:test_Commands_SetMinKeeperFee() (gas: 242574)
 MarginBehaviorTest:test_Commands_SetMinKeeperFee_Fails() (gas: 52897)
 MarginBehaviorTest:test_Commands_SubmitAtomicOrder() (gas: 1303439)
@@ -137,10 +137,10 @@ MarginBehaviorTest:test_Commands_SubmitOffchainDelayedOrder() (gas: 1467970)
 MarginBehaviorTest:test_Commands_WithdrawAllMarginFromMarket_ExistingMarginInMarket() (gas: 923020)
 MarginBehaviorTest:test_Commands_WithdrawAllMarginFromMarket_NoExistingMarginInMarket() (gas: 501516)
 MarginBehaviorTest:test_Deposit_ETH() (gas: 22856)
-MarginBehaviorTest:test_Deposit_Margin(uint256) (runs: 256, μ: 230553, ~: 248181)
+MarginBehaviorTest:test_Deposit_Margin(uint256) (runs: 256, μ: 229860, ~: 248181)
 MarginBehaviorTest:test_Execute_InputCommandDifferingLengths() (gas: 224292)
 MarginBehaviorTest:test_Scenario_1() (gas: 1487208)
-MarginBehaviorTest:test_Withdraw_Eth(uint256) (runs: 256, μ: 60815, ~: 66431)
+MarginBehaviorTest:test_Withdraw_Eth(uint256) (runs: 256, μ: 60938, ~: 66431)
 MarginBehaviorTest:test_Withdraw_Margin(int256) (runs: 256, μ: 266462, ~: 241968)
 OrderGelatoBehaviorTest:test_CancelConditionalOrder_Event() (gas: 325505)
 OrderGelatoBehaviorTest:test_CancelConditionalOrder_Invalid_NotOwner() (gas: 36633)
@@ -175,15 +175,15 @@ OrderGelatoBehaviorTest:test_PlaceConditionalOrder_Limit_Invalid_Long(uint256) (
 OrderGelatoBehaviorTest:test_PlaceConditionalOrder_Limit_Invalid_Short(uint256) (runs: 256, μ: 440008, ~: 440008)
 OrderGelatoBehaviorTest:test_PlaceConditionalOrder_Limit_Valid_Event(int256) (runs: 256, μ: 380208, ~: 380208)
 OrderGelatoBehaviorTest:test_PlaceConditionalOrder_Limit_Valid_Long(uint256) (runs: 256, μ: 439987, ~: 439987)
-OrderGelatoBehaviorTest:test_PlaceConditionalOrder_Limit_Valid_Short(uint256) (runs: 256, μ: 438270, ~: 439981)
+OrderGelatoBehaviorTest:test_PlaceConditionalOrder_Limit_Valid_Short(uint256) (runs: 256, μ: 438348, ~: 439981)
 OrderGelatoBehaviorTest:test_PlaceConditionalOrder_Limit_Valid_State(int256) (runs: 256, μ: 374312, ~: 374312)
 OrderGelatoBehaviorTest:test_PlaceConditionalOrder_Stop_Invalid_Long(uint256) (runs: 256, μ: 459953, ~: 459953)
-OrderGelatoBehaviorTest:test_PlaceConditionalOrder_Stop_Invalid_Short(uint256) (runs: 256, μ: 458277, ~: 459988)
+OrderGelatoBehaviorTest:test_PlaceConditionalOrder_Stop_Invalid_Short(uint256) (runs: 256, μ: 458355, ~: 459988)
 OrderGelatoBehaviorTest:test_PlaceConditionalOrder_Stop_Valid_Long(uint256) (runs: 256, μ: 458212, ~: 459923)
 OrderGelatoBehaviorTest:test_PlaceConditionalOrder_Stop_Valid_Short(uint256) (runs: 256, μ: 459981, ~: 459981)
 OrderGelatoBehaviorTest:test_PlaceConditionalOrder_Valid_GelatoTaskId() (gas: 374904)
-OrderGelatoBehaviorTest:test_ReduceOnlyOrder_Valid_Long(int256) (runs: 256, μ: 1680699, ~: 1412659)
-OrderGelatoBehaviorTest:test_ReduceOnlyOrder_Valid_Short(int256) (runs: 256, μ: 1995339, ~: 2244992)
+OrderGelatoBehaviorTest:test_ReduceOnlyOrder_Valid_Long(int256) (runs: 256, μ: 1677446, ~: 1412659)
+OrderGelatoBehaviorTest:test_ReduceOnlyOrder_Valid_Short(int256) (runs: 256, μ: 1988908, ~: 2244992)
 OrderGelatoBehaviorTest:test_ReduceOnlyOrder_Valid_State() (gas: 2271305)
 OrderGelatoBehaviorTest:test_ReduceOnlyOrder_Valid_Synthetix() (gas: 2286447)
 OrderPublicBehaviorTest:test_ExecuteConditionalOrder_Public() (gas: 1405271)
@@ -220,4 +220,6 @@ SwapBehaviorTest:test_UniswapV3Swap_SUSD_DAI() (gas: 515632)
 SwapBehaviorTest:test_UniswapV3Swap_SUSD_DAI_Event() (gas: 510651)
 SwapBehaviorTest:test_UniswapV3Swap_SUSD_DAI_USDC() (gas: 603817)
 UpgradeTest:test_Deployed_Account_Version() (gas: 16468)
-UpgradeTest:test_Upgrade() (gas: 86517)
\ No newline at end of file
+UpgradeTest:test_Deployed_Account_Version() (gas: 16468)
+UpgradeTest:test_Upgrade() (gas: 86517)
+UpgradeTest:test_Upgrade() (gas: 89278)
\ No newline at end of file