diff --git a/.forge-snapshots/FullRangeAddInitialLiquidity.snap b/.forge-snapshots/FullRangeAddInitialLiquidity.snap
index b9d81858..bcaa687e 100644
--- a/.forge-snapshots/FullRangeAddInitialLiquidity.snap
+++ b/.forge-snapshots/FullRangeAddInitialLiquidity.snap
@@ -1 +1 @@
-311137
\ No newline at end of file
+354433
\ No newline at end of file
diff --git a/.forge-snapshots/FullRangeAddLiquidity.snap b/.forge-snapshots/FullRangeAddLiquidity.snap
index c3edfa69..22ea7d07 100644
--- a/.forge-snapshots/FullRangeAddLiquidity.snap
+++ b/.forge-snapshots/FullRangeAddLiquidity.snap
@@ -1 +1 @@
-122946
\ No newline at end of file
+161742
\ No newline at end of file
diff --git a/.forge-snapshots/FullRangeFirstSwap.snap b/.forge-snapshots/FullRangeFirstSwap.snap
index b9e04365..c0d45a14 100644
--- a/.forge-snapshots/FullRangeFirstSwap.snap
+++ b/.forge-snapshots/FullRangeFirstSwap.snap
@@ -1 +1 @@
-80287
\ No newline at end of file
+146467
\ No newline at end of file
diff --git a/.forge-snapshots/FullRangeInitialize.snap b/.forge-snapshots/FullRangeInitialize.snap
index 7a0170eb..22412ada 100644
--- a/.forge-snapshots/FullRangeInitialize.snap
+++ b/.forge-snapshots/FullRangeInitialize.snap
@@ -1 +1 @@
-1015181
\ No newline at end of file
+1037821
\ No newline at end of file
diff --git a/.forge-snapshots/FullRangeRemoveLiquidity.snap b/.forge-snapshots/FullRangeRemoveLiquidity.snap
index 4444368b..b90db119 100644
--- a/.forge-snapshots/FullRangeRemoveLiquidity.snap
+++ b/.forge-snapshots/FullRangeRemoveLiquidity.snap
@@ -1 +1 @@
-110544
\ No newline at end of file
+146372
\ No newline at end of file
diff --git a/.forge-snapshots/FullRangeRemoveLiquidityAndRebalance.snap b/.forge-snapshots/FullRangeRemoveLiquidityAndRebalance.snap
index 1bc2d893..88c6540c 100644
--- a/.forge-snapshots/FullRangeRemoveLiquidityAndRebalance.snap
+++ b/.forge-snapshots/FullRangeRemoveLiquidityAndRebalance.snap
@@ -1 +1 @@
-240022
\ No newline at end of file
+281650
\ No newline at end of file
diff --git a/.forge-snapshots/FullRangeSecondSwap.snap b/.forge-snapshots/FullRangeSecondSwap.snap
index c1cac22b..a07f7da8 100644
--- a/.forge-snapshots/FullRangeSecondSwap.snap
+++ b/.forge-snapshots/FullRangeSecondSwap.snap
@@ -1 +1 @@
-45997
\ No newline at end of file
+116177
\ No newline at end of file
diff --git a/.forge-snapshots/FullRangeSwap.snap b/.forge-snapshots/FullRangeSwap.snap
index 97d86500..3845587a 100644
--- a/.forge-snapshots/FullRangeSwap.snap
+++ b/.forge-snapshots/FullRangeSwap.snap
@@ -1 +1 @@
-79418
\ No newline at end of file
+145886
\ No newline at end of file
diff --git a/.forge-snapshots/OracleGrow10Slots.snap b/.forge-snapshots/OracleGrow10Slots.snap
index 3dada479..96c9f369 100644
--- a/.forge-snapshots/OracleGrow10Slots.snap
+++ b/.forge-snapshots/OracleGrow10Slots.snap
@@ -1 +1 @@
-232960
\ No newline at end of file
+254164
\ No newline at end of file
diff --git a/.forge-snapshots/OracleGrow10SlotsCardinalityGreater.snap b/.forge-snapshots/OracleGrow10SlotsCardinalityGreater.snap
index f623cfa5..9fc5bce2 100644
--- a/.forge-snapshots/OracleGrow10SlotsCardinalityGreater.snap
+++ b/.forge-snapshots/OracleGrow10SlotsCardinalityGreater.snap
@@ -1 +1 @@
-223649
\ No newline at end of file
+249653
\ No newline at end of file
diff --git a/.forge-snapshots/OracleGrow1Slot.snap b/.forge-snapshots/OracleGrow1Slot.snap
index 137baa16..ced15d76 100644
--- a/.forge-snapshots/OracleGrow1Slot.snap
+++ b/.forge-snapshots/OracleGrow1Slot.snap
@@ -1 +1 @@
-32845
\ No newline at end of file
+54049
\ No newline at end of file
diff --git a/.forge-snapshots/OracleGrow1SlotCardinalityGreater.snap b/.forge-snapshots/OracleGrow1SlotCardinalityGreater.snap
index e6dc42ce..8ad5646e 100644
--- a/.forge-snapshots/OracleGrow1SlotCardinalityGreater.snap
+++ b/.forge-snapshots/OracleGrow1SlotCardinalityGreater.snap
@@ -1 +1 @@
-23545
\ No newline at end of file
+49549
\ No newline at end of file
diff --git a/.forge-snapshots/OracleInitialize.snap b/.forge-snapshots/OracleInitialize.snap
index e4e9e6b2..a9ee0288 100644
--- a/.forge-snapshots/OracleInitialize.snap
+++ b/.forge-snapshots/OracleInitialize.snap
@@ -1 +1 @@
-51310
\ No newline at end of file
+72794
\ No newline at end of file
diff --git a/.forge-snapshots/TWAMMSubmitOrder.snap b/.forge-snapshots/TWAMMSubmitOrder.snap
index 03924f26..fe88810b 100644
--- a/.forge-snapshots/TWAMMSubmitOrder.snap
+++ b/.forge-snapshots/TWAMMSubmitOrder.snap
@@ -1 +1 @@
-122359
\ No newline at end of file
+156851
\ No newline at end of file
diff --git a/.forge-snapshots/decreaseLiquidity_erc20.snap b/.forge-snapshots/decreaseLiquidity_erc20.snap
index 210b2a35..9d667ef7 100644
--- a/.forge-snapshots/decreaseLiquidity_erc20.snap
+++ b/.forge-snapshots/decreaseLiquidity_erc20.snap
@@ -1 +1 @@
-114609
\ No newline at end of file
+187091
\ No newline at end of file
diff --git a/.forge-snapshots/decreaseLiquidity_erc6909.snap b/.forge-snapshots/decreaseLiquidity_erc6909.snap
index 077c79f6..e9492b3e 100644
--- a/.forge-snapshots/decreaseLiquidity_erc6909.snap
+++ b/.forge-snapshots/decreaseLiquidity_erc6909.snap
@@ -1 +1 @@
-112540
\ No newline at end of file
+166084
\ No newline at end of file
diff --git a/.forge-snapshots/increaseLiquidity_erc20.snap b/.forge-snapshots/increaseLiquidity_erc20.snap
index 37ac7301..5280964c 100644
--- a/.forge-snapshots/increaseLiquidity_erc20.snap
+++ b/.forge-snapshots/increaseLiquidity_erc20.snap
@@ -1 +1 @@
-74128
\ No newline at end of file
+187781
\ No newline at end of file
diff --git a/.forge-snapshots/increaseLiquidity_erc6909.snap b/.forge-snapshots/increaseLiquidity_erc6909.snap
index d047c3b9..460aeb49 100644
--- a/.forge-snapshots/increaseLiquidity_erc6909.snap
+++ b/.forge-snapshots/increaseLiquidity_erc6909.snap
@@ -1 +1 @@
-77920
\ No newline at end of file
+163384
\ No newline at end of file
diff --git a/.forge-snapshots/mintWithLiquidity.snap b/.forge-snapshots/mintWithLiquidity.snap
index aabe76e0..b7ef4c1e 100644
--- a/.forge-snapshots/mintWithLiquidity.snap
+++ b/.forge-snapshots/mintWithLiquidity.snap
@@ -1 +1 @@
-475866
\ No newline at end of file
+485624
\ No newline at end of file
diff --git a/test/position-managers/Gas.t.sol b/test/position-managers/Gas.t.sol
index 551465c3..495d6f22 100644
--- a/test/position-managers/Gas.t.sol
+++ b/test/position-managers/Gas.t.sol
@@ -80,45 +80,40 @@ contract GasTest is Test, Deployers, GasSnapshot {
     //     });
     //     snapStart("mint");
     //     lpm.mint(params);
-    //     snapEnd();
+    //     snapLastCall();
     // }
 
     function test_gas_mintWithLiquidity() public {
-        snapStart("mintWithLiquidity");
         lpm.mint(range, 10_000 ether, block.timestamp + 1, address(this), ZERO_BYTES);
-        snapEnd();
+        snapLastCall("mintWithLiquidity");
     }
 
     function test_gas_increaseLiquidity_erc20() public {
         (uint256 tokenId,) = lpm.mint(range, 10_000 ether, block.timestamp + 1, address(this), ZERO_BYTES);
 
-        snapStart("increaseLiquidity_erc20");
         lpm.increaseLiquidity(tokenId, 1000 ether, ZERO_BYTES, false);
-        snapEnd();
+        snapLastCall("increaseLiquidity_erc20");
     }
 
     function test_gas_increaseLiquidity_erc6909() public {
         (uint256 tokenId,) = lpm.mint(range, 10_000 ether, block.timestamp + 1, address(this), ZERO_BYTES);
 
-        snapStart("increaseLiquidity_erc6909");
         lpm.increaseLiquidity(tokenId, 1000 ether, ZERO_BYTES, true);
-        snapEnd();
+        snapLastCall("increaseLiquidity_erc6909");
     }
 
     function test_gas_decreaseLiquidity_erc20() public {
         (uint256 tokenId,) = lpm.mint(range, 10_000 ether, block.timestamp + 1, address(this), ZERO_BYTES);
 
-        snapStart("decreaseLiquidity_erc20");
         lpm.decreaseLiquidity(tokenId, 10_000 ether, ZERO_BYTES, false);
-        snapEnd();
+        snapLastCall("decreaseLiquidity_erc20");
     }
 
     function test_gas_decreaseLiquidity_erc6909() public {
         (uint256 tokenId,) = lpm.mint(range, 10_000 ether, block.timestamp + 1, address(this), ZERO_BYTES);
 
-        snapStart("decreaseLiquidity_erc6909");
         lpm.decreaseLiquidity(tokenId, 10_000 ether, ZERO_BYTES, true);
-        snapEnd();
+        snapLastCall("decreaseLiquidity_erc6909");
     }
 
     function test_gas_burn() public {}