diff --git a/Project.toml b/Project.toml
index 09eb14a..afdb295 100644
--- a/Project.toml
+++ b/Project.toml
@@ -4,6 +4,7 @@ authors = ["Aldo Glielmo <aldo.glielmo@bancaditalia.it>", "Mitja Devetak <m888it
 version = "0.2.0"
 
 [deps]
+ChunkSplitters = "ae650224-84b6-46f8-82ea-d812ca08434e"
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
 Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
 DynamicSampling = "2083aeaf-6258-5d07-89fc-32cf5060c837"
@@ -20,6 +21,7 @@ StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
 StatsPlots = "f3b207a7-027a-5e70-b257-86293d7955fd"
 
 [compat]
+ChunkSplitters = "3"
 Dates = "1"
 Distributions = "0.25"
 DynamicSampling = "0.4"
diff --git a/src/BeforeIT.jl b/src/BeforeIT.jl
index 77420b4..4fadf55 100644
--- a/src/BeforeIT.jl
+++ b/src/BeforeIT.jl
@@ -2,6 +2,7 @@ module BeforeIT
 
 import Base: length
 
+using ChunkSplitters
 using DynamicSampling
 using LazyArrays
 using LinearAlgebra
diff --git a/src/markets/search_and_matching.jl b/src/markets/search_and_matching.jl
index f5c14c4..7dc63a0 100644
--- a/src/markets/search_and_matching.jl
+++ b/src/markets/search_and_matching.jl
@@ -106,10 +106,11 @@ function search_and_matching!(model, multi_threading = false)
         )
     end
 
-
     if multi_threading
-        Threads.@threads :static for g in 1:G
-            loopBody(Threads.threadid(), g)
+        Threads.@threads for (i, gs) in enumerate(chunks(shuffle(1:G); n=Threads.nthreads()))
+            for g in gs
+                loopBody(i, g)
+            end
         end
     else
         for g in 1:G