diff --git a/src/propeller/problems/PSB2/find_pair.cljc b/src/propeller/problems/PSB2/find_pair.cljc
index 34fffd5..9dbaacc 100644
--- a/src/propeller/problems/PSB2/find_pair.cljc
+++ b/src/propeller/problems/PSB2/find_pair.cljc
@@ -10,8 +10,9 @@
             [propeller.gp :as gp]
             #?(:cljs [cljs.reader :refer [read-string]])))
 
-(def train-data (dc/read-data-formatted "find-pair" "train"))
-(def test-data (dc/read-data-formatted "find-pair" "test"))
+(def train-and-test-data (psb2/fetch-examples "data" "find-pair" 200 2000))
+(def train-data (:train train-and-test-data))
+(def test-data (:test train-and-test-data))
 
 (defn random-int [] (- (rand-int 201) 100))
 
diff --git a/src/propeller/problems/PSB2/fizz_buzz.cljc b/src/propeller/problems/PSB2/fizz_buzz.cljc
index 773ca24..63521dc 100644
--- a/src/propeller/problems/PSB2/fizz_buzz.cljc
+++ b/src/propeller/problems/PSB2/fizz_buzz.cljc
@@ -20,9 +20,9 @@
 ; Source: https://arxiv.org/pdf/2106.06086.pdf
 ; ============================================================
 
-(def train-data (dc/read-data-formatted "fizz-buzz" "train"))
-(def test-data (dc/read-data-formatted "fizz-buzz" "test"))
-
+(def train-and-test-data (psb2/fetch-examples "data" "fizz-buzz" 200 2000))
+(def train-data (:train train-and-test-data))
+(def test-data (:test train-and-test-data))
 
 (def instructions
   (utils/not-lazy
diff --git a/src/propeller/problems/PSB2/fuel_cost.cljc b/src/propeller/problems/PSB2/fuel_cost.cljc
index 3c9379d..6d0656d 100644
--- a/src/propeller/problems/PSB2/fuel_cost.cljc
+++ b/src/propeller/problems/PSB2/fuel_cost.cljc
@@ -20,8 +20,9 @@
 ; Source: https://arxiv.org/pdf/2106.06086.pdf
 ; ============================================================
 
-(def train-data (dc/read-data-formatted "fuel-cost" "train"))
-(def test-data (dc/read-data-formatted "fuel-cost" "test"))
+(def train-and-test-data (psb2/fetch-examples "data" "fuel-cost" 200 2000))
+(def train-data (:train train-and-test-data))
+(def test-data (:test train-and-test-data))
 
 ; Random integer between -100 and 100 (from smallest)
 (defn random-int [] (- (rand-int 201) 100))
diff --git a/src/propeller/problems/PSB2/gcd.cljc b/src/propeller/problems/PSB2/gcd.cljc
index 9ef7355..ef60fa5 100644
--- a/src/propeller/problems/PSB2/gcd.cljc
+++ b/src/propeller/problems/PSB2/gcd.cljc
@@ -18,10 +18,10 @@
 ; Source: https://arxiv.org/pdf/2106.06086.pdf
 ; ==================================================================
 
-;(def train-and-test-data (psb2/fetch-examples "data" "gcd" 200 2000))
 
-(def train-data (dc/read-data-formatted "gcd" "train"))
-(def test-data (dc/read-data-formatted "gcd" "test"))
+(def train-and-test-data (psb2/fetch-examples "data" "gcd" 200 2000))
+(def train-data (:train train-and-test-data))
+(def test-data (:test train-and-test-data))
 
 (defn random-int [] (- (rand-int 201) 100))