diff --git a/gps.mac b/gps.mac
index e8d141d167f7bf5ad379995210092915aa0ac5a6..2a4c26f4c9e99ddbd61b0a63efec5ece540d9044 100644
--- a/gps.mac
+++ b/gps.mac
@@ -6,14 +6,14 @@
 /gps/number 1
 
 /gps/ene/type Gauss
-/gps/ene/mono  3.5 GeV
+/gps/ene/mono  4.0 GeV
 /gps/ene/sigma 3.0 GeV
 
 /gps/pos/type Volume
 /gps/pos/shape Cylinder
 /gps/pos/centre 0.0 0.0 0.0 cm
 /gps/pos/radius 0.01 cm
-/gps/pos/halfz  0.01 cm
+/gps/pos/halfz  10 cm
 /gps/position 0 0 0 cm
 
 #/gps/direction 0 0.1 1.0 
diff --git a/scripts/tutorial1_hit_position.cxx b/scripts/tutorial1_hit_position.cxx
index 42536af851420d2474dd34b46f312db65834ab11..d44264a1127e989d62f0f0803ef88bcbf0cdede3 100644
--- a/scripts/tutorial1_hit_position.cxx
+++ b/scripts/tutorial1_hit_position.cxx
@@ -99,9 +99,9 @@ void tutorial1_hit_position(const char* fname = "gem_tracker_sim.root") {
                 .Define("x_pos", x_pos, {"xy_hit_pos"})
                 .Define("y_pos", y_pos, {"xy_hit_pos"});
 
-  auto h_local_pos = d1.Histo2D(TH2D("h_local_pos", ";x [cm]; y [cm] ", 100, -5.0, 5.0, 100, -5.0, 5.0), "x_pos", "y_pos");
+  auto h_local_pos = d1.Histo2D({"h_local_pos", ";x [cm]; y [cm] ", 100, -5.0, 5.0, 100, -5.0, 5.0}, "x_pos", "y_pos");
 
   TCanvas* c = new TCanvas();
-  h_local_pos->DrawClone("colz");
+  auto h = h_local_pos->DrawCopy("colz");
   c->SaveAs("results/hit_position.png");
 }
diff --git a/scripts/tutorial2_cell_size.cxx b/scripts/tutorial2_cell_size.cxx
index 4baa5564dc11c6b0eb1b30abdcea0229f7df9488..b1f7a8dd9e1fdb7d143843db940dd120ab93fc42 100644
--- a/scripts/tutorial2_cell_size.cxx
+++ b/scripts/tutorial2_cell_size.cxx
@@ -96,23 +96,23 @@ void tutorial2_cell_size(const char* fname = "gem_tracker_sim.root") {
   };
 
   auto d1 = d0.Define("nhits", nhits, {"GEMTrackerHits"})
-                .Filter([=](const std::vector<dd4pod::TrackerHitData>& hits) {
-                      for (auto h : hits) {
-                        auto pos = ROOT::Math::XYZVector(h.position.x,h.position.y,h.position.z);
-                        if ((pos.r() > 100.0) && (std::abs(pos.phi()-M_PI/2.0)< M_PI/6)) {
-                          return true;
-                        }
-                      }
-                      return false;
-                    },
-                    {"GEMTrackerHits"})
+                //.Filter([=](const std::vector<dd4pod::TrackerHitData>& hits) {
+                //      for (auto h : hits) {
+                //        auto pos = ROOT::Math::XYZVector(h.position.x,h.position.y,h.position.z);
+                //        if ((pos.r() > 100.0) && (std::abs(pos.phi()-M_PI/2.0)< M_PI/6)) {
+                //          return true;
+                //        }
+                //      }
+                //      return false;
+                //    },
+                //    {"GEMTrackerHits"})
                 .Define("xy_hit_pos", local_position, {"GEMTrackerHits"})
                 .Define("x_pos", x_pos, {"xy_hit_pos"})
                 .Define("y_pos", y_pos, {"xy_hit_pos"});
 
-  auto h_local_pos = d1.Histo2D(TH2D("h_local_pos", ";x [cm]; y [cm] ", 100, -5.0, 5.0, 100, -5.0, 5.0), "x_pos", "y_pos");
+  auto h_local_pos = d1.Histo2D({"h_local_pos", " ;x [cm]; y [cm]", 100, -5.0, 5.0, 100, -5.0, 5.0}, "x_pos", "y_pos");
 
   TCanvas* c = new TCanvas();
-  h_local_pos->DrawClone("colz");
+  h_local_pos->DrawCopy("colz");
   c->SaveAs("results/cell_size.png");
 }
diff --git a/scripts/tutorial3_id_spec.cxx b/scripts/tutorial3_id_spec.cxx
index 6c5a4f91a84dc22f5312d66f1c752f22ad84d96a..7723957f3354562fca89748b58d0b0207dbf91e8 100644
--- a/scripts/tutorial3_id_spec.cxx
+++ b/scripts/tutorial3_id_spec.cxx
@@ -128,12 +128,12 @@ void tutorial3_id_spec(const char* fname = "gem_tracker_sim.root") {
                 .Define("y_pos", y_pos, {"xy_hit_pos"})
                 .Define("z_pos", z_pos, {"xy_hit_pos"});
 
-  auto h_local_pos   = d1.Histo2D(TH2D("h_local_pos", ";x [cm]; y [cm] ", 100, -5.0, 5.0, 100, -5.0, 5.0), "x_pos", "y_pos");
-  auto h_z_position0 = d1.Histo1D(TH1D("h_z_position0", ";z [cm]", 55, -110.0, 110.0), "all_z_pos");
-  auto h_z_position  = d1.Histo1D(TH1D("h_z_position", ";z [cm]",   55, -110.0, 110.0), "z_pos");
+  auto h_local_pos   = d1.Histo2D({"h_local_pos", ";x [cm]; y [cm] ", 100, -5.0, 5.0, 100, -5.0, 5.0}, "x_pos", "y_pos");
+  auto h_z_position0 = d1.Histo1D({"h_z_position0", ";z [cm]", 55, -110.0, 110.0}, "all_z_pos");
+  auto h_z_position  = d1.Histo1D({"h_z_position", ";z [cm]",   55, -110.0, 110.0}, "z_pos");
 
   TCanvas* c = new TCanvas();
-  h_local_pos->DrawClone("colz");
+  h_local_pos->DrawCopy("colz");
   c->SaveAs("results/hit_position.png");
 
   h_z_position0->SetLineColor(1);