diff --git a/Detector/DetCRD/scripts/CRD-Sim.py b/Detector/DetCRD/scripts/CRD-Sim.py
index 74b42d55f8b891f18192573800e9ddcf81165a06..a4ad74c40c73b4b30ba43e51560e7d755a9b6d77 100644
--- a/Detector/DetCRD/scripts/CRD-Sim.py
+++ b/Detector/DetCRD/scripts/CRD-Sim.py
@@ -5,10 +5,15 @@ from Configurables import k4DataSvc
 dsvc = k4DataSvc("EventDataSvc")
 
 from Configurables import RndmGenSvc, HepRndm__Engine_CLHEP__RanluxEngine_
+
+seed = [10]
 # rndmengine = HepRndm__Engine_CLHEP__RanluxEngine_() # The default engine in Gaudi
-rndmengine = HepRndm__Engine_CLHEP__HepJamesRandom_() # The default engine in Geant4
+rndmengine = HepRndm__Engine_CLHEP__HepJamesRandom_("RndmGenSvc.Engine") # The default engine in Geant4
 rndmengine.SetSingleton = True
-rndmengine.Seeds = [10]
+rndmengine.Seeds = seed
+
+rndmgensvc = RndmGenSvc("RndmGenSvc")
+rndmgensvc.Engine = rndmengine.name()
 
 #geometry_option = "CRD_o1_v01/CRD_o1_v01.xml"
 geometry_option = "CRD_o1_v02/CRD_o1_v02.xml"
@@ -72,6 +77,7 @@ detsimsvc = DetSimSvc("DetSimSvc")
 
 from Configurables import DetSimAlg
 detsimalg = DetSimAlg("DetSimAlg")
+detsimalg.RandomSeeds = seed
 # detsimalg.VisMacs = ["vis.mac"]
 detsimalg.RunCmds = [
 #    "/tracking/verbose 1",
@@ -95,6 +101,6 @@ ApplicationMgr(
     TopAlg = [genalg, detsimalg, out],
     EvtSel = 'NONE',
     EvtMax = 100,
-    ExtSvc = [rndmengine, dsvc, geosvc],
+    ExtSvc = [rndmengine, rndmgensvc, dsvc, geosvc],
     OutputLevel=INFO
 )
diff --git a/Detector/DetCRD/scripts/CRD_o1_v01-SimRec.py b/Detector/DetCRD/scripts/CRD_o1_v01-SimRec.py
index 4c8c1f7e3e696eb516d66f0d7ff89f889cf75c6b..6c265a31583d0cb767573f1272f4730c936a41da 100644
--- a/Detector/DetCRD/scripts/CRD_o1_v01-SimRec.py
+++ b/Detector/DetCRD/scripts/CRD_o1_v01-SimRec.py
@@ -5,10 +5,14 @@ from Configurables import k4DataSvc
 dsvc = k4DataSvc("EventDataSvc")
 
 from Configurables import RndmGenSvc, HepRndm__Engine_CLHEP__RanluxEngine_
+seed = [10]
 # rndmengine = HepRndm__Engine_CLHEP__RanluxEngine_() # The default engine in Gaudi
-rndmengine = HepRndm__Engine_CLHEP__HepJamesRandom_() # The default engine in Geant4
+rndmengine = HepRndm__Engine_CLHEP__HepJamesRandom_("RndmGenSvc.Engine") # The default engine in Geant4
 rndmengine.SetSingleton = True
-rndmengine.Seeds = [10]
+rndmengine.Seeds = seed
+
+rndmgensvc = RndmGenSvc("RndmGenSvc")
+rndmgensvc.Engine = rndmengine.name()
 
 geometry_option = "CRD_o1_v01/CRD_o1_v01.xml"
 
@@ -38,8 +42,8 @@ gun = GtGunTool("GtGunTool")
 gun.Particles = ["mu-"]
 gun.EnergyMins = [100.] # GeV
 gun.EnergyMaxs = [100.] # GeV
-gun.ThetaMins  = [0]    # deg
-gun.ThetaMaxs  = [180]  # deg
+gun.ThetaMins  = [80]    # deg
+gun.ThetaMaxs  = [85]  # deg
 gun.PhiMins    = [0]    # deg
 gun.PhiMaxs    = [360]  # deg
 # stdheprdr = StdHepRdr("StdHepRdr")
@@ -66,6 +70,7 @@ detsimsvc = DetSimSvc("DetSimSvc")
 
 from Configurables import DetSimAlg
 detsimalg = DetSimAlg("DetSimAlg")
+detsimalg.RandomSeeds = seed
 # detsimalg.VisMacs = ["vis.mac"]
 detsimalg.RunCmds = [
 #    "/tracking/verbose 1",
@@ -93,7 +98,7 @@ tpchitname  = "TPCTrackerHits"
 sethitname  = "SETTrackerHits"
 setspname   = "SETSpacePoints"
 ftdspname   = "FTDSpacePoints"
-ftdhitname = "FTDTrackerHits"
+ftdhitname  = "FTDTrackerHits"
 from Configurables import PlanarDigiAlg
 digiVXD = PlanarDigiAlg("VXDDigi")
 digiVXD.SimTrackHitCollection = "VXDCollection"
@@ -204,6 +209,8 @@ full.FTDRawHits     = ftdhitname
 full.TPCTracks = "NULL" # add standalone TPC or DC track here
 full.SiTracks  = "SubsetTracks"
 full.OutputTracks  = "MarlinTrkTracks"
+full.SITHitToTrackDistance = 3.
+full.SETHitToTrackDistance = 5.
 #full.OutputLevel = DEBUG
 
 #TODO: more reconstruction, PFA etc. 
@@ -220,7 +227,7 @@ ApplicationMgr(
     TopAlg = [genalg, detsimalg, digiVXD, digiSIT, digiSET, digiFTD, spSIT, spSET, spFTD, tracking, forward, subset, full, out],
     EvtSel = 'NONE',
     EvtMax = 10,
-    ExtSvc = [rndmengine, dsvc, evtseeder, geosvc, gearsvc, tracksystemsvc],
+    ExtSvc = [rndmengine, rndmgensvc, dsvc, evtseeder, geosvc, gearsvc, tracksystemsvc],
     HistogramPersistency = 'ROOT',
     OutputLevel = INFO
 )
diff --git a/Detector/DetCRD/scripts/CRD_o1_v02-SimRec.py b/Detector/DetCRD/scripts/CRD_o1_v02-SimRec.py
index 972532ec9076676ec9bd50d60af17f6970c4b9b4..ad3425d008785395453751ae1b016ac21d2b7064 100644
--- a/Detector/DetCRD/scripts/CRD_o1_v02-SimRec.py
+++ b/Detector/DetCRD/scripts/CRD_o1_v02-SimRec.py
@@ -5,10 +5,14 @@ from Configurables import k4DataSvc
 dsvc = k4DataSvc("EventDataSvc")
 
 from Configurables import RndmGenSvc, HepRndm__Engine_CLHEP__RanluxEngine_
+seed = [10]
 # rndmengine = HepRndm__Engine_CLHEP__RanluxEngine_() # The default engine in Gaudi
-rndmengine = HepRndm__Engine_CLHEP__HepJamesRandom_() # The default engine in Geant4
+rndmengine = HepRndm__Engine_CLHEP__HepJamesRandom_("RndmGenSvc.Engine") # The default engine in Geant4
 rndmengine.SetSingleton = True
-rndmengine.Seeds = [10]
+rndmengine.Seeds = seed
+
+rndmgensvc = RndmGenSvc("RndmGenSvc")
+rndmgensvc.Engine = rndmengine.name()
 
 geometry_option = "CRD_o1_v02/CRD_o1_v02.xml"
 
@@ -66,6 +70,7 @@ detsimsvc = DetSimSvc("DetSimSvc")
 
 from Configurables import DetSimAlg
 detsimalg = DetSimAlg("DetSimAlg")
+detsimalg.RandomSeeds = seed
 # detsimalg.VisMacs = ["vis.mac"]
 detsimalg.RunCmds = [
 #    "/tracking/verbose 1",
@@ -200,7 +205,8 @@ full.FTDRawHits     = ftdhitname
 full.TPCTracks = "NULL" # add standalone TPC or DC track here
 full.SiTracks  = "SubsetTracks"
 full.OutputTracks  = "MarlinTrkTracks"
-full.OutputLevel = DEBUG
+full.SETHitToTrackDistance = 5.
+#full.OutputLevel = DEBUG
 
 #TODO: more reconstruction, PFA etc.
 
@@ -216,7 +222,7 @@ ApplicationMgr(
     TopAlg = [genalg, detsimalg, digiVXD, digiSIT, digiSET, digiFTD, spSET, spFTD, tracking, forward, subset, full, out],
     EvtSel = 'NONE',
     EvtMax = 10,
-    ExtSvc = [rndmengine, dsvc, evtseeder, geosvc, gearsvc, tracksystemsvc],
+    ExtSvc = [rndmengine, rndmgensvc, dsvc, evtseeder, geosvc, gearsvc, tracksystemsvc],
     HistogramPersistency = 'ROOT',
     OutputLevel = INFO
 )