diff --git a/.forge-snapshots/BinPoolManagerTest#testBurnNativeCurrency.snap b/.forge-snapshots/BinPoolManagerTest#testBurnNativeCurrency.snap
index c88295ca..e20b109e 100644
--- a/.forge-snapshots/BinPoolManagerTest#testBurnNativeCurrency.snap
+++ b/.forge-snapshots/BinPoolManagerTest#testBurnNativeCurrency.snap
@@ -1 +1 @@
-134689
\ No newline at end of file
+134601
\ No newline at end of file
diff --git a/.forge-snapshots/BinPoolManagerTest#testGasBurnHalfBin.snap b/.forge-snapshots/BinPoolManagerTest#testGasBurnHalfBin.snap
index 658c16b5..761efeee 100644
--- a/.forge-snapshots/BinPoolManagerTest#testGasBurnHalfBin.snap
+++ b/.forge-snapshots/BinPoolManagerTest#testGasBurnHalfBin.snap
@@ -1 +1 @@
-143755
\ No newline at end of file
+143645
\ No newline at end of file
diff --git a/.forge-snapshots/BinPoolManagerTest#testGasBurnNineBins.snap b/.forge-snapshots/BinPoolManagerTest#testGasBurnNineBins.snap
index dcab8137..02b4c1ae 100644
--- a/.forge-snapshots/BinPoolManagerTest#testGasBurnNineBins.snap
+++ b/.forge-snapshots/BinPoolManagerTest#testGasBurnNineBins.snap
@@ -1 +1 @@
-289889
\ No newline at end of file
+289801
\ No newline at end of file
diff --git a/.forge-snapshots/BinPoolManagerTest#testGasBurnOneBin.snap b/.forge-snapshots/BinPoolManagerTest#testGasBurnOneBin.snap
index 784739a5..dfaa5fe7 100644
--- a/.forge-snapshots/BinPoolManagerTest#testGasBurnOneBin.snap
+++ b/.forge-snapshots/BinPoolManagerTest#testGasBurnOneBin.snap
@@ -1 +1 @@
-127816
\ No newline at end of file
+127728
\ No newline at end of file
diff --git a/.forge-snapshots/BinPoolManagerTest#testGasDonate.snap b/.forge-snapshots/BinPoolManagerTest#testGasDonate.snap
index a07f7da8..0f9b4693 100644
--- a/.forge-snapshots/BinPoolManagerTest#testGasDonate.snap
+++ b/.forge-snapshots/BinPoolManagerTest#testGasDonate.snap
@@ -1 +1 @@
-116177
\ No newline at end of file
+116177
diff --git a/.forge-snapshots/BinPoolManagerTest#testGasMintNneBins-1.snap b/.forge-snapshots/BinPoolManagerTest#testGasMintNneBins-1.snap
index 83b971db..e1c5bafe 100644
--- a/.forge-snapshots/BinPoolManagerTest#testGasMintNneBins-1.snap
+++ b/.forge-snapshots/BinPoolManagerTest#testGasMintNneBins-1.snap
@@ -1 +1 @@
-970860
\ No newline at end of file
+970860
diff --git a/.forge-snapshots/BinPoolManagerTest#testGasMintNneBins-2.snap b/.forge-snapshots/BinPoolManagerTest#testGasMintNneBins-2.snap
index 366fcc6e..0011cc94 100644
--- a/.forge-snapshots/BinPoolManagerTest#testGasMintNneBins-2.snap
+++ b/.forge-snapshots/BinPoolManagerTest#testGasMintNneBins-2.snap
@@ -1 +1 @@
-329181
\ No newline at end of file
+329181
diff --git a/.forge-snapshots/BinPoolManagerTest#testGasMintOneBin-1.snap b/.forge-snapshots/BinPoolManagerTest#testGasMintOneBin-1.snap
index 1cb10ac9..c17a5691 100644
--- a/.forge-snapshots/BinPoolManagerTest#testGasMintOneBin-1.snap
+++ b/.forge-snapshots/BinPoolManagerTest#testGasMintOneBin-1.snap
@@ -1 +1 @@
-339167
\ No newline at end of file
+339167
diff --git a/.forge-snapshots/BinPoolManagerTest#testGasMintOneBin-2.snap b/.forge-snapshots/BinPoolManagerTest#testGasMintOneBin-2.snap
index e9107df9..0dcf0e7a 100644
--- a/.forge-snapshots/BinPoolManagerTest#testGasMintOneBin-2.snap
+++ b/.forge-snapshots/BinPoolManagerTest#testGasMintOneBin-2.snap
@@ -1 +1 @@
-141577
\ No newline at end of file
+141577
diff --git a/.forge-snapshots/BinPoolManagerTest#testGasSwapMultipleBins.snap b/.forge-snapshots/BinPoolManagerTest#testGasSwapMultipleBins.snap
index edcaed44..f06b8288 100644
--- a/.forge-snapshots/BinPoolManagerTest#testGasSwapMultipleBins.snap
+++ b/.forge-snapshots/BinPoolManagerTest#testGasSwapMultipleBins.snap
@@ -1 +1 @@
-174311
\ No newline at end of file
+174311
diff --git a/.forge-snapshots/BinPoolManagerTest#testGasSwapOverBigBinIdGate.snap b/.forge-snapshots/BinPoolManagerTest#testGasSwapOverBigBinIdGate.snap
index e128d3b8..3b986ae2 100644
--- a/.forge-snapshots/BinPoolManagerTest#testGasSwapOverBigBinIdGate.snap
+++ b/.forge-snapshots/BinPoolManagerTest#testGasSwapOverBigBinIdGate.snap
@@ -1 +1 @@
-180184
\ No newline at end of file
+180184
diff --git a/.forge-snapshots/BinPoolManagerTest#testGasSwapSingleBin.snap b/.forge-snapshots/BinPoolManagerTest#testGasSwapSingleBin.snap
index 0594c29c..0d15574c 100644
--- a/.forge-snapshots/BinPoolManagerTest#testGasSwapSingleBin.snap
+++ b/.forge-snapshots/BinPoolManagerTest#testGasSwapSingleBin.snap
@@ -1 +1 @@
-134199
\ No newline at end of file
+134108
\ No newline at end of file
diff --git a/.forge-snapshots/BinPoolManagerTest#testMintNativeCurrency.snap b/.forge-snapshots/BinPoolManagerTest#testMintNativeCurrency.snap
index a809216b..4fcfca2f 100644
--- a/.forge-snapshots/BinPoolManagerTest#testMintNativeCurrency.snap
+++ b/.forge-snapshots/BinPoolManagerTest#testMintNativeCurrency.snap
@@ -1 +1 @@
-305948
\ No newline at end of file
+305948
diff --git a/.forge-snapshots/CLPoolManagerTest#addLiquidity_fromEmpty.snap b/.forge-snapshots/CLPoolManagerTest#addLiquidity_fromEmpty.snap
index adf26e90..7592661b 100644
--- a/.forge-snapshots/CLPoolManagerTest#addLiquidity_fromEmpty.snap
+++ b/.forge-snapshots/CLPoolManagerTest#addLiquidity_fromEmpty.snap
@@ -1 +1 @@
-354338
\ No newline at end of file
+354266
\ No newline at end of file
diff --git a/.forge-snapshots/CLPoolManagerTest#addLiquidity_fromNonEmpty.snap b/.forge-snapshots/CLPoolManagerTest#addLiquidity_fromNonEmpty.snap
index 473e27f2..57532db0 100644
--- a/.forge-snapshots/CLPoolManagerTest#addLiquidity_fromNonEmpty.snap
+++ b/.forge-snapshots/CLPoolManagerTest#addLiquidity_fromNonEmpty.snap
@@ -1 +1 @@
-169775
\ No newline at end of file
+169703
\ No newline at end of file
diff --git a/.forge-snapshots/CLPoolManagerTest#addLiquidity_nativeToken.snap b/.forge-snapshots/CLPoolManagerTest#addLiquidity_nativeToken.snap
index 0975276f..555c8eca 100644
--- a/.forge-snapshots/CLPoolManagerTest#addLiquidity_nativeToken.snap
+++ b/.forge-snapshots/CLPoolManagerTest#addLiquidity_nativeToken.snap
@@ -1 +1 @@
-240472
\ No newline at end of file
+240436
\ No newline at end of file
diff --git a/.forge-snapshots/CLPoolManagerTest#donateBothTokens.snap b/.forge-snapshots/CLPoolManagerTest#donateBothTokens.snap
index e9ef879e..5f88364a 100644
--- a/.forge-snapshots/CLPoolManagerTest#donateBothTokens.snap
+++ b/.forge-snapshots/CLPoolManagerTest#donateBothTokens.snap
@@ -1 +1 @@
-165801
\ No newline at end of file
+165729
\ No newline at end of file
diff --git a/.forge-snapshots/CLPoolManagerTest#gasDonateOneToken.snap b/.forge-snapshots/CLPoolManagerTest#gasDonateOneToken.snap
index fe0cc31a..d33935b1 100644
--- a/.forge-snapshots/CLPoolManagerTest#gasDonateOneToken.snap
+++ b/.forge-snapshots/CLPoolManagerTest#gasDonateOneToken.snap
@@ -1 +1 @@
-110199
\ No newline at end of file
+110163
\ No newline at end of file
diff --git a/.forge-snapshots/CLPoolManagerTest#removeLiquidity_toNonEmpty.snap b/.forge-snapshots/CLPoolManagerTest#removeLiquidity_toNonEmpty.snap
index 14ee2006..aff1a072 100644
--- a/.forge-snapshots/CLPoolManagerTest#removeLiquidity_toNonEmpty.snap
+++ b/.forge-snapshots/CLPoolManagerTest#removeLiquidity_toNonEmpty.snap
@@ -1 +1 @@
-116943
\ No newline at end of file
+116888
\ No newline at end of file
diff --git a/.forge-snapshots/CLPoolManagerTest#swap_againstLiquidity.snap b/.forge-snapshots/CLPoolManagerTest#swap_againstLiquidity.snap
index 31c6b0fb..90ae771c 100644
--- a/.forge-snapshots/CLPoolManagerTest#swap_againstLiquidity.snap
+++ b/.forge-snapshots/CLPoolManagerTest#swap_againstLiquidity.snap
@@ -1 +1 @@
-133733
\ No newline at end of file
+133642
\ No newline at end of file
diff --git a/.forge-snapshots/CLPoolManagerTest#swap_leaveSurplusTokenInVault.snap b/.forge-snapshots/CLPoolManagerTest#swap_leaveSurplusTokenInVault.snap
index 54844a14..d355ba85 100644
--- a/.forge-snapshots/CLPoolManagerTest#swap_leaveSurplusTokenInVault.snap
+++ b/.forge-snapshots/CLPoolManagerTest#swap_leaveSurplusTokenInVault.snap
@@ -1 +1 @@
-166497
\ No newline at end of file
+166407
\ No newline at end of file
diff --git a/.forge-snapshots/CLPoolManagerTest#swap_runOutOfLiquidity.snap b/.forge-snapshots/CLPoolManagerTest#swap_runOutOfLiquidity.snap
index e365dd3e..9e3d4308 100644
--- a/.forge-snapshots/CLPoolManagerTest#swap_runOutOfLiquidity.snap
+++ b/.forge-snapshots/CLPoolManagerTest#swap_runOutOfLiquidity.snap
@@ -1 +1 @@
-153863
\ No newline at end of file
+153772
\ No newline at end of file
diff --git a/.forge-snapshots/CLPoolManagerTest#swap_useSurplusTokenAsInput.snap b/.forge-snapshots/CLPoolManagerTest#swap_useSurplusTokenAsInput.snap
index 3845587a..7a7235d7 100644
--- a/.forge-snapshots/CLPoolManagerTest#swap_useSurplusTokenAsInput.snap
+++ b/.forge-snapshots/CLPoolManagerTest#swap_useSurplusTokenAsInput.snap
@@ -1 +1 @@
-145886
\ No newline at end of file
+145795
\ No newline at end of file
diff --git a/.forge-snapshots/VaultTest#Vault.snap b/.forge-snapshots/VaultTest#Vault.snap
index a7c4dd2c..ae5acde2 100644
--- a/.forge-snapshots/VaultTest#Vault.snap
+++ b/.forge-snapshots/VaultTest#Vault.snap
@@ -1 +1 @@
-5663
\ No newline at end of file
+5631
\ No newline at end of file
diff --git a/.forge-snapshots/VaultTest#lockSettledWhenAddLiquidity.snap b/.forge-snapshots/VaultTest#lockSettledWhenAddLiquidity.snap
index 871eb1e2..c6f1ac8a 100644
--- a/.forge-snapshots/VaultTest#lockSettledWhenAddLiquidity.snap
+++ b/.forge-snapshots/VaultTest#lockSettledWhenAddLiquidity.snap
@@ -1 +1 @@
-82769
\ No newline at end of file
+82769
diff --git a/.forge-snapshots/VaultTest#lockSettledWhenFlashloan.snap b/.forge-snapshots/VaultTest#lockSettledWhenFlashloan.snap
index 787ada2d..3647cd4e 100644
--- a/.forge-snapshots/VaultTest#lockSettledWhenFlashloan.snap
+++ b/.forge-snapshots/VaultTest#lockSettledWhenFlashloan.snap
@@ -1 +1 @@
-119861
\ No newline at end of file
+119741
\ No newline at end of file
diff --git a/.forge-snapshots/VaultTest#lockSettledWhenMultiHopSwap.snap b/.forge-snapshots/VaultTest#lockSettledWhenMultiHopSwap.snap
index 6ad4a76b..6d7606ec 100644
--- a/.forge-snapshots/VaultTest#lockSettledWhenMultiHopSwap.snap
+++ b/.forge-snapshots/VaultTest#lockSettledWhenMultiHopSwap.snap
@@ -1 +1 @@
-43540
\ No newline at end of file
+43449
\ No newline at end of file
diff --git a/.forge-snapshots/VaultTest#lockSettledWhenSwap.snap b/.forge-snapshots/VaultTest#lockSettledWhenSwap.snap
index ab2db20a..8e0f3e4a 100644
--- a/.forge-snapshots/VaultTest#lockSettledWhenSwap.snap
+++ b/.forge-snapshots/VaultTest#lockSettledWhenSwap.snap
@@ -1 +1 @@
-43536
\ No newline at end of file
+43445
\ No newline at end of file
diff --git a/src/Vault.sol b/src/Vault.sol
index 97bb4c29..e4e2b2b0 100644
--- a/src/Vault.sol
+++ b/src/Vault.sol
@@ -102,14 +102,18 @@ contract Vault is IVault, VaultToken, Ownable {
 
     /// @inheritdoc IVault
     function take(Currency currency, address to, uint256 amount) external override isLocked {
-        SettlementGuard.accountDelta(msg.sender, currency, -(amount.toInt128()));
-        currency.transfer(to, amount);
+        unchecked {
+            SettlementGuard.accountDelta(msg.sender, currency, -(amount.toInt128()));
+            currency.transfer(to, amount);
+        }
     }
 
     /// @inheritdoc IVault
     function mint(address to, Currency currency, uint256 amount) external override isLocked {
-        SettlementGuard.accountDelta(msg.sender, currency, -(amount.toInt128()));
-        _mint(to, currency, amount);
+        unchecked {
+            SettlementGuard.accountDelta(msg.sender, currency, -(amount.toInt128()));
+            _mint(to, currency, amount);
+        }
     }
 
     function sync(Currency currency) public returns (uint256 balance) {
@@ -135,9 +139,11 @@ contract Vault is IVault, VaultToken, Ownable {
     function settleFor(Currency currency, address target, uint256 amount) external isLocked {
         /// @notice settle all outstanding debt if amount is 0
         /// It will revert if target has positive delta
-        if (amount == 0) amount = (-SettlementGuard.getCurrencyDelta(target, currency)).toUint256();
-        SettlementGuard.accountDelta(msg.sender, currency, -(amount.toInt128()));
-        SettlementGuard.accountDelta(target, currency, amount.toInt128());
+        unchecked {
+            if (amount == 0) amount = (-SettlementGuard.getCurrencyDelta(target, currency)).toUint256();
+            SettlementGuard.accountDelta(msg.sender, currency, -(amount.toInt128()));
+            SettlementGuard.accountDelta(target, currency, amount.toInt128());
+        }
     }
 
     /// @inheritdoc IVault