diff --git a/Examples/python/fitting/ex01_SampleParametersIntro/SampleParametersIntro_v2.py b/Examples/python/fitting/ex01_SampleParametersIntro/SampleParametersIntro_v2.py
index c57bbf4bd0ff37e2b2cfd5d52d5d2ce50fa02d3e..502027f4c130f78b6bbc5c6d57d01a21392842a9 100644
--- a/Examples/python/fitting/ex01_SampleParametersIntro/SampleParametersIntro_v2.py
+++ b/Examples/python/fitting/ex01_SampleParametersIntro/SampleParametersIntro_v2.py
@@ -2,7 +2,7 @@
 Working with sample parameters.
 
 Variation of SampleParameterIntro.py with the difference that parameter change
-is going via assembled simulation object.
+is going via top level simulation object.
 """
 
 from __future__ import print_function
diff --git a/Examples/python/fitting/ex02_FitBasics/FitCylindersInSquareLattice.py b/Examples/python/fitting/ex02_FitBasics/FitCylindersInSquareLattice.py
index 1a8de0f8c768bd90fd3780d83f067e4be85c778b..570273d99908568d5b60f4595e8cd3095dd54d34 100644
--- a/Examples/python/fitting/ex02_FitBasics/FitCylindersInSquareLattice.py
+++ b/Examples/python/fitting/ex02_FitBasics/FitCylindersInSquareLattice.py
@@ -60,6 +60,7 @@ def get_simulation():
     simulation.setDetectorParameters(100, -1.0*deg, 1.0*deg,
                                      100, 0.0*deg, 2.0*deg)
     simulation.setBeamParameters(1.0*angstrom, 0.2*deg, 0.0*deg)
+    simulation.setBeamIntensity(1e+08)
     return simulation
 
 
diff --git a/Examples/python/fitting/ex02_FitBasics/FitCylindersPrisms.py b/Examples/python/fitting/ex02_FitBasics/FitCylindersPrisms.py
index d94f85512bd5a835dabd86ba9b074baeff968347..4977ae6cea5112fa77fc8d34ddc26d6e5f3c2a10 100644
--- a/Examples/python/fitting/ex02_FitBasics/FitCylindersPrisms.py
+++ b/Examples/python/fitting/ex02_FitBasics/FitCylindersPrisms.py
@@ -5,7 +5,8 @@ import bornagain as ba
 from bornagain import deg, angstrom, nm
 
 
-def get_sample():
+def get_sample(cylinder_height=5.0*nm, cylinder_radius=5.0*nm,
+               prism_length=5.0*nm, prism_height=5.0*nm):
     """
     Returns a sample with uncorrelated cylinders and prisms on a substrate.
     """
@@ -15,9 +16,9 @@ def get_sample():
     m_particle = ba.HomogeneousMaterial("Particle", 6e-4, 2e-8)
 
     # collection of particles
-    cylinder_ff = ba.FormFactorCylinder(1.0*nm, 1.0*nm)
+    cylinder_ff = ba.FormFactorCylinder(cylinder_radius, cylinder_height)
     cylinder = ba.Particle(m_particle, cylinder_ff)
-    prism_ff = ba.FormFactorPrism3(1.0*nm, 1.0*nm)
+    prism_ff = ba.FormFactorPrism3(prism_length, prism_height)
     prism = ba.Particle(m_particle, prism_ff)
     particle_layout = ba.ParticleLayout()
     particle_layout.addParticle(cylinder, 0.5)
@@ -43,6 +44,7 @@ def get_simulation():
     simulation.setDetectorParameters(100, -1.0*deg, 1.0*deg,
                                      100, 0.0*deg, 2.0*deg)
     simulation.setBeamParameters(1.0*angstrom, 0.2*deg, 0.0*deg)
+    simulation.setBeamIntensity(1e+08)
     return simulation
 
 
diff --git a/Examples/python/fitting/ex02_FitBasics/FitCylindersPrisms_detailed.py b/Examples/python/fitting/ex02_FitBasics/FitCylindersPrisms_detailed.py
index 4a9e0d46322e4169f14db41128480dec670f9e69..2212b5917b85e8218c2fb0b3a4bc7bec55fc2981 100644
--- a/Examples/python/fitting/ex02_FitBasics/FitCylindersPrisms_detailed.py
+++ b/Examples/python/fitting/ex02_FitBasics/FitCylindersPrisms_detailed.py
@@ -69,8 +69,7 @@ def create_real_data():
         real_data.setBinContent(i, noisy_amplitude)
 
     # uncomment line to save generated data on disk
-    #IntensityDataIOFactory.writeIntensityData(
-    #  real_data, 'refdata_fitcylinderprisms.int')
+    #ba.IntensityDataIOFactory.writeIntensityData(real_data, 'refdata_fitcylinderprisms.int.gz')
     return real_data
 
 
@@ -82,6 +81,7 @@ def get_simulation():
     simulation.setDetectorParameters(100, -1.0*deg, 1.0*deg,
                                      100, 0.0*deg, 2.0*deg)
     simulation.setBeamParameters(1.0*angstrom, 0.2*deg, 0.0*deg)
+    simulation.setBeamIntensity(1e+08)
     return simulation
 
 
diff --git a/Examples/python/fitting/ex02_FitBasics/refdata_fitcylinderprisms.int.gz b/Examples/python/fitting/ex02_FitBasics/refdata_fitcylinderprisms.int.gz
index ab2560d5a3081683699980735069a6ef8b6d52a1..2354afde99750a02b4ac4b19bea1237c2683d05f 100644
Binary files a/Examples/python/fitting/ex02_FitBasics/refdata_fitcylinderprisms.int.gz and b/Examples/python/fitting/ex02_FitBasics/refdata_fitcylinderprisms.int.gz differ