diff --git a/.forge-snapshots/BaseActionsRouter_mock10commands.snap b/.forge-snapshots/BaseActionsRouter_mock10commands.snap
index 2f6f033f..20e1c5f4 100644
--- a/.forge-snapshots/BaseActionsRouter_mock10commands.snap
+++ b/.forge-snapshots/BaseActionsRouter_mock10commands.snap
@@ -1 +1 @@
-60674
\ No newline at end of file
+61332
\ No newline at end of file
diff --git a/.forge-snapshots/Payments_swap_settleFromCaller_takeAllToMsgSender.snap b/.forge-snapshots/Payments_swap_settleFromCaller_takeAllToMsgSender.snap
index 7dd962cc..770caaf9 100644
--- a/.forge-snapshots/Payments_swap_settleFromCaller_takeAllToMsgSender.snap
+++ b/.forge-snapshots/Payments_swap_settleFromCaller_takeAllToMsgSender.snap
@@ -1 +1 @@
-129705
\ No newline at end of file
+132997
\ No newline at end of file
diff --git a/.forge-snapshots/Payments_swap_settleFromCaller_takeAllToSpecifiedAddress.snap b/.forge-snapshots/Payments_swap_settleFromCaller_takeAllToSpecifiedAddress.snap
index 361cd159..3541eaf3 100644
--- a/.forge-snapshots/Payments_swap_settleFromCaller_takeAllToSpecifiedAddress.snap
+++ b/.forge-snapshots/Payments_swap_settleFromCaller_takeAllToSpecifiedAddress.snap
@@ -1 +1 @@
-131634
\ No newline at end of file
+134973
\ No newline at end of file
diff --git a/.forge-snapshots/Payments_swap_settleWithBalance_takeAllToMsgSender.snap b/.forge-snapshots/Payments_swap_settleWithBalance_takeAllToMsgSender.snap
index d55b574a..e05cffe7 100644
--- a/.forge-snapshots/Payments_swap_settleWithBalance_takeAllToMsgSender.snap
+++ b/.forge-snapshots/Payments_swap_settleWithBalance_takeAllToMsgSender.snap
@@ -1 +1 @@
-123813
\ No newline at end of file
+127102
\ No newline at end of file
diff --git a/.forge-snapshots/Payments_swap_settleWithBalance_takeAllToSpecifiedAddress.snap b/.forge-snapshots/Payments_swap_settleWithBalance_takeAllToSpecifiedAddress.snap
index 63b1d146..9166a87d 100644
--- a/.forge-snapshots/Payments_swap_settleWithBalance_takeAllToSpecifiedAddress.snap
+++ b/.forge-snapshots/Payments_swap_settleWithBalance_takeAllToSpecifiedAddress.snap
@@ -1 +1 @@
-123955
\ No newline at end of file
+127212
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_burn_empty.snap b/.forge-snapshots/PositionManager_burn_empty.snap
index fcb81926..88081af8 100644
--- a/.forge-snapshots/PositionManager_burn_empty.snap
+++ b/.forge-snapshots/PositionManager_burn_empty.snap
@@ -1 +1 @@
-50845
\ No newline at end of file
+51576
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_burn_empty_native.snap b/.forge-snapshots/PositionManager_burn_empty_native.snap
index fcb81926..88081af8 100644
--- a/.forge-snapshots/PositionManager_burn_empty_native.snap
+++ b/.forge-snapshots/PositionManager_burn_empty_native.snap
@@ -1 +1 @@
-50845
\ No newline at end of file
+51576
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_burn_nonEmpty_native_withClose.snap b/.forge-snapshots/PositionManager_burn_nonEmpty_native_withClose.snap
index 9c88356c..b8ad8f5e 100644
--- a/.forge-snapshots/PositionManager_burn_nonEmpty_native_withClose.snap
+++ b/.forge-snapshots/PositionManager_burn_nonEmpty_native_withClose.snap
@@ -1 +1 @@
-126075
\ No newline at end of file
+128316
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_burn_nonEmpty_native_withTakePair.snap b/.forge-snapshots/PositionManager_burn_nonEmpty_native_withTakePair.snap
index 0c610d43..5f7fe3b4 100644
--- a/.forge-snapshots/PositionManager_burn_nonEmpty_native_withTakePair.snap
+++ b/.forge-snapshots/PositionManager_burn_nonEmpty_native_withTakePair.snap
@@ -1 +1 @@
-125508
\ No newline at end of file
+127696
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_burn_nonEmpty_withClose.snap b/.forge-snapshots/PositionManager_burn_nonEmpty_withClose.snap
index 02c6f586..f821b49c 100644
--- a/.forge-snapshots/PositionManager_burn_nonEmpty_withClose.snap
+++ b/.forge-snapshots/PositionManager_burn_nonEmpty_withClose.snap
@@ -1 +1 @@
-132935
\ No newline at end of file
+135236
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_burn_nonEmpty_withTakePair.snap b/.forge-snapshots/PositionManager_burn_nonEmpty_withTakePair.snap
index 5d1c4b28..46630b5d 100644
--- a/.forge-snapshots/PositionManager_burn_nonEmpty_withTakePair.snap
+++ b/.forge-snapshots/PositionManager_burn_nonEmpty_withTakePair.snap
@@ -1 +1 @@
-132368
\ No newline at end of file
+134615
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_collect_native.snap b/.forge-snapshots/PositionManager_collect_native.snap
index 300b94d2..df2c6fcf 100644
--- a/.forge-snapshots/PositionManager_collect_native.snap
+++ b/.forge-snapshots/PositionManager_collect_native.snap
@@ -1 +1 @@
-146517
\ No newline at end of file
+148593
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_collect_sameRange.snap b/.forge-snapshots/PositionManager_collect_sameRange.snap
index 9d8c45b6..d5f6bc6f 100644
--- a/.forge-snapshots/PositionManager_collect_sameRange.snap
+++ b/.forge-snapshots/PositionManager_collect_sameRange.snap
@@ -1 +1 @@
-155092
\ No newline at end of file
+157242
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_collect_withClose.snap b/.forge-snapshots/PositionManager_collect_withClose.snap
index 9d8c45b6..d5f6bc6f 100644
--- a/.forge-snapshots/PositionManager_collect_withClose.snap
+++ b/.forge-snapshots/PositionManager_collect_withClose.snap
@@ -1 +1 @@
-155092
\ No newline at end of file
+157242
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_collect_withTakePair.snap b/.forge-snapshots/PositionManager_collect_withTakePair.snap
index 3a772220..a7d8032c 100644
--- a/.forge-snapshots/PositionManager_collect_withTakePair.snap
+++ b/.forge-snapshots/PositionManager_collect_withTakePair.snap
@@ -1 +1 @@
-154395
\ No newline at end of file
+156478
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_decreaseLiquidity_native.snap b/.forge-snapshots/PositionManager_decreaseLiquidity_native.snap
index 03b97f2f..15e513a0 100644
--- a/.forge-snapshots/PositionManager_decreaseLiquidity_native.snap
+++ b/.forge-snapshots/PositionManager_decreaseLiquidity_native.snap
@@ -1 +1 @@
-112159
\ No newline at end of file
+114183
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_decreaseLiquidity_withClose.snap b/.forge-snapshots/PositionManager_decreaseLiquidity_withClose.snap
index 48ff8dce..b13b88cd 100644
--- a/.forge-snapshots/PositionManager_decreaseLiquidity_withClose.snap
+++ b/.forge-snapshots/PositionManager_decreaseLiquidity_withClose.snap
@@ -1 +1 @@
-119973
\ No newline at end of file
+122577
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_decreaseLiquidity_withTakePair.snap b/.forge-snapshots/PositionManager_decreaseLiquidity_withTakePair.snap
index c576e745..627de811 100644
--- a/.forge-snapshots/PositionManager_decreaseLiquidity_withTakePair.snap
+++ b/.forge-snapshots/PositionManager_decreaseLiquidity_withTakePair.snap
@@ -1 +1 @@
-119276
\ No newline at end of file
+121813
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_decrease_burnEmpty.snap b/.forge-snapshots/PositionManager_decrease_burnEmpty.snap
index d997832e..28983a33 100644
--- a/.forge-snapshots/PositionManager_decrease_burnEmpty.snap
+++ b/.forge-snapshots/PositionManager_decrease_burnEmpty.snap
@@ -1 +1 @@
-135785
\ No newline at end of file
+138195
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_decrease_burnEmpty_native.snap b/.forge-snapshots/PositionManager_decrease_burnEmpty_native.snap
index 178defb9..9f6d1c14 100644
--- a/.forge-snapshots/PositionManager_decrease_burnEmpty_native.snap
+++ b/.forge-snapshots/PositionManager_decrease_burnEmpty_native.snap
@@ -1 +1 @@
-128925
\ No newline at end of file
+131276
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_decrease_sameRange_allLiquidity.snap b/.forge-snapshots/PositionManager_decrease_sameRange_allLiquidity.snap
index 5067e921..397b72af 100644
--- a/.forge-snapshots/PositionManager_decrease_sameRange_allLiquidity.snap
+++ b/.forge-snapshots/PositionManager_decrease_sameRange_allLiquidity.snap
@@ -1 +1 @@
-132660
\ No newline at end of file
+135240
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_decrease_take_take.snap b/.forge-snapshots/PositionManager_decrease_take_take.snap
index 1704633b..25671ee7 100644
--- a/.forge-snapshots/PositionManager_decrease_take_take.snap
+++ b/.forge-snapshots/PositionManager_decrease_take_take.snap
@@ -1 +1 @@
-120563
\ No newline at end of file
+123191
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_increaseLiquidity_erc20_withClose.snap b/.forge-snapshots/PositionManager_increaseLiquidity_erc20_withClose.snap
index e041bfa5..e20cbceb 100644
--- a/.forge-snapshots/PositionManager_increaseLiquidity_erc20_withClose.snap
+++ b/.forge-snapshots/PositionManager_increaseLiquidity_erc20_withClose.snap
@@ -1 +1 @@
-158972
\ No newline at end of file
+162441
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_increaseLiquidity_erc20_withSettlePair.snap b/.forge-snapshots/PositionManager_increaseLiquidity_erc20_withSettlePair.snap
index 4218521c..957d69b9 100644
--- a/.forge-snapshots/PositionManager_increaseLiquidity_erc20_withSettlePair.snap
+++ b/.forge-snapshots/PositionManager_increaseLiquidity_erc20_withSettlePair.snap
@@ -1 +1 @@
-157883
\ No newline at end of file
+161305
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_increaseLiquidity_native.snap b/.forge-snapshots/PositionManager_increaseLiquidity_native.snap
index 173f0fd1..c00b6978 100644
--- a/.forge-snapshots/PositionManager_increaseLiquidity_native.snap
+++ b/.forge-snapshots/PositionManager_increaseLiquidity_native.snap
@@ -1 +1 @@
-142236
\ No newline at end of file
+145318
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_increase_autocompoundExactUnclaimedFees.snap b/.forge-snapshots/PositionManager_increase_autocompoundExactUnclaimedFees.snap
index 65400e18..6ed7545e 100644
--- a/.forge-snapshots/PositionManager_increase_autocompoundExactUnclaimedFees.snap
+++ b/.forge-snapshots/PositionManager_increase_autocompoundExactUnclaimedFees.snap
@@ -1 +1 @@
-136417
\ No newline at end of file
+138032
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_increase_autocompoundExcessFeesCredit.snap b/.forge-snapshots/PositionManager_increase_autocompoundExcessFeesCredit.snap
index c100c3a7..e08e83c4 100644
--- a/.forge-snapshots/PositionManager_increase_autocompoundExcessFeesCredit.snap
+++ b/.forge-snapshots/PositionManager_increase_autocompoundExcessFeesCredit.snap
@@ -1 +1 @@
-177561
\ No newline at end of file
+180216
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_increase_autocompound_clearExcess.snap b/.forge-snapshots/PositionManager_increase_autocompound_clearExcess.snap
index f780123b..7d47367c 100644
--- a/.forge-snapshots/PositionManager_increase_autocompound_clearExcess.snap
+++ b/.forge-snapshots/PositionManager_increase_autocompound_clearExcess.snap
@@ -1 +1 @@
-148337
\ No newline at end of file
+150804
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_mint_native.snap b/.forge-snapshots/PositionManager_mint_native.snap
index fd7f97d4..ad9b48ff 100644
--- a/.forge-snapshots/PositionManager_mint_native.snap
+++ b/.forge-snapshots/PositionManager_mint_native.snap
@@ -1 +1 @@
-366110
\ No newline at end of file
+369623
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_mint_nativeWithSweep_withClose.snap b/.forge-snapshots/PositionManager_mint_nativeWithSweep_withClose.snap
index d5189274..6d4460fb 100644
--- a/.forge-snapshots/PositionManager_mint_nativeWithSweep_withClose.snap
+++ b/.forge-snapshots/PositionManager_mint_nativeWithSweep_withClose.snap
@@ -1 +1 @@
-374684
\ No newline at end of file
+378280
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_mint_nativeWithSweep_withSettlePair.snap b/.forge-snapshots/PositionManager_mint_nativeWithSweep_withSettlePair.snap
index 4bc4b7b3..351997f8 100644
--- a/.forge-snapshots/PositionManager_mint_nativeWithSweep_withSettlePair.snap
+++ b/.forge-snapshots/PositionManager_mint_nativeWithSweep_withSettlePair.snap
@@ -1 +1 @@
-373879
\ No newline at end of file
+377364
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_mint_onSameTickLower.snap b/.forge-snapshots/PositionManager_mint_onSameTickLower.snap
index 1dbf1cac..dcb8d5ae 100644
--- a/.forge-snapshots/PositionManager_mint_onSameTickLower.snap
+++ b/.forge-snapshots/PositionManager_mint_onSameTickLower.snap
@@ -1 +1 @@
-317533
\ No newline at end of file
+321205
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_mint_onSameTickUpper.snap b/.forge-snapshots/PositionManager_mint_onSameTickUpper.snap
index 762eabe2..3a7c7c34 100644
--- a/.forge-snapshots/PositionManager_mint_onSameTickUpper.snap
+++ b/.forge-snapshots/PositionManager_mint_onSameTickUpper.snap
@@ -1 +1 @@
-318203
\ No newline at end of file
+321875
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_mint_sameRange.snap b/.forge-snapshots/PositionManager_mint_sameRange.snap
index 79c42629..7d8a2686 100644
--- a/.forge-snapshots/PositionManager_mint_sameRange.snap
+++ b/.forge-snapshots/PositionManager_mint_sameRange.snap
@@ -1 +1 @@
-243772
\ No newline at end of file
+247444
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_mint_settleWithBalance_sweep.snap b/.forge-snapshots/PositionManager_mint_settleWithBalance_sweep.snap
index 1a107995..4d62f1da 100644
--- a/.forge-snapshots/PositionManager_mint_settleWithBalance_sweep.snap
+++ b/.forge-snapshots/PositionManager_mint_settleWithBalance_sweep.snap
@@ -1 +1 @@
-419062
\ No newline at end of file
+423280
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_mint_warmedPool_differentRange.snap b/.forge-snapshots/PositionManager_mint_warmedPool_differentRange.snap
index 51af8572..fcd47aaf 100644
--- a/.forge-snapshots/PositionManager_mint_warmedPool_differentRange.snap
+++ b/.forge-snapshots/PositionManager_mint_warmedPool_differentRange.snap
@@ -1 +1 @@
-323564
\ No newline at end of file
+327236
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_mint_withClose.snap b/.forge-snapshots/PositionManager_mint_withClose.snap
index 3fa2f80f..59610f85 100644
--- a/.forge-snapshots/PositionManager_mint_withClose.snap
+++ b/.forge-snapshots/PositionManager_mint_withClose.snap
@@ -1 +1 @@
-420086
\ No newline at end of file
+423986
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_mint_withSettlePair.snap b/.forge-snapshots/PositionManager_mint_withSettlePair.snap
index 530393d3..b3a6480c 100644
--- a/.forge-snapshots/PositionManager_mint_withSettlePair.snap
+++ b/.forge-snapshots/PositionManager_mint_withSettlePair.snap
@@ -1 +1 @@
-419115
\ No newline at end of file
+422936
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_multicall_initialize_mint.snap b/.forge-snapshots/PositionManager_multicall_initialize_mint.snap
index db9aea25..19380f4f 100644
--- a/.forge-snapshots/PositionManager_multicall_initialize_mint.snap
+++ b/.forge-snapshots/PositionManager_multicall_initialize_mint.snap
@@ -1 +1 @@
-455916
\ No newline at end of file
+460558
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_permit.snap b/.forge-snapshots/PositionManager_permit.snap
index 227e327e..53dd01e7 100644
--- a/.forge-snapshots/PositionManager_permit.snap
+++ b/.forge-snapshots/PositionManager_permit.snap
@@ -1 +1 @@
-79076
\ No newline at end of file
+79259
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_permit_secondPosition.snap b/.forge-snapshots/PositionManager_permit_secondPosition.snap
index 31ad6187..ac17c65c 100644
--- a/.forge-snapshots/PositionManager_permit_secondPosition.snap
+++ b/.forge-snapshots/PositionManager_permit_secondPosition.snap
@@ -1 +1 @@
-61976
\ No newline at end of file
+62159
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_permit_twice.snap b/.forge-snapshots/PositionManager_permit_twice.snap
index 379f9611..532d2de9 100644
--- a/.forge-snapshots/PositionManager_permit_twice.snap
+++ b/.forge-snapshots/PositionManager_permit_twice.snap
@@ -1 +1 @@
-44852
\ No newline at end of file
+45035
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_subscribe.snap b/.forge-snapshots/PositionManager_subscribe.snap
index 74ca20b5..f6081d8d 100644
--- a/.forge-snapshots/PositionManager_subscribe.snap
+++ b/.forge-snapshots/PositionManager_subscribe.snap
@@ -1 +1 @@
-88124
\ No newline at end of file
+88475
\ No newline at end of file
diff --git a/.forge-snapshots/PositionManager_unsubscribe.snap b/.forge-snapshots/PositionManager_unsubscribe.snap
index ef5e368e..3651ba8a 100644
--- a/.forge-snapshots/PositionManager_unsubscribe.snap
+++ b/.forge-snapshots/PositionManager_unsubscribe.snap
@@ -1 +1 @@
-63058
\ No newline at end of file
+63253
\ No newline at end of file
diff --git a/.forge-snapshots/Quoter_exactInputSingle_oneForZero_multiplePositions.snap b/.forge-snapshots/Quoter_exactInputSingle_oneForZero_multiplePositions.snap
index 7110b7f4..cb86556e 100644
--- a/.forge-snapshots/Quoter_exactInputSingle_oneForZero_multiplePositions.snap
+++ b/.forge-snapshots/Quoter_exactInputSingle_oneForZero_multiplePositions.snap
@@ -1 +1 @@
-144020
\ No newline at end of file
+146317
\ No newline at end of file
diff --git a/.forge-snapshots/Quoter_exactInputSingle_zeroForOne_multiplePositions.snap b/.forge-snapshots/Quoter_exactInputSingle_zeroForOne_multiplePositions.snap
index fc06cb48..8cf53dc8 100644
--- a/.forge-snapshots/Quoter_exactInputSingle_zeroForOne_multiplePositions.snap
+++ b/.forge-snapshots/Quoter_exactInputSingle_zeroForOne_multiplePositions.snap
@@ -1 +1 @@
-149287
\ No newline at end of file
+151973
\ No newline at end of file
diff --git a/.forge-snapshots/Quoter_exactOutputSingle_oneForZero.snap b/.forge-snapshots/Quoter_exactOutputSingle_oneForZero.snap
index 2963a4a5..2f2aa6ed 100644
--- a/.forge-snapshots/Quoter_exactOutputSingle_oneForZero.snap
+++ b/.forge-snapshots/Quoter_exactOutputSingle_oneForZero.snap
@@ -1 +1 @@
-78196
\ No newline at end of file
+80048
\ No newline at end of file
diff --git a/.forge-snapshots/Quoter_exactOutputSingle_zeroForOne.snap b/.forge-snapshots/Quoter_exactOutputSingle_zeroForOne.snap
index d9141291..9606490a 100644
--- a/.forge-snapshots/Quoter_exactOutputSingle_zeroForOne.snap
+++ b/.forge-snapshots/Quoter_exactOutputSingle_zeroForOne.snap
@@ -1 +1 @@
-82546
\ No newline at end of file
+84626
\ No newline at end of file
diff --git a/.forge-snapshots/Quoter_quoteExactInput_oneHop_1TickLoaded.snap b/.forge-snapshots/Quoter_quoteExactInput_oneHop_1TickLoaded.snap
index 8e02b346..9aebeeca 100644
--- a/.forge-snapshots/Quoter_quoteExactInput_oneHop_1TickLoaded.snap
+++ b/.forge-snapshots/Quoter_quoteExactInput_oneHop_1TickLoaded.snap
@@ -1 +1 @@
-120406
\ No newline at end of file
+122994
\ No newline at end of file
diff --git a/.forge-snapshots/Quoter_quoteExactInput_oneHop_initializedAfter.snap b/.forge-snapshots/Quoter_quoteExactInput_oneHop_initializedAfter.snap
index 1c2000f8..1a3ae713 100644
--- a/.forge-snapshots/Quoter_quoteExactInput_oneHop_initializedAfter.snap
+++ b/.forge-snapshots/Quoter_quoteExactInput_oneHop_initializedAfter.snap
@@ -1 +1 @@
-145504
\ No newline at end of file
+147949
\ No newline at end of file
diff --git a/.forge-snapshots/Quoter_quoteExactInput_oneHop_startingInitialized.snap b/.forge-snapshots/Quoter_quoteExactInput_oneHop_startingInitialized.snap
index 7cd92e9f..1ce389ff 100644
--- a/.forge-snapshots/Quoter_quoteExactInput_oneHop_startingInitialized.snap
+++ b/.forge-snapshots/Quoter_quoteExactInput_oneHop_startingInitialized.snap
@@ -1 +1 @@
-79438
\ No newline at end of file
+81420
\ No newline at end of file
diff --git a/.forge-snapshots/Quoter_quoteExactInput_twoHops.snap b/.forge-snapshots/Quoter_quoteExactInput_twoHops.snap
index 4753bccf..7fe1af46 100644
--- a/.forge-snapshots/Quoter_quoteExactInput_twoHops.snap
+++ b/.forge-snapshots/Quoter_quoteExactInput_twoHops.snap
@@ -1 +1 @@
-201071
\ No newline at end of file
+205421
\ No newline at end of file
diff --git a/.forge-snapshots/Quoter_quoteExactOutput_oneHop_1TickLoaded.snap b/.forge-snapshots/Quoter_quoteExactOutput_oneHop_1TickLoaded.snap
index 1fc92a41..6233611d 100644
--- a/.forge-snapshots/Quoter_quoteExactOutput_oneHop_1TickLoaded.snap
+++ b/.forge-snapshots/Quoter_quoteExactOutput_oneHop_1TickLoaded.snap
@@ -1 +1 @@
-119672
\ No newline at end of file
+122296
\ No newline at end of file
diff --git a/.forge-snapshots/Quoter_quoteExactOutput_oneHop_2TicksLoaded.snap b/.forge-snapshots/Quoter_quoteExactOutput_oneHop_2TicksLoaded.snap
index 958e4261..ee524ce0 100644
--- a/.forge-snapshots/Quoter_quoteExactOutput_oneHop_2TicksLoaded.snap
+++ b/.forge-snapshots/Quoter_quoteExactOutput_oneHop_2TicksLoaded.snap
@@ -1 +1 @@
-149779
\ No newline at end of file
+152648
\ No newline at end of file
diff --git a/.forge-snapshots/Quoter_quoteExactOutput_oneHop_initializedAfter.snap b/.forge-snapshots/Quoter_quoteExactOutput_oneHop_initializedAfter.snap
index 764795de..f965907a 100644
--- a/.forge-snapshots/Quoter_quoteExactOutput_oneHop_initializedAfter.snap
+++ b/.forge-snapshots/Quoter_quoteExactOutput_oneHop_initializedAfter.snap
@@ -1 +1 @@
-119740
\ No newline at end of file
+122364
\ No newline at end of file
diff --git a/.forge-snapshots/Quoter_quoteExactOutput_oneHop_startingInitialized.snap b/.forge-snapshots/Quoter_quoteExactOutput_oneHop_startingInitialized.snap
index a2bce2b2..f813bc4b 100644
--- a/.forge-snapshots/Quoter_quoteExactOutput_oneHop_startingInitialized.snap
+++ b/.forge-snapshots/Quoter_quoteExactOutput_oneHop_startingInitialized.snap
@@ -1 +1 @@
-96472
\ No newline at end of file
+98875
\ No newline at end of file
diff --git a/.forge-snapshots/Quoter_quoteExactOutput_twoHops.snap b/.forge-snapshots/Quoter_quoteExactOutput_twoHops.snap
index 40af9508..584ea142 100644
--- a/.forge-snapshots/Quoter_quoteExactOutput_twoHops.snap
+++ b/.forge-snapshots/Quoter_quoteExactOutput_twoHops.snap
@@ -1 +1 @@
-200486
\ No newline at end of file
+204897
\ No newline at end of file
diff --git a/.forge-snapshots/StateView_extsload_getFeeGrowthGlobals.snap b/.forge-snapshots/StateView_extsload_getFeeGrowthGlobals.snap
index 920727d2..a9e72c33 100644
--- a/.forge-snapshots/StateView_extsload_getFeeGrowthGlobals.snap
+++ b/.forge-snapshots/StateView_extsload_getFeeGrowthGlobals.snap
@@ -1 +1 @@
-2256
\ No newline at end of file
+2367
\ No newline at end of file
diff --git a/.forge-snapshots/StateView_extsload_getFeeGrowthInside.snap b/.forge-snapshots/StateView_extsload_getFeeGrowthInside.snap
index 6df67244..b1b49287 100644
--- a/.forge-snapshots/StateView_extsload_getFeeGrowthInside.snap
+++ b/.forge-snapshots/StateView_extsload_getFeeGrowthInside.snap
@@ -1 +1 @@
-7994
\ No newline at end of file
+8444
\ No newline at end of file
diff --git a/.forge-snapshots/StateView_extsload_getLiquidity.snap b/.forge-snapshots/StateView_extsload_getLiquidity.snap
index a900d0b2..ab57eb1e 100644
--- a/.forge-snapshots/StateView_extsload_getLiquidity.snap
+++ b/.forge-snapshots/StateView_extsload_getLiquidity.snap
@@ -1 +1 @@
-1399
\ No newline at end of file
+1480
\ No newline at end of file
diff --git a/.forge-snapshots/StateView_extsload_getPositionInfo.snap b/.forge-snapshots/StateView_extsload_getPositionInfo.snap
index c173e591..0a1ca398 100644
--- a/.forge-snapshots/StateView_extsload_getPositionInfo.snap
+++ b/.forge-snapshots/StateView_extsload_getPositionInfo.snap
@@ -1 +1 @@
-2826
\ No newline at end of file
+2973
\ No newline at end of file
diff --git a/.forge-snapshots/StateView_extsload_getPositionLiquidity.snap b/.forge-snapshots/StateView_extsload_getPositionLiquidity.snap
index 7f3589da..8d643083 100644
--- a/.forge-snapshots/StateView_extsload_getPositionLiquidity.snap
+++ b/.forge-snapshots/StateView_extsload_getPositionLiquidity.snap
@@ -1 +1 @@
-1651
\ No newline at end of file
+1750
\ No newline at end of file
diff --git a/.forge-snapshots/StateView_extsload_getSlot0.snap b/.forge-snapshots/StateView_extsload_getSlot0.snap
index 585cf67a..466fe402 100644
--- a/.forge-snapshots/StateView_extsload_getSlot0.snap
+++ b/.forge-snapshots/StateView_extsload_getSlot0.snap
@@ -1 +1 @@
-1446
\ No newline at end of file
+1548
\ No newline at end of file
diff --git a/.forge-snapshots/StateView_extsload_getTickBitmap.snap b/.forge-snapshots/StateView_extsload_getTickBitmap.snap
index 05fd8282..0e8ebf59 100644
--- a/.forge-snapshots/StateView_extsload_getTickBitmap.snap
+++ b/.forge-snapshots/StateView_extsload_getTickBitmap.snap
@@ -1 +1 @@
-1392
\ No newline at end of file
+1476
\ No newline at end of file
diff --git a/.forge-snapshots/StateView_extsload_getTickFeeGrowthOutside.snap b/.forge-snapshots/StateView_extsload_getTickFeeGrowthOutside.snap
index 7a03b74c..7c43ea01 100644
--- a/.forge-snapshots/StateView_extsload_getTickFeeGrowthOutside.snap
+++ b/.forge-snapshots/StateView_extsload_getTickFeeGrowthOutside.snap
@@ -1 +1 @@
-2543
\ No newline at end of file
+2672
\ No newline at end of file
diff --git a/.forge-snapshots/StateView_extsload_getTickInfo.snap b/.forge-snapshots/StateView_extsload_getTickInfo.snap
index f538595c..3582118c 100644
--- a/.forge-snapshots/StateView_extsload_getTickInfo.snap
+++ b/.forge-snapshots/StateView_extsload_getTickInfo.snap
@@ -1 +1 @@
-2758
\ No newline at end of file
+2896
\ No newline at end of file
diff --git a/.forge-snapshots/StateView_extsload_getTickLiquidity.snap b/.forge-snapshots/StateView_extsload_getTickLiquidity.snap
index 44e78825..0504b068 100644
--- a/.forge-snapshots/StateView_extsload_getTickLiquidity.snap
+++ b/.forge-snapshots/StateView_extsload_getTickLiquidity.snap
@@ -1 +1 @@
-1646
\ No newline at end of file
+1748
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_Bytecode.snap b/.forge-snapshots/V4Router_Bytecode.snap
index 2936eb37..ec718f71 100644
--- a/.forge-snapshots/V4Router_Bytecode.snap
+++ b/.forge-snapshots/V4Router_Bytecode.snap
@@ -1 +1 @@
-7029
\ No newline at end of file
+5137
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactIn1Hop_nativeIn.snap b/.forge-snapshots/V4Router_ExactIn1Hop_nativeIn.snap
index e867cdb1..56a7e65e 100644
--- a/.forge-snapshots/V4Router_ExactIn1Hop_nativeIn.snap
+++ b/.forge-snapshots/V4Router_ExactIn1Hop_nativeIn.snap
@@ -1 +1 @@
-118724
\ No newline at end of file
+121819
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactIn1Hop_nativeOut.snap b/.forge-snapshots/V4Router_ExactIn1Hop_nativeOut.snap
index 7e9c5fc1..cbfeb1a9 100644
--- a/.forge-snapshots/V4Router_ExactIn1Hop_nativeOut.snap
+++ b/.forge-snapshots/V4Router_ExactIn1Hop_nativeOut.snap
@@ -1 +1 @@
-117700
\ No newline at end of file
+120826
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactIn1Hop_oneForZero.snap b/.forge-snapshots/V4Router_ExactIn1Hop_oneForZero.snap
index a8bb1df3..6bf2eef7 100644
--- a/.forge-snapshots/V4Router_ExactIn1Hop_oneForZero.snap
+++ b/.forge-snapshots/V4Router_ExactIn1Hop_oneForZero.snap
@@ -1 +1 @@
-126515
\ No newline at end of file
+129715
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactIn1Hop_zeroForOne.snap b/.forge-snapshots/V4Router_ExactIn1Hop_zeroForOne.snap
index a62dfebf..891422a7 100644
--- a/.forge-snapshots/V4Router_ExactIn1Hop_zeroForOne.snap
+++ b/.forge-snapshots/V4Router_ExactIn1Hop_zeroForOne.snap
@@ -1 +1 @@
-132179
\ No newline at end of file
+135623
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactIn2Hops.snap b/.forge-snapshots/V4Router_ExactIn2Hops.snap
index 67981724..a7bc469a 100644
--- a/.forge-snapshots/V4Router_ExactIn2Hops.snap
+++ b/.forge-snapshots/V4Router_ExactIn2Hops.snap
@@ -1 +1 @@
-186913
\ No newline at end of file
+191979
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactIn2Hops_nativeIn.snap b/.forge-snapshots/V4Router_ExactIn2Hops_nativeIn.snap
index d38ed305..ef0bcd5f 100644
--- a/.forge-snapshots/V4Router_ExactIn2Hops_nativeIn.snap
+++ b/.forge-snapshots/V4Router_ExactIn2Hops_nativeIn.snap
@@ -1 +1 @@
-173458
\ No newline at end of file
+178175
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactIn3Hops.snap b/.forge-snapshots/V4Router_ExactIn3Hops.snap
index 1261e374..89acd064 100644
--- a/.forge-snapshots/V4Router_ExactIn3Hops.snap
+++ b/.forge-snapshots/V4Router_ExactIn3Hops.snap
@@ -1 +1 @@
-241697
\ No newline at end of file
+248385
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactIn3Hops_nativeIn.snap b/.forge-snapshots/V4Router_ExactIn3Hops_nativeIn.snap
index b37ad64b..a93abe95 100644
--- a/.forge-snapshots/V4Router_ExactIn3Hops_nativeIn.snap
+++ b/.forge-snapshots/V4Router_ExactIn3Hops_nativeIn.snap
@@ -1 +1 @@
-228242
\ No newline at end of file
+234581
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactInputSingle.snap b/.forge-snapshots/V4Router_ExactInputSingle.snap
index e3f4d02a..24fe6dec 100644
--- a/.forge-snapshots/V4Router_ExactInputSingle.snap
+++ b/.forge-snapshots/V4Router_ExactInputSingle.snap
@@ -1 +1 @@
-131187
\ No newline at end of file
+134546
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactInputSingle_nativeIn.snap b/.forge-snapshots/V4Router_ExactInputSingle_nativeIn.snap
index b6786b89..7f06d7f0 100644
--- a/.forge-snapshots/V4Router_ExactInputSingle_nativeIn.snap
+++ b/.forge-snapshots/V4Router_ExactInputSingle_nativeIn.snap
@@ -1 +1 @@
-117732
\ No newline at end of file
+120742
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactInputSingle_nativeOut.snap b/.forge-snapshots/V4Router_ExactInputSingle_nativeOut.snap
index 99644e8c..4e26e853 100644
--- a/.forge-snapshots/V4Router_ExactInputSingle_nativeOut.snap
+++ b/.forge-snapshots/V4Router_ExactInputSingle_nativeOut.snap
@@ -1 +1 @@
-116676
\ No newline at end of file
+119714
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactOut1Hop_nativeIn_sweepETH.snap b/.forge-snapshots/V4Router_ExactOut1Hop_nativeIn_sweepETH.snap
index 1595951f..1fdaa9cd 100644
--- a/.forge-snapshots/V4Router_ExactOut1Hop_nativeIn_sweepETH.snap
+++ b/.forge-snapshots/V4Router_ExactOut1Hop_nativeIn_sweepETH.snap
@@ -1 +1 @@
-124982
\ No newline at end of file
+128078
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactOut1Hop_nativeOut.snap b/.forge-snapshots/V4Router_ExactOut1Hop_nativeOut.snap
index d47ed0cd..5680b027 100644
--- a/.forge-snapshots/V4Router_ExactOut1Hop_nativeOut.snap
+++ b/.forge-snapshots/V4Router_ExactOut1Hop_nativeOut.snap
@@ -1 +1 @@
-118773
\ No newline at end of file
+121895
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactOut1Hop_oneForZero.snap b/.forge-snapshots/V4Router_ExactOut1Hop_oneForZero.snap
index cf325d8b..85542b79 100644
--- a/.forge-snapshots/V4Router_ExactOut1Hop_oneForZero.snap
+++ b/.forge-snapshots/V4Router_ExactOut1Hop_oneForZero.snap
@@ -1 +1 @@
-127588
\ No newline at end of file
+130784
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactOut1Hop_zeroForOne.snap b/.forge-snapshots/V4Router_ExactOut1Hop_zeroForOne.snap
index 0a1f73c4..a883e880 100644
--- a/.forge-snapshots/V4Router_ExactOut1Hop_zeroForOne.snap
+++ b/.forge-snapshots/V4Router_ExactOut1Hop_zeroForOne.snap
@@ -1 +1 @@
-131460
\ No newline at end of file
+134905
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactOut2Hops.snap b/.forge-snapshots/V4Router_ExactOut2Hops.snap
index f175de3f..eb9099cb 100644
--- a/.forge-snapshots/V4Router_ExactOut2Hops.snap
+++ b/.forge-snapshots/V4Router_ExactOut2Hops.snap
@@ -1 +1 @@
-185251
\ No newline at end of file
+190319
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactOut2Hops_nativeIn.snap b/.forge-snapshots/V4Router_ExactOut2Hops_nativeIn.snap
index e1584172..c2de3e9b 100644
--- a/.forge-snapshots/V4Router_ExactOut2Hops_nativeIn.snap
+++ b/.forge-snapshots/V4Router_ExactOut2Hops_nativeIn.snap
@@ -1 +1 @@
-178773
\ No newline at end of file
+183492
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactOut3Hops.snap b/.forge-snapshots/V4Router_ExactOut3Hops.snap
index 04caed97..ddf200aa 100644
--- a/.forge-snapshots/V4Router_ExactOut3Hops.snap
+++ b/.forge-snapshots/V4Router_ExactOut3Hops.snap
@@ -1 +1 @@
-239120
\ No newline at end of file
+245811
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactOut3Hops_nativeIn.snap b/.forge-snapshots/V4Router_ExactOut3Hops_nativeIn.snap
index 3d524adb..583269ae 100644
--- a/.forge-snapshots/V4Router_ExactOut3Hops_nativeIn.snap
+++ b/.forge-snapshots/V4Router_ExactOut3Hops_nativeIn.snap
@@ -1 +1 @@
-232642
\ No newline at end of file
+238984
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactOut3Hops_nativeOut.snap b/.forge-snapshots/V4Router_ExactOut3Hops_nativeOut.snap
index 4bb56d44..0ff3d5c8 100644
--- a/.forge-snapshots/V4Router_ExactOut3Hops_nativeOut.snap
+++ b/.forge-snapshots/V4Router_ExactOut3Hops_nativeOut.snap
@@ -1 +1 @@
-218697
\ No newline at end of file
+224567
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactOutputSingle.snap b/.forge-snapshots/V4Router_ExactOutputSingle.snap
index c4996103..d44e2734 100644
--- a/.forge-snapshots/V4Router_ExactOutputSingle.snap
+++ b/.forge-snapshots/V4Router_ExactOutputSingle.snap
@@ -1 +1 @@
-130453
\ No newline at end of file
+133809
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactOutputSingle_nativeIn_sweepETH.snap b/.forge-snapshots/V4Router_ExactOutputSingle_nativeIn_sweepETH.snap
index d35479f2..fc1ac568 100644
--- a/.forge-snapshots/V4Router_ExactOutputSingle_nativeIn_sweepETH.snap
+++ b/.forge-snapshots/V4Router_ExactOutputSingle_nativeIn_sweepETH.snap
@@ -1 +1 @@
-123975
\ No newline at end of file
+126982
\ No newline at end of file
diff --git a/.forge-snapshots/V4Router_ExactOutputSingle_nativeOut.snap b/.forge-snapshots/V4Router_ExactOutputSingle_nativeOut.snap
index a0a386d2..dacad49f 100644
--- a/.forge-snapshots/V4Router_ExactOutputSingle_nativeOut.snap
+++ b/.forge-snapshots/V4Router_ExactOutputSingle_nativeOut.snap
@@ -1 +1 @@
-117840
\ No newline at end of file
+120876
\ No newline at end of file
diff --git a/.forge-snapshots/positionDescriptor bytecode size.snap b/.forge-snapshots/positionDescriptor bytecode size.snap
index 29912b34..616fe551 100644
--- a/.forge-snapshots/positionDescriptor bytecode size.snap	
+++ b/.forge-snapshots/positionDescriptor bytecode size.snap	
@@ -1 +1 @@
-31806
\ No newline at end of file
+24177
\ No newline at end of file
diff --git a/.forge-snapshots/positionManager bytecode size.snap b/.forge-snapshots/positionManager bytecode size.snap
new file mode 100644
index 00000000..6f29cf46
--- /dev/null
+++ b/.forge-snapshots/positionManager bytecode size.snap	
@@ -0,0 +1 @@
+19068
\ No newline at end of file
diff --git a/foundry.toml b/foundry.toml
index c685a490..30dff3ef 100644
--- a/foundry.toml
+++ b/foundry.toml
@@ -1,7 +1,7 @@
 [profile.default]
 out = 'foundry-out'
 solc_version = '0.8.26'
-optimizer_runs = 44444444
+optimizer_runs = 1
 via_ir = true
 ffi = true
 fs_permissions = [{ access = "read-write", path = ".forge-snapshots/"}]
diff --git a/test/position-managers/PositionManager.gas.t.sol b/test/position-managers/PositionManager.gas.t.sol
index cf077748..bf27604f 100644
--- a/test/position-managers/PositionManager.gas.t.sol
+++ b/test/position-managers/PositionManager.gas.t.sol
@@ -75,6 +75,10 @@ contract PosMGasTest is Test, PosmTestSetup, GasSnapshot {
         sub = new MockSubscriber(lpm);
     }
 
+    function test_bytecodeSize_positionManager() public {
+        snapSize("positionManager bytecode size", address(lpm));
+    }
+
     function test_gas_mint_withClose() public {
         Plan memory planner = Planner.init().add(
             Actions.MINT_POSITION,