diff --git a/Fast/run b/Fast/run
index f17253838806eb626a3d3eb6f4c86434bc5cc6b8..93b82a5efaef6548b6d32b867c0032802811cf2a 100755
--- a/Fast/run
+++ b/Fast/run
@@ -1,6 +1,6 @@
 #!/bin/zsh
 
-nevents=1000
+nevents=200
 id=$1
 
 cd $id
@@ -15,7 +15,10 @@ echo "process.RandomNumberGeneratorService.generator.initialSeed = cms.untracked
 
 cmsRun $py
 
-#cmsDriver.py step2  --conditions auto:run2_mc --scenario pp --fast  --era Run2_2016 -s HARVESTING:validationHarvesting --filetype DQM --mc  -n $nevents  --filein file:step1_inDQM.root --fileout file:step2.root  #> step2_TTbar_13+TTbarFS_13+HARVESTUP15FS+MINIAODMCUP15FS.log  2>&1
+rm -f step1_inDQM.root 
 
-cmsDriver.py step3  --conditions auto:run2_mc --fast  -n $nevents --era Run2_2016 --eventcontent AODSIM,MINIAODSIM --runUnscheduled  --filein file:step1.root -s PAT --datatier AODSIM,MINIAODSIM --mc  --fileout file:step3.root  #> step3_TTbar_13+TTbarFS_13+HARVESTUP15FS+MINIAODMCUP15FS.log  2>&1
+cmsDriver.py step3  --conditions auto:run2_mc --fast  -n $nevents --era Run2_2016 --eventcontent AODSIM,MINIAODSIM --runUnscheduled  --filein file:step1.root -s PAT --datatier AODSIM,MINIAODSIM --mc  --fileout file:step3.root
 
+rm -f NuclearInteractionOutputFile.txt step1.root step3.root
+
+echo "Done $id"
diff --git a/Full/run b/Full/run
index e5cb7b93be3b0de4675d4da7bf65836b59a4d4b1..5096907b43c746c406db37b3c0f3cf8988ebd323 100755
--- a/Full/run
+++ b/Full/run
@@ -1,13 +1,20 @@
 #!/bin/zsh
 
-nevents=1000
+if [[ $# -le 1 ]]
+then
+    echo $0 id
+    exit 1
+fi
+
+nevents=200
 id=$1
 
+mkdir -p $id
 cd $id
 
 cfi=TTbar_13TeV_TuneCUETP8M1_cfi
 
-cmsDriver.py $cfi  --conditions auto:run2_mc -n $nevents --era Run2_2016 --eventcontent FEVTDEBUG --relval 9000,50 -s GEN,SIM --datatier GEN-SIM --beamspot Realistic50ns13TeVCollision --fileout file:step1.root  --no_exec #> step1_TTbar_13+TTbar_13+DIGIUP15+RECOUP15+HARVESTUP15+ALCATTUP15.log  2>&1
+cmsDriver.py $cfi  --conditions auto:run2_mc -n $nevents --era Run2_2016 --eventcontent FEVTDEBUG --relval 9000,50 -s GEN,SIM --datatier GEN-SIM --beamspot Realistic50ns13TeVCollision --fileout file:step1.root  --no_exec
 
 py=${cfi}_GEN_SIM.py
 
@@ -17,6 +24,10 @@ echo "process.RandomNumberGeneratorService.generator.initialSeed = cms.untracked
 
 cmsRun $py
 
-cmsDriver.py step2  --conditions auto:run2_mc -s DIGI:pdigi_valid,L1,DIGI2RAW,HLT:@relval2016 --datatier GEN-SIM-DIGI-RAW-HLTDEBUG -n $nevents --era Run2_2016 --eventcontent FEVTDEBUGHLT --filein  file:step1.root  --fileout file:step2.root #> step2_TTbar_13+TTbar_13+DIGIUP15+RECOUP15+HARVESTUP15+ALCATTUP15.log  2>&1
+cmsDriver.py step2  --conditions auto:run2_mc -s DIGI:pdigi_valid,L1,DIGI2RAW,HLT:@relval2016 --datatier GEN-SIM-DIGI-RAW-HLTDEBUG -n $nevents --era Run2_2016 --eventcontent FEVTDEBUGHLT --filein  file:step1.root  --fileout file:step2.root 
+
+rm step1.root
+
+cmsDriver.py step3  --runUnscheduled  --conditions auto:run2_mc -s RAW2DIGI,L1Reco,RECO,RECOSIM,EI,PAT,VALIDATION:@standardValidation+@miniAODValidation,DQM:@standardDQM+@ExtraHLT+@miniAODDQM --datatier GEN-SIM-RECO,AODSIM,MINIAODSIM,DQMIO -n $nevents --era Run2_2016 --eventcontent RECOSIM,AODSIM,MINIAODSIM,DQM --filein  file:step2.root  --fileout file:step3.root 
 
-cmsDriver.py step3  --runUnscheduled  --conditions auto:run2_mc -s RAW2DIGI,L1Reco,RECO,RECOSIM,EI,PAT,VALIDATION:@standardValidation+@miniAODValidation,DQM:@standardDQM+@ExtraHLT+@miniAODDQM --datatier GEN-SIM-RECO,AODSIM,MINIAODSIM,DQMIO -n $nevents --era Run2_2016 --eventcontent RECOSIM,AODSIM,MINIAODSIM,DQM --filein  file:step2.root  --fileout file:step3.root  #> step3_TTbar_13+TTbar_13+DIGIUP15+RECOUP15+HARVESTUP15+ALCATTUP15.log  2>&1
+rm -f step2.root step3.root step3_inAODSIM.root step3_inDQM.root