diff --git a/JFMC_CurrentSourceScan.cpp b/JFMC_CurrentSourceScan.cpp
index b77a3c6..02dd576 100644
--- a/JFMC_CurrentSourceScan.cpp
+++ b/JFMC_CurrentSourceScan.cpp
@@ -173,7 +173,7 @@ int main(int argc, char* argv[]) {
   pedeRMSG0->GetYaxis()->SetTitleOffset(0.7);
   if (module_str == "006") {
     pedeRMSG0->GetZaxis()->SetRangeUser(0,50);
-  } else if (module_str == "008" || module_str == "021" || module_str == "022" || module_str == "032" || module_str == "040" || module_str == "044" || module_str == "045" || module_str == "065" || module_str == "069" || module_str == "079") {
+  } else {
     pedeRMSG0->GetZaxis()->SetRangeUser(0,25);
   }
   pedeRMSG0->Draw("colz");
@@ -185,7 +185,7 @@ int main(int argc, char* argv[]) {
   pedeRMSG1->GetYaxis()->SetTitleOffset(0.7);
   if (module_str == "006") {
     pedeRMSG1->GetZaxis()->SetRangeUser(0,400);
-  } else if (module_str == "008" || module_str == "021" || module_str == "022" || module_str == "032" || module_str == "040" || module_str == "044" || module_str == "045" || module_str == "065" || module_str == "069" || module_str == "079") {
+  } else {
     pedeRMSG1->GetZaxis()->SetRangeUser(0,15);
   }
   pedeRMSG1->Draw("colz");
@@ -197,7 +197,7 @@ int main(int argc, char* argv[]) {
   pedeRMSG2->GetYaxis()->SetTitleOffset(0.7);
   if (module_str == "006") {
     pedeRMSG2->GetZaxis()->SetRangeUser(0,400);
-  } else if (module_str == "008" || module_str == "021" || module_str == "022" || module_str == "032" || module_str == "040" || module_str == "044" || module_str == "045" || module_str == "065" || module_str == "069" || module_str == "079") {
+  } else {
     pedeRMSG2->GetZaxis()->SetRangeUser(0,15);
   }
   pedeRMSG2->Draw("colz");
@@ -262,7 +262,7 @@ int main(int argc, char* argv[]) {
       nfiles = 2;
     } else if (module_str == "008" || module_str == "040" || module_str == "044") {
       nfiles = 3;
-    } else if (module_str == "006" || module_str == "045" || module_str == "022" || module_str == "065" || module_str == "069" || module_str == "079") {
+    } else if (module_str == "006" || module_str == "045" || module_str == "022" || module_str == "065" || module_str == "069" || module_str == "079" || module_str == "068" || module_str == "088") {
       nfiles = 4;
     }
 
@@ -515,7 +515,7 @@ int main(int argc, char* argv[]) {
   TH1F *g1hist = 0;
   if (module_str == "032") {
     g1hist = new TH1F("g1hist","",100,-12000,-4000);
-  } else if (module_str == "022" || module_str == "021" || module_str == "006" || module_str == "008" || module_str == "040" || module_str == "044" || module_str == "045" || module_str == "065" || module_str == "069" || module_str == "079") {
+  } else {
     g1hist = new TH1F("g1hist","",100,-3000,0);
   }
   TH1F *g1erhist = new TH1F("g1erhist","",100,0,50);
@@ -523,7 +523,7 @@ int main(int argc, char* argv[]) {
   TH1F *g2hist = 0;
   if (module_str == "032") {
     g2hist = new TH1F("g2hist","",100,-1000,-200);
-  } else if (module_str == "022" || module_str == "021" || module_str == "006" || module_str == "008" || module_str == "040" || module_str == "044" || module_str == "045" || module_str == "065" || module_str == "069" || module_str == "079") {
+  } else {
     g2hist = new TH1F("g2hist","",100,-300,0);
   }
   TH1F *g2erhist = new TH1F("g2erhist","",100,0,10);
@@ -552,7 +552,7 @@ int main(int argc, char* argv[]) {
     for (int i = 0; i < 17; i++) {
       filter[i+5+9] = 5.+(i*2.5);
     }
-  } else if (module_str == "006" || module_str == "045" || module_str == "022" || module_str == "065" || module_str == "069" || module_str == "079") {
+  } else if (module_str == "006" || module_str == "045" || module_str == "022" || module_str == "065" || module_str == "069" || module_str == "079" || module_str == "068" || module_str == "088") {
     for (int i = 0; i < 9; i++) {
       filter[i] = 0.05+(i*0.05);
     }
@@ -596,7 +596,7 @@ int main(int argc, char* argv[]) {
 	m_max = 27;
       } else if (module_str == "008") {
 	m_max = 35;
-      } else if (module_str == "006" || module_str == "045" || module_str == "022" || module_str == "065" || module_str == "069" || module_str == "079") {
+      } else if (module_str == "006" || module_str == "045" || module_str == "022" || module_str == "065" || module_str == "069" || module_str == "079" || module_str == "068" || module_str == "088") {
 	m_max = 51;
       }
 
@@ -626,7 +626,7 @@ int main(int argc, char* argv[]) {
 	  rangemin2 = 0.75;
 	} else if (module_str == "008" || module_str == "021" || module_str == "040" || module_str == "044") {
 	  rangemin2 = *min_element(r1_filter.begin(),r1_filter.end());
-	} else if (module_str == "006" || module_str == "022" || module_str == "045" || module_str == "065" || module_str == "069" || module_str == "079") {
+	} else if (module_str == "006" || module_str == "022" || module_str == "045" || module_str == "065" || module_str == "069" || module_str == "079" || module_str == "068" || module_str == "088") {
 	  rangemin2 = 2.;
 	}
 	double rangemax2 = *max_element(r1_filter.begin(),r1_filter.end());
@@ -657,7 +657,7 @@ int main(int argc, char* argv[]) {
 	double rangemin3 = 0;
 	if (module_str == "032") {
 	  rangemin3 = 5;
-	} else if (module_str == "006" || module_str == "008" || module_str == "021" || module_str == "022" || module_str == "040" || module_str == "044" || module_str == "045" || module_str == "065" || module_str == "069" || module_str == "079") {
+	} else {
 	  rangemin3 = *min_element(r3_filter.begin(),r3_filter.end());
 	}
 	double rangemax3 = *max_element(r3_filter.begin(),r3_filter.end());
@@ -959,7 +959,7 @@ int main(int argc, char* argv[]) {
   g1map->GetYaxis()->SetTitleOffset(0.7);
   if (module_str == "032") {
     g1map->GetZaxis()->SetRangeUser(-12000,-4000);
-  } else if (module_str == "022" || module_str == "021" || module_str == "006" || module_str == "008" || module_str == "040" || module_str == "044" || module_str == "045" || module_str == "065" || module_str == "069" || module_str == "079") {
+  } else {
     g1map->GetZaxis()->SetRangeUser(-3000,0);
   }
   g1map->Draw("colz");
@@ -973,7 +973,7 @@ int main(int argc, char* argv[]) {
   g2map->GetYaxis()->SetTitleOffset(0.7);
   if (module_str == "032") {
     g2map->GetZaxis()->SetRangeUser(-800,-400);
-  } else if (module_str == "022" || module_str == "021" || module_str == "006" || module_str == "008" || module_str == "040" || module_str == "044" || module_str == "045" || module_str == "065" || module_str == "069" || module_str == "079") {
+  } else {
     g2map->GetZaxis()->SetRangeUser(-200,-50);
   }
   g2map->Draw("colz");
diff --git a/run_JFModuleCalib_CuFBDCS.txt b/run_JFModuleCalib_CuFBDCS.txt
index 4d4848a..534d0e2 100644
--- a/run_JFModuleCalib_CuFBDCS.txt
+++ b/run_JFModuleCalib_CuFBDCS.txt
@@ -65,18 +65,30 @@ Module 065 - for SOLEIL
 ./JFMC_CurrentSourceScan 065 /mnt/pcmoench_jungfrau_data1_ib/Module_065_2017-08-29_Calib CurrentSource_scan1
 
 
-Module 069 - in 1M for SLAC
+Module 069 - in 1M for SLAC - not good enough
 ./JFMC_CuFluoPeak 069 /mnt/pcmoench_jungfrau_data1_ib/Module_069_2017-09-18_Calib pedeG0_1630 CuFluo_10us_500Hz
 ./JFMC_CuFluoPeakFit 069
 ./JFMC_CurrentSourceScan 069 /mnt/pcmoench_jungfrau_data1_ib/Module_069_2017-09-18_Calib currentsource_scan1
 
 
-Module 079 - in 1M for SLAC
+Module 079 - in 1M for SLAC - not good enough
 ./JFMC_CuFluoPeak 079 /mnt/pcmoench_jungfrau_data1_ib/Module_079_2017-09-18_Calib pedeG0_1655 CuFluo_10us_500Hz
 ./JFMC_CuFluoPeakFit 079
 ./JFMC_CurrentSourceScan 079 /mnt/pcmoench_jungfrau_data1_ib/Module_079_2017-09-18_Calib currentsource_scan1
 
 
+Module 068 - in the 1M for SLAC
+./JFMC_CuFluoPeak 068 /mnt/pcmoench_jungfrau_data1_ib/Module_068_2017-09-19_Calib pedeG0_1750 CuFluo_10us_500Hz
+./JFMC_CuFluoPeakFit 068
+./JFMC_CurrentSourceScan 068 /mnt/pcmoench_jungfrau_data1_ib/Module_068_2017-09-19_Calib CurrentSource_scan1
+
+
+Module 088 - in the 1M for SLAC
+./JFMC_CuFluoPeak 088 /mnt/pcmoench_jungfrau_data1_ib/Module_088_2017-09-19_Calib pedeG0_1805 CuFluo_10us_500Hz
+./JFMC_CuFluoPeakFit 088
+./JFMC_CurrentSourceScan 088 /mnt/pcmoench_jungfrau_data1_ib/Module_088_2017-09-19_Calib CurrentSource_scan1
+
+
 Module 028
 direct beam scan data only
 ./JFMC_DirectBeamScan 028 /mnt/pcmoench_jungfrau_data/test_module028_direct_beam_scan__01092016 200us_scan_a_pedestal_QS 200us_scan_a_beam_QS