diff --git a/Analysis/src/WFAnalysis.cpp b/Analysis/src/WFAnalysis.cpp
index 6af46304b4f784cca014b33df01997740fc4a8c9..7f67d9bf560575b91d01bbf992d4afa5a43c3687 100755
--- a/Analysis/src/WFAnalysis.cpp
+++ b/Analysis/src/WFAnalysis.cpp
@@ -329,7 +329,7 @@ double WFAnalysis::GetRMS( Channel* Ch ){
 
     hDiffHisto->Reset();
     hDiffHisto->ResetStats();
-    hDiffHisto->SetBins( (xmax - xmin)/12, xmin, xmax);
+    hDiffHisto->SetBins( (xmax - xmin)/36, xmin/3, xmax/3);
 
     //Loop over the histogram excluding the window used for differentiating to fill hRMS
     Int_t nbins = Ch->FirstDerivative->GetNbinsX();
diff --git a/Analysis/userFunctions/AnalysisExample2021.cpp b/Analysis/userFunctions/AnalysisExample2021.cpp
index a7e396d9bcd61d394d39a1df0c31f23d6a16ea79..2bdeb0c804db7a20f7678524bb1bcc8b2313cdb6 100755
--- a/Analysis/userFunctions/AnalysisExample2021.cpp
+++ b/Analysis/userFunctions/AnalysisExample2021.cpp
@@ -146,19 +146,19 @@ int main(int argc, char *argv[]){
 
     //ATLAS ZDC
     ZDC *zdc1 = new ZDC(1);
-    zdc1->SetWFAthresholds( 5, 30 );
+    zdc1->SetWFAthresholds( 5, 20 );
     zdc1->SetMedianFilter( 4 );
     r->AddDetector( zdc1 );
 
     //ATLAS ZDC
     ZDC *zdc2 = new ZDC(2);
-    zdc2->SetWFAthresholds( 5, 30 );
+    zdc2->SetWFAthresholds( 5, 20 );
     zdc2->SetMedianFilter( 4 );
     r->AddDetector( zdc2 );
 
     //ATLAS ZDC
     ZDC *zdc3 = new ZDC(3);
-    zdc3->SetWFAthresholds( 5, 30 );
+    zdc3->SetWFAthresholds( 5, 20 );
     zdc3->SetMedianFilter( 4 );
     r->AddDetector( zdc3 );