diff --git a/auto/Examples/fit/scatter2d/fit2d.py b/auto/Examples/fit/scatter2d/fit2d.py
index 0b80e27058e1e8ee5181dc60858d4f6bd8b2d771..00a7a3a4e5036df41ad8ac33d9de0e26d6876cd9 100755
--- a/auto/Examples/fit/scatter2d/fit2d.py
+++ b/auto/Examples/fit/scatter2d/fit2d.py
@@ -28,18 +28,19 @@ def get_simulation(P):
     return simulation
 
 
-def data():
+def fake_data():
     """
     Generating "experimental" data by running simulation with default parameters.
     """
     simulation = get_simulation({'radius': 5 * nm})
     result = simulation.simulate()
-    return result.npArray()
+    return result
 
 
 if __name__ == '__main__':
+    data = fake_data()
     fit_objective = ba.FitObjective()
-    fit_objective.addSimulationAndData(get_simulation, data())
+    fit_objective.addFitPair(get_simulation, data)
     fit_objective.initPrint(10)
 
     P = ba.Parameters()
diff --git a/auto/MiniExamples/fit/scatter2d/fit2d.py b/auto/MiniExamples/fit/scatter2d/fit2d.py
index b26f572c95ed6bb9f732dd6b17310676465d8c4f..f937ac35dac9072cb63ee327297b537febbafb07 100755
--- a/auto/MiniExamples/fit/scatter2d/fit2d.py
+++ b/auto/MiniExamples/fit/scatter2d/fit2d.py
@@ -28,18 +28,19 @@ def get_simulation(P):
     return simulation
 
 
-def data():
+def fake_data():
     """
     Generating "experimental" data by running simulation with default parameters.
     """
     simulation = get_simulation({'radius': 5 * nm})
     result = simulation.simulate()
-    return result.npArray()
+    return result
 
 
 if __name__ == '__main__':
+    data = fake_data()
     fit_objective = ba.FitObjective()
-    fit_objective.addSimulationAndData(get_simulation, data())
+    fit_objective.addFitPair(get_simulation, data)
     fit_objective.initPrint(10)
 
     P = ba.Parameters()
diff --git a/rawEx/fit/scatter2d/fit2d.py b/rawEx/fit/scatter2d/fit2d.py
index 000ae01ef7a1409aeecc65cc783e5936e603a953..205bac5e0dc06059744647ca8aa9d25e2a237b61 100755
--- a/rawEx/fit/scatter2d/fit2d.py
+++ b/rawEx/fit/scatter2d/fit2d.py
@@ -28,18 +28,19 @@ def get_simulation(P):
     return simulation
 
 
-def data():
+def fake_data():
     """
     Generating "experimental" data by running simulation with default parameters.
     """
     simulation = get_simulation({'radius': 5 * nm})
     result = simulation.simulate()
-    return result.npArray()
+    return result
 
 
 if __name__ == '__main__':
+    data = fake_data()
     fit_objective = ba.FitObjective()
-    fit_objective.addSimulationAndData(get_simulation, data())
+    fit_objective.addFitPair(get_simulation, data)
     fit_objective.initPrint(10)
 
     P = ba.Parameters()