diff --git a/.forge-snapshots/autocompound_exactUnclaimedFees.snap b/.forge-snapshots/autocompound_exactUnclaimedFees.snap
index 51e79ca7..20308207 100644
--- a/.forge-snapshots/autocompound_exactUnclaimedFees.snap
+++ b/.forge-snapshots/autocompound_exactUnclaimedFees.snap
@@ -1 +1 @@
-258556
\ No newline at end of file
+258574
\ No newline at end of file
diff --git a/.forge-snapshots/autocompound_exactUnclaimedFees_exactCustodiedFees.snap b/.forge-snapshots/autocompound_exactUnclaimedFees_exactCustodiedFees.snap
index 62694eee..be27e821 100644
--- a/.forge-snapshots/autocompound_exactUnclaimedFees_exactCustodiedFees.snap
+++ b/.forge-snapshots/autocompound_exactUnclaimedFees_exactCustodiedFees.snap
@@ -1 +1 @@
-190929
\ No newline at end of file
+190947
\ No newline at end of file
diff --git a/.forge-snapshots/autocompound_excessFeesCredit.snap b/.forge-snapshots/autocompound_excessFeesCredit.snap
index 45e19b9a..3632f8d2 100644
--- a/.forge-snapshots/autocompound_excessFeesCredit.snap
+++ b/.forge-snapshots/autocompound_excessFeesCredit.snap
@@ -1 +1 @@
-279095
\ No newline at end of file
+279113
\ No newline at end of file
diff --git a/.forge-snapshots/decreaseLiquidity_erc20.snap b/.forge-snapshots/decreaseLiquidity_erc20.snap
index de734ea6..95f17313 100644
--- a/.forge-snapshots/decreaseLiquidity_erc20.snap
+++ b/.forge-snapshots/decreaseLiquidity_erc20.snap
@@ -1 +1 @@
-133896
\ No newline at end of file
+133893
\ No newline at end of file
diff --git a/.forge-snapshots/decreaseLiquidity_erc6909.snap b/.forge-snapshots/decreaseLiquidity_erc6909.snap
index d5b067f6..91878896 100644
--- a/.forge-snapshots/decreaseLiquidity_erc6909.snap
+++ b/.forge-snapshots/decreaseLiquidity_erc6909.snap
@@ -1 +1 @@
-121839
\ No newline at end of file
+121836
\ No newline at end of file
diff --git a/.forge-snapshots/increaseLiquidity_erc20.snap b/.forge-snapshots/increaseLiquidity_erc20.snap
index 0b214a9f..cee1a41b 100644
--- a/.forge-snapshots/increaseLiquidity_erc20.snap
+++ b/.forge-snapshots/increaseLiquidity_erc20.snap
@@ -1 +1 @@
-171342
\ No newline at end of file
+171338
\ No newline at end of file
diff --git a/.forge-snapshots/increaseLiquidity_erc6909.snap b/.forge-snapshots/increaseLiquidity_erc6909.snap
index d714a47f..677231e7 100644
--- a/.forge-snapshots/increaseLiquidity_erc6909.snap
+++ b/.forge-snapshots/increaseLiquidity_erc6909.snap
@@ -1 +1 @@
-146924
\ No newline at end of file
+146920
\ No newline at end of file
diff --git a/.forge-snapshots/mintWithLiquidity.snap b/.forge-snapshots/mintWithLiquidity.snap
index 4f29dd0f..65812e8b 100644
--- a/.forge-snapshots/mintWithLiquidity.snap
+++ b/.forge-snapshots/mintWithLiquidity.snap
@@ -1 +1 @@
-466631
\ No newline at end of file
+466627
\ No newline at end of file
diff --git a/contracts/base/BaseLiquidityManagement.sol b/contracts/base/BaseLiquidityManagement.sol
index 61dbba13..d07eb1cd 100644
--- a/contracts/base/BaseLiquidityManagement.sol
+++ b/contracts/base/BaseLiquidityManagement.sol
@@ -267,39 +267,40 @@ contract BaseLiquidityManagement is IBaseLiquidityManagement, SafeCallback {
 
     function _collect(address owner, LiquidityRange memory range, bytes memory hookData)
         internal
-        returns (BalanceDelta)
+        returns (BalanceDelta callerDelta, BalanceDelta thisDelta)
     {
-        (, BalanceDelta totalFeesAccrued) = _modifyLiquidity(owner, range, 0, hookData);
+        // Do not add or decrease liquidity, just trigger fee updates.
+        (BalanceDelta liquidityDelta, BalanceDelta totalFeesAccrued) = _modifyLiquidity(owner, range, 0, hookData);
 
-        PoolKey memory key = range.poolKey;
         Position storage position = positions[owner][range.toId()];
 
-        // take all fees first then distribute
-        if (totalFeesAccrued.amount0() > 0) {
-            key.currency0.take(manager, address(this), uint128(totalFeesAccrued.amount0()), true);
-        }
-        if (totalFeesAccrued.amount1() > 0) {
-            key.currency1.take(manager, address(this), uint128(totalFeesAccrued.amount1()), true);
-        }
+        // Also updates the position's the feeGrowthInsideLast variables in storage.
+        (BalanceDelta callerFeesAccrued) = _updateFeeGrowth(range, position);
 
-        // collecting fees: new fees and old fees
-        BalanceDelta callerFeesAccrued = _updateFeeGrowth(range, position);
-        callerFeesAccrued = callerFeesAccrued
-            + toBalanceDelta(uint256(position.tokensOwed0).toInt128(), uint256(position.tokensOwed1).toInt128());
+        // Account for fees accrued to other users on the same range.
+        // TODO: Opt when liquidityDelta == 0
+        (callerDelta, thisDelta) = liquidityDelta.split(callerFeesAccrued, totalFeesAccrued);
 
-        position.tokensOwed0 = 0;
-        position.tokensOwed1 = 0;
+        // Allow the caller to collect the tokens owed.
+        // Tokens owed that the caller collects is paid for by this contract.
+        // ie. Transfer the tokensOwed amounts to the caller from the position manager through the pool manager.
+        // TODO case where this contract does not have enough credits to pay the caller?
+        BalanceDelta tokensOwed =
+            toBalanceDelta(uint256(position.tokensOwed0).toInt128(), uint256(position.tokensOwed1).toInt128());
+        callerDelta = callerDelta + tokensOwed;
+        thisDelta = thisDelta - tokensOwed;
 
-        return callerFeesAccrued;
+        position.clearTokensOwed();
     }
 
     function _collectAndZeroOut(address owner, LiquidityRange memory range, uint256, bytes memory hookData, bool claims)
         internal
-        returns (BalanceDelta delta)
+        returns (BalanceDelta callerDelta)
     {
-        delta = _collect(owner, range, hookData);
-        _closeCallerDeltas(delta, range.poolKey.currency0, range.poolKey.currency1, owner, claims);
-        _closeAllDeltas(range.poolKey.currency0, range.poolKey.currency1);
+        BalanceDelta thisDelta;
+        (callerDelta, thisDelta) = _collect(owner, range, hookData);
+        _closeCallerDeltas(callerDelta, range.poolKey.currency0, range.poolKey.currency1, owner, claims);
+        _closeThisDeltas(thisDelta, range.poolKey.currency0, range.poolKey.currency1);
     }
 
     function _lockAndCollect(address owner, LiquidityRange memory range, bytes memory hookData, bool claims)
diff --git a/contracts/libraries/Position.sol b/contracts/libraries/Position.sol
index a3a099ba..11ef1771 100644
--- a/contracts/libraries/Position.sol
+++ b/contracts/libraries/Position.sol
@@ -14,6 +14,11 @@ library PositionLibrary {
         position.tokensOwed1 += uint128(tokensOwed.amount1());
     }
 
+    function clearTokensOwed(IBaseLiquidityManagement.Position storage position) internal {
+        position.tokensOwed0 = 0;
+        position.tokensOwed1 = 0;
+    }
+
     function addLiquidity(IBaseLiquidityManagement.Position storage position, uint256 liquidity) internal {
         unchecked {
             position.liquidity += liquidity;