diff --git a/.gas-report b/.gas-report
index 30ce1ab..de53918 100644
--- a/.gas-report
+++ b/.gas-report
@@ -8,30 +8,30 @@
 | MAX_LOCKUP_PERIOD                                | 361             | 361    | 361    | 361    | 4       |
 | MIN_LOCKUP_PERIOD                                | 287             | 287    | 287    | 287    | 12      |
 | YEAR                                             | 263             | 263    | 263    | 263    | 1       |
-| accounts                                         | 1597            | 1597   | 1597   | 1597   | 23368   |
+| accounts                                         | 1597            | 1597   | 1597   | 1597   | 12704   |
 | calculateMPToMint                                | 740             | 740    | 740    | 740    | 4       |
 | currentEpoch                                     | 406             | 1691   | 2406   | 2406   | 28      |
-| epochEnd                                         | 627             | 639    | 627    | 4627   | 635     |
+| epochEnd                                         | 627             | 643    | 627    | 4627   | 480     |
 | epochReward                                      | 1403            | 2903   | 1403   | 5903   | 3       |
-| executeAccount                                   | 28897           | 95321  | 95004  | 171987 | 20929   |
-| executeEpoch                                     | 23436           | 169158 | 164483 | 204283 | 574     |
-| isVault                                          | 540             | 570    | 540    | 2540   | 18426   |
+| executeAccount                                   | 28897           | 95856  | 95004  | 171987 | 10265   |
+| executeEpoch                                     | 23436           | 170888 | 187183 | 204283 | 419     |
+| isVault                                          | 540             | 572    | 540    | 2540   | 7762    |
 | lock                                             | 23840           | 23840  | 23840  | 23840  | 1       |
 | migrateTo                                        | 23869           | 23875  | 23875  | 23881  | 2       |
 | migration                                        | 439             | 1439   | 1439   | 2439   | 4       |
 | migrationInitialize                              | 24602           | 24602  | 24602  | 24602  | 1       |
 | owner                                            | 2432            | 2432   | 2432   | 2432   | 13      |
-| pendingMPToBeMinted                              | 364             | 364    | 364    | 364    | 512     |
+| pendingMPToBeMinted                              | 364             | 364    | 364    | 364    | 202     |
 | pendingReward                                    | 364             | 1398   | 2364   | 2364   | 29      |
 | previousManager                                  | 275             | 275    | 275    | 275    | 13      |
-| setVault                                         | 46239           | 46239  | 46239  | 46239  | 280     |
+| setVault                                         | 46239           | 46239  | 46239  | 46239  | 125     |
 | stake                                            | 23983           | 23983  | 23983  | 23983  | 1       |
 | stakeRewardEstimate                              | 436             | 2269   | 2436   | 2436   | 12      |
-| stakedToken                                      | 273             | 273    | 273    | 273    | 18442   |
+| stakedToken                                      | 273             | 273    | 273    | 273    | 7778    |
 | startMigration                                   | 108037          | 108045 | 108049 | 108049 | 3       |
 | totalSupply                                      | 740             | 1921   | 2740   | 2740   | 22      |
 | totalSupplyBalance                               | 385             | 1785   | 2385   | 2385   | 20      |
-| totalSupplyMP                                    | 385             | 437    | 385    | 2385   | 533     |
+| totalSupplyMP                                    | 385             | 510    | 385    | 2385   | 223     |
 | unstake                                          | 23819           | 23819  | 23819  | 23819  | 1       |
 
 
@@ -40,7 +40,7 @@
 | Deployment Cost                                         | Deployment Size |       |        |       |         |
 | 0                                                       | 0               |       |        |       |         |
 | Function Name                                           | min             | avg   | median | max   | # calls |
-| getExpiredMP                                            | 2427            | 2427  | 2427   | 2427  | 630     |
+| getExpiredMP                                            | 2427            | 2427  | 2427   | 2427  | 475     |
 | transferOwnership                                       | 28533           | 28533 | 28533  | 28533 | 1       |
 
 
@@ -52,8 +52,8 @@
 | acceptMigration                              | 35258           | 35258  | 35258  | 35258  | 2       |
 | leave                                        | 35244           | 35244  | 35244  | 35244  | 1       |
 | lock                                         | 45192           | 73900  | 66395  | 158442 | 7       |
-| owner                                        | 362             | 362    | 362    | 362    | 18425   |
-| stake                                        | 27265           | 268849 | 267631 | 353862 | 18430   |
+| owner                                        | 362             | 362    | 362    | 362    | 7761    |
+| stake                                        | 27265           | 268815 | 267631 | 353862 | 7766    |
 | stakedToken                                  | 212             | 212    | 212    | 212    | 2       |
 | unstake                                      | 42163           | 92598  | 80285  | 207456 | 11      |
 
@@ -63,7 +63,7 @@
 | Deployment Cost                                  | Deployment Size |        |        |        |         |
 | 0                                                | 0               |        |        |        |         |
 | Function Name                                    | min             | avg    | median | max    | # calls |
-| createVault                                      | 696531          | 696531 | 696531 | 696531 | 18429   |
+| createVault                                      | 696531          | 696531 | 696531 | 696531 | 7765    |
 | setStakeManager                                  | 23710           | 26669  | 26076  | 30222  | 3       |
 | stakeManager                                     | 368             | 1868   | 2368   | 2368   | 4       |
 
@@ -73,8 +73,8 @@
 | Deployment Cost                                                           | Deployment Size |       |        |       |         |
 | 0                                                                         | 0               |       |        |       |         |
 | Function Name                                                             | min             | avg   | median | max   | # calls |
-| approve                                                                   | 46175           | 46198 | 46199  | 46211 | 18425   |
-| balanceOf                                                                 | 561             | 603   | 561    | 2561  | 43385   |
+| approve                                                                   | 46175           | 46198 | 46199  | 46211 | 7761    |
+| balanceOf                                                                 | 561             | 617   | 561    | 2561  | 21747   |
 
 
 | script/Deploy.s.sol:Deploy contract |                 |         |         |         |         |
diff --git a/.gas-snapshot b/.gas-snapshot
index 3b05fd0..359d366 100644
--- a/.gas-snapshot
+++ b/.gas-snapshot
@@ -51,7 +51,7 @@ UnstakeTest:test_UnstakeShouldBurnMultiplierPoints() (gas: 5535329)
 UnstakeTest:test_UnstakeShouldReturnFund_NoLockUp() (gas: 1026305)
 UnstakeTest:test_UnstakeShouldReturnFund_WithLockUp() (gas: 1113953)
 UserFlowsTest:testDeployment() (gas: 28720)
-UserFlowsTest:test_PendingMPToBeMintedCannotBeGreaterThanTotalSupplyMP(uint8) (runs: 1000, μ: 70728281, ~: 30142776)
+UserFlowsTest:test_PendingMPToBeMintedCannotBeGreaterThanTotalSupplyMP(uint8) (runs: 101, μ: 65588077, ~: 26417145)
 UserFlowsTest:test_StakeWithLockUpTimeLocksStake() (gas: 1114841)
 UserFlowsTest:test_StakedSupplyShouldIncreaseAndDecreaseAgain() (gas: 1950367)
 VaultFactoryTest:testDeployment() (gas: 9774)
\ No newline at end of file
diff --git a/foundry.toml b/foundry.toml
index 90bcfa8..ab51352 100644
--- a/foundry.toml
+++ b/foundry.toml
@@ -6,7 +6,7 @@
   bytecode_hash = "none"
   cbor_metadata = false
   evm_version = "paris"
-  fuzz = { runs = 1_000 }
+  fuzz = { runs = 100 }
   gas_reports = ["*"]
   libs = ["lib"]
   optimizer = true
@@ -18,7 +18,7 @@
   test = "test"
 
 [profile.ci]
-  fuzz = { runs = 10_000 }
+  fuzz = { runs = 100 }
   verbosity = 4
 
 [etherscan]