diff --git a/.forge-snapshots/FullRangeFirstSwap.snap b/.forge-snapshots/FullRangeFirstSwap.snap
index 9d59ac16..5d4b423e 100644
--- a/.forge-snapshots/FullRangeFirstSwap.snap
+++ b/.forge-snapshots/FullRangeFirstSwap.snap
@@ -1 +1 @@
-154763
\ No newline at end of file
+154780
\ No newline at end of file
diff --git a/.forge-snapshots/FullRangeInitialize.snap b/.forge-snapshots/FullRangeInitialize.snap
index e0b3ab13..b3af3268 100644
--- a/.forge-snapshots/FullRangeInitialize.snap
+++ b/.forge-snapshots/FullRangeInitialize.snap
@@ -1 +1 @@
-879542
\ No newline at end of file
+879745
\ No newline at end of file
diff --git a/.forge-snapshots/FullRangeRemoveLiquidity.snap b/.forge-snapshots/FullRangeRemoveLiquidity.snap
index 920384a4..0c7a6f95 100644
--- a/.forge-snapshots/FullRangeRemoveLiquidity.snap
+++ b/.forge-snapshots/FullRangeRemoveLiquidity.snap
@@ -1 +1 @@
-200095
\ No newline at end of file
+200139
\ No newline at end of file
diff --git a/.forge-snapshots/FullRangeRemoveLiquidityAndRebalance.snap b/.forge-snapshots/FullRangeRemoveLiquidityAndRebalance.snap
index 5ee38978..64a7c94b 100644
--- a/.forge-snapshots/FullRangeRemoveLiquidityAndRebalance.snap
+++ b/.forge-snapshots/FullRangeRemoveLiquidityAndRebalance.snap
@@ -1 +1 @@
-379287
\ No newline at end of file
+379404
\ No newline at end of file
diff --git a/.forge-snapshots/FullRangeSecondSwap.snap b/.forge-snapshots/FullRangeSecondSwap.snap
index 436848b5..432b06b6 100644
--- a/.forge-snapshots/FullRangeSecondSwap.snap
+++ b/.forge-snapshots/FullRangeSecondSwap.snap
@@ -1 +1 @@
-112303
\ No newline at end of file
+112332
\ No newline at end of file
diff --git a/.forge-snapshots/FullRangeSwap.snap b/.forge-snapshots/FullRangeSwap.snap
index d48620c7..6f6750bd 100644
--- a/.forge-snapshots/FullRangeSwap.snap
+++ b/.forge-snapshots/FullRangeSwap.snap
@@ -1 +1 @@
-153038
\ No newline at end of file
+153055
\ No newline at end of file
diff --git a/.forge-snapshots/TWAMMSubmitOrder.snap b/.forge-snapshots/TWAMMSubmitOrder.snap
index 9adc49a6..d49c15c1 100644
--- a/.forge-snapshots/TWAMMSubmitOrder.snap
+++ b/.forge-snapshots/TWAMMSubmitOrder.snap
@@ -1 +1 @@
-123576
\ No newline at end of file
+123620
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
index 9e4b995c..c8ffbbaf 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,9 +7,9 @@
 [submodule "lib/forge-gas-snapshot"]
 	path = lib/forge-gas-snapshot
 	url = https://github.com/marktoda/forge-gas-snapshot
-[submodule "lib/v4-core"]
-	path = lib/v4-core
-	url = git@github.com:Uniswap/v4-core.git
 [submodule "lib/solmate"]
 	path = lib/solmate
 	url = https://github.com/transmissions11/solmate
+[submodule "lib/v4-core"]
+	path = lib/v4-core
+	url = https://github.com/uniswap/v4-core
diff --git a/contracts/hooks/examples/VolatilityOracle.sol b/contracts/hooks/examples/VolatilityOracle.sol
index 0a7e696d..25eaf35d 100644
--- a/contracts/hooks/examples/VolatilityOracle.sol
+++ b/contracts/hooks/examples/VolatilityOracle.sol
@@ -15,11 +15,7 @@ contract VolatilityOracle is BaseHook, IDynamicFeeManager {
 
     uint32 deployTimestamp;
 
-    function getFee(address, PoolKey calldata, IPoolManager.SwapParams calldata, bytes calldata)
-        external
-        view
-        returns (uint24)
-    {
+    function getFee(address, PoolKey calldata) external view returns (uint24) {
         uint24 startingFee = 3000;
         uint32 lapsed = _blockTimestamp() - deployTimestamp;
         return startingFee + (uint24(lapsed) * 100) / 60; // 100 bps a minute
diff --git a/lib/v4-core b/lib/v4-core
index 0095e084..9a5c3237 160000
--- a/lib/v4-core
+++ b/lib/v4-core
@@ -1 +1 @@
-Subproject commit 0095e0848098c3e32e016eac6d2537b67aa47358
+Subproject commit 9a5c3237db4a38795275567dcfe98f2e4c962c90
diff --git a/test/FullRange.t.sol b/test/FullRange.t.sol
index fa9d13ed..f033fce3 100644
--- a/test/FullRange.t.sol
+++ b/test/FullRange.t.sol
@@ -9,7 +9,7 @@ import {FullRangeImplementation} from "./shared/implementation/FullRangeImplemen
 import {PoolManager} from "@uniswap/v4-core/contracts/PoolManager.sol";
 import {IPoolManager} from "@uniswap/v4-core/contracts/interfaces/IPoolManager.sol";
 import {Deployers} from "@uniswap/v4-core/test/foundry-tests/utils/Deployers.sol";
-import {MockERC20} from "@uniswap/v4-core/test/foundry-tests/utils/MockERC20.sol";
+import {MockERC20} from "solmate/test/utils/mocks/MockERC20.sol";
 import {Currency, CurrencyLibrary} from "@uniswap/v4-core/contracts/types/Currency.sol";
 import {PoolId, PoolIdLibrary} from "@uniswap/v4-core/contracts/types/PoolId.sol";
 import {PoolKey} from "@uniswap/v4-core/contracts/types/PoolKey.sol";
@@ -84,9 +84,12 @@ contract TestFullRange is Test, Deployers, GasSnapshot {
     PoolSwapTest swapRouter;
 
     function setUp() public {
-        token0 = new MockERC20("TestA", "A", 18, 2 ** 128);
-        token1 = new MockERC20("TestB", "B", 18, 2 ** 128);
-        token2 = new MockERC20("TestC", "C", 18, 2 ** 128);
+        token0 = new MockERC20("TestA", "A", 18);
+        token0.mint(address(this), 2 ** 128);
+        token1 = new MockERC20("TestB", "B", 18);
+        token1.mint(address(this), 2 ** 128);
+        token2 = new MockERC20("TestC", "C", 18);
+        token2.mint(address(this), 2 ** 128);
 
         manager = new PoolManager(500000);
 
diff --git a/test/TWAMM.t.sol b/test/TWAMM.t.sol
index 84ed9716..328aa878 100644
--- a/test/TWAMM.t.sol
+++ b/test/TWAMM.t.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.15;
 import {Test} from "forge-std/Test.sol";
 import {Vm} from "forge-std/Vm.sol";
 import {GasSnapshot} from "forge-gas-snapshot/GasSnapshot.sol";
-import {MockERC20} from "@uniswap/v4-core/test/foundry-tests/utils/MockERC20.sol";
+import {MockERC20} from "solmate/test/utils/mocks/MockERC20.sol";
 import {IERC20Minimal} from "@uniswap/v4-core/contracts/interfaces/external/IERC20Minimal.sol";
 import {TWAMMImplementation} from "./shared/implementation/TWAMMImplementation.sol";
 import {IHooks} from "@uniswap/v4-core/contracts/interfaces/IHooks.sol";