diff --git a/.forge-snapshots/add liquidity to already existing position with salt.snap b/.forge-snapshots/add liquidity to already existing position with salt.snap
index 093dad363..f2eceebf0 100644
--- a/.forge-snapshots/add liquidity to already existing position with salt.snap	
+++ b/.forge-snapshots/add liquidity to already existing position with salt.snap	
@@ -1 +1 @@
-151168
\ No newline at end of file
+151174
\ No newline at end of file
diff --git a/.forge-snapshots/addLiquidity CA fee.snap b/.forge-snapshots/addLiquidity CA fee.snap
index 0379626cd..66f302cfc 100644
--- a/.forge-snapshots/addLiquidity CA fee.snap	
+++ b/.forge-snapshots/addLiquidity CA fee.snap	
@@ -1 +1 @@
-329534
\ No newline at end of file
+329540
\ No newline at end of file
diff --git a/.forge-snapshots/addLiquidity with empty hook.snap b/.forge-snapshots/addLiquidity with empty hook.snap
index 40a68aa7d..a880d226c 100644
--- a/.forge-snapshots/addLiquidity with empty hook.snap	
+++ b/.forge-snapshots/addLiquidity with empty hook.snap	
@@ -1 +1 @@
-284169
\ No newline at end of file
+284175
\ No newline at end of file
diff --git a/.forge-snapshots/addLiquidity with native token.snap b/.forge-snapshots/addLiquidity with native token.snap
index 879501c3c..e2a7016e7 100644
--- a/.forge-snapshots/addLiquidity with native token.snap	
+++ b/.forge-snapshots/addLiquidity with native token.snap	
@@ -1 +1 @@
-141301
\ No newline at end of file
+141307
\ No newline at end of file
diff --git a/.forge-snapshots/addLiquidity.snap b/.forge-snapshots/addLiquidity.snap
index 0d34dbefd..0957ca694 100644
--- a/.forge-snapshots/addLiquidity.snap
+++ b/.forge-snapshots/addLiquidity.snap
@@ -1 +1 @@
-151144
\ No newline at end of file
+151150
\ No newline at end of file
diff --git a/.forge-snapshots/create new liquidity to a position with salt.snap b/.forge-snapshots/create new liquidity to a position with salt.snap
index e89853af6..d058bcee5 100644
--- a/.forge-snapshots/create new liquidity to a position with salt.snap	
+++ b/.forge-snapshots/create new liquidity to a position with salt.snap	
@@ -1 +1 @@
-299696
\ No newline at end of file
+299702
\ No newline at end of file
diff --git a/.forge-snapshots/donate gas with 1 token.snap b/.forge-snapshots/donate gas with 1 token.snap
index 95d43d552..5c41fcb36 100644
--- a/.forge-snapshots/donate gas with 1 token.snap	
+++ b/.forge-snapshots/donate gas with 1 token.snap	
@@ -1 +1 @@
-108690
\ No newline at end of file
+108696
\ No newline at end of file
diff --git a/.forge-snapshots/donate gas with 2 tokens.snap b/.forge-snapshots/donate gas with 2 tokens.snap
index 3fb1e542e..889ec57a3 100644
--- a/.forge-snapshots/donate gas with 2 tokens.snap	
+++ b/.forge-snapshots/donate gas with 2 tokens.snap	
@@ -1 +1 @@
-149228
\ No newline at end of file
+149234
\ No newline at end of file
diff --git a/.forge-snapshots/initialize.snap b/.forge-snapshots/initialize.snap
index 7493a1b95..811a2ae0c 100644
--- a/.forge-snapshots/initialize.snap
+++ b/.forge-snapshots/initialize.snap
@@ -1 +1 @@
-62239
\ No newline at end of file
+62245
\ No newline at end of file
diff --git a/.forge-snapshots/poolManager bytecode size.snap b/.forge-snapshots/poolManager bytecode size.snap
index a01880657..dd8998535 100644
--- a/.forge-snapshots/poolManager bytecode size.snap	
+++ b/.forge-snapshots/poolManager bytecode size.snap	
@@ -1 +1 @@
-24031
\ No newline at end of file
+23891
\ No newline at end of file
diff --git a/.forge-snapshots/removeLiquidity CA fee.snap b/.forge-snapshots/removeLiquidity CA fee.snap
index c240fbdca..ccf2ce447 100644
--- a/.forge-snapshots/removeLiquidity CA fee.snap	
+++ b/.forge-snapshots/removeLiquidity CA fee.snap	
@@ -1 +1 @@
-185021
\ No newline at end of file
+185027
\ No newline at end of file
diff --git a/.forge-snapshots/removeLiquidity with empty hook.snap b/.forge-snapshots/removeLiquidity with empty hook.snap
index 9c9263c97..32f98efe0 100644
--- a/.forge-snapshots/removeLiquidity with empty hook.snap	
+++ b/.forge-snapshots/removeLiquidity with empty hook.snap	
@@ -1 +1 @@
-121039
\ No newline at end of file
+121045
\ No newline at end of file
diff --git a/.forge-snapshots/removeLiquidity with native token.snap b/.forge-snapshots/removeLiquidity with native token.snap
index 9bb21b2cd..93c0f3d2d 100644
--- a/.forge-snapshots/removeLiquidity with native token.snap	
+++ b/.forge-snapshots/removeLiquidity with native token.snap	
@@ -1 +1 @@
-117814
\ No newline at end of file
+117820
\ No newline at end of file
diff --git a/.forge-snapshots/removeLiquidity.snap b/.forge-snapshots/removeLiquidity.snap
index ae029fb99..837de0999 100644
--- a/.forge-snapshots/removeLiquidity.snap
+++ b/.forge-snapshots/removeLiquidity.snap
@@ -1 +1 @@
-121027
\ No newline at end of file
+121033
\ No newline at end of file
diff --git a/.forge-snapshots/simple swap with native.snap b/.forge-snapshots/simple swap with native.snap
index 8044782cd..852e8e8f0 100644
--- a/.forge-snapshots/simple swap with native.snap	
+++ b/.forge-snapshots/simple swap with native.snap	
@@ -1 +1 @@
-117517
\ No newline at end of file
+117523
\ No newline at end of file
diff --git a/.forge-snapshots/simple swap.snap b/.forge-snapshots/simple swap.snap
index 062aad1e6..ea78bbc1e 100644
--- a/.forge-snapshots/simple swap.snap	
+++ b/.forge-snapshots/simple swap.snap	
@@ -1 +1 @@
-132756
\ No newline at end of file
+132762
\ No newline at end of file
diff --git a/.forge-snapshots/swap CA custom curve + swap noop.snap b/.forge-snapshots/swap CA custom curve + swap noop.snap
index 31c99c5e5..89d6e05ad 100644
--- a/.forge-snapshots/swap CA custom curve + swap noop.snap	
+++ b/.forge-snapshots/swap CA custom curve + swap noop.snap	
@@ -1 +1 @@
-136229
\ No newline at end of file
+135805
\ No newline at end of file
diff --git a/.forge-snapshots/swap CA fee on unspecified.snap b/.forge-snapshots/swap CA fee on unspecified.snap
index 0edadf357..2b298f457 100644
--- a/.forge-snapshots/swap CA fee on unspecified.snap	
+++ b/.forge-snapshots/swap CA fee on unspecified.snap	
@@ -1 +1 @@
-185023
\ No newline at end of file
+185029
\ No newline at end of file
diff --git a/.forge-snapshots/swap against liquidity with native token.snap b/.forge-snapshots/swap against liquidity with native token.snap
index 13d86b750..12e614f18 100644
--- a/.forge-snapshots/swap against liquidity with native token.snap	
+++ b/.forge-snapshots/swap against liquidity with native token.snap	
@@ -1 +1 @@
-113970
\ No newline at end of file
+113976
\ No newline at end of file
diff --git a/.forge-snapshots/swap against liquidity.snap b/.forge-snapshots/swap against liquidity.snap
index c459e605a..7f27730a4 100644
--- a/.forge-snapshots/swap against liquidity.snap	
+++ b/.forge-snapshots/swap against liquidity.snap	
@@ -1 +1 @@
-125391
\ No newline at end of file
+125397
\ No newline at end of file
diff --git a/.forge-snapshots/swap burn 6909 for input.snap b/.forge-snapshots/swap burn 6909 for input.snap
index 015233c9e..a0313e61e 100644
--- a/.forge-snapshots/swap burn 6909 for input.snap	
+++ b/.forge-snapshots/swap burn 6909 for input.snap	
@@ -1 +1 @@
-137393
\ No newline at end of file
+137399
\ No newline at end of file
diff --git a/.forge-snapshots/swap burn native 6909 for input.snap b/.forge-snapshots/swap burn native 6909 for input.snap
index 32bcf06da..a43787ec1 100644
--- a/.forge-snapshots/swap burn native 6909 for input.snap	
+++ b/.forge-snapshots/swap burn native 6909 for input.snap	
@@ -1 +1 @@
-126493
\ No newline at end of file
+126499
\ No newline at end of file
diff --git a/.forge-snapshots/swap mint native output as 6909.snap b/.forge-snapshots/swap mint native output as 6909.snap
index 86f965291..8af09afa7 100644
--- a/.forge-snapshots/swap mint native output as 6909.snap	
+++ b/.forge-snapshots/swap mint native output as 6909.snap	
@@ -1 +1 @@
-148571
\ No newline at end of file
+148577
\ No newline at end of file
diff --git a/.forge-snapshots/swap mint output as 6909.snap b/.forge-snapshots/swap mint output as 6909.snap
index 27c4de134..4dd7b21b6 100644
--- a/.forge-snapshots/swap mint output as 6909.snap	
+++ b/.forge-snapshots/swap mint output as 6909.snap	
@@ -1 +1 @@
-165380
\ No newline at end of file
+165386
\ No newline at end of file
diff --git a/.forge-snapshots/swap skips hook call if hook is caller.snap b/.forge-snapshots/swap skips hook call if hook is caller.snap
index 4e48c318d..0aeaf878f 100644
--- a/.forge-snapshots/swap skips hook call if hook is caller.snap	
+++ b/.forge-snapshots/swap skips hook call if hook is caller.snap	
@@ -1 +1 @@
-225454
\ No newline at end of file
+225012
\ No newline at end of file
diff --git a/.forge-snapshots/swap with dynamic fee.snap b/.forge-snapshots/swap with dynamic fee.snap
index d7c57b936..1816d569f 100644
--- a/.forge-snapshots/swap with dynamic fee.snap	
+++ b/.forge-snapshots/swap with dynamic fee.snap	
@@ -1 +1 @@
-149647
\ No newline at end of file
+149653
\ No newline at end of file
diff --git a/.forge-snapshots/swap with hooks.snap b/.forge-snapshots/swap with hooks.snap
index 05ed12be5..04f9476a3 100644
--- a/.forge-snapshots/swap with hooks.snap	
+++ b/.forge-snapshots/swap with hooks.snap	
@@ -1 +1 @@
-125403
\ No newline at end of file
+125409
\ No newline at end of file
diff --git a/.forge-snapshots/swap with lp fee and protocol fee.snap b/.forge-snapshots/swap with lp fee and protocol fee.snap
index 9187525d6..f8aef45c6 100644
--- a/.forge-snapshots/swap with lp fee and protocol fee.snap	
+++ b/.forge-snapshots/swap with lp fee and protocol fee.snap	
@@ -1 +1 @@
-182375
\ No newline at end of file
+181943
\ No newline at end of file
diff --git a/.forge-snapshots/swap with return dynamic fee.snap b/.forge-snapshots/swap with return dynamic fee.snap
index f2a6e766b..db08d6b4d 100644
--- a/.forge-snapshots/swap with return dynamic fee.snap	
+++ b/.forge-snapshots/swap with return dynamic fee.snap	
@@ -1 +1 @@
-157794
\ No newline at end of file
+157355
\ No newline at end of file
diff --git a/.forge-snapshots/update dynamic fee in before swap.snap b/.forge-snapshots/update dynamic fee in before swap.snap
index 2e1788712..81174a117 100644
--- a/.forge-snapshots/update dynamic fee in before swap.snap	
+++ b/.forge-snapshots/update dynamic fee in before swap.snap	
@@ -1 +1 @@
-160612
\ No newline at end of file
+160180
\ No newline at end of file
diff --git a/src/libraries/Hooks.sol b/src/libraries/Hooks.sol
index 30404368f..ded09e89b 100644
--- a/src/libraries/Hooks.sol
+++ b/src/libraries/Hooks.sol
@@ -148,21 +148,6 @@ library Hooks {
         (, delta) = abi.decode(result, (bytes4, int256));
     }
 
-    /// @notice performs a hook call using the given calldata on the given hook
-    /// @return delta The delta returned by the hook
-    /// @return fee The fee returned by the hook
-    function callHookWithReturnDeltaAndFee(IHooks self, bytes memory data, bool parseReturn)
-        internal
-        returns (int256 delta, uint24 fee)
-    {
-        bytes memory result = callHook(self, data);
-        (, delta, fee) = abi.decode(result, (bytes4, int256, uint24));
-
-        if (!parseReturn) {
-            delta = 0;
-        }
-    }
-
     /// @notice modifier to prevent calling a hook if they initiated the action
     modifier noSelfCall(IHooks self) {
         if (msg.sender != address(self)) {
@@ -258,17 +243,20 @@ library Hooks {
         if (msg.sender == address(self)) return (amountToSwap, BeforeSwapDeltaLibrary.ZERO_DELTA, lpFee);
 
         if (self.hasPermission(BEFORE_SWAP_FLAG)) {
-            bool canReturnDelta = self.hasPermission(BEFORE_SWAP_RETURNS_DELTA_FLAG);
-            (int256 result, uint24 _lpFee) = self.callHookWithReturnDeltaAndFee(
-                abi.encodeWithSelector(IHooks.beforeSwap.selector, msg.sender, key, params, hookData),
-                canReturnDelta
-            );
-            if (key.fee.isDynamicFee()) lpFee = _lpFee;
+            bytes memory result =
+                callHook(self, abi.encodeWithSelector(IHooks.beforeSwap.selector, msg.sender, key, params, hookData));
 
-            hookReturn = BeforeSwapDelta.wrap(result);
+            if (key.fee.isDynamicFee()) {
+                assembly {
+                    lpFee := mload(add(result, 0x60))
+                }
+            }
 
             // skip this logic for the case where the hook return is 0
-            if (canReturnDelta) {
+            if (self.hasPermission(BEFORE_SWAP_RETURNS_DELTA_FLAG)) {
+                assembly {
+                    hookReturn := mload(add(result, 0x40))
+                }
                 // any return in unspecified is passed to the afterSwap hook for handling
                 int128 hookDeltaSpecified = hookReturn.getSpecifiedDelta();