diff --git a/MQ/mcbm/startMultiStreamBuildDigiFilterEvents2025_t0.sh.in b/MQ/mcbm/startMultiStreamBuildDigiFilterEvents2025_t0.sh.in
index f04a18015bcb7a69871d306b5fcf9d584e05731a..c688ada05aed93100915120af20e35010ac81572 100755
--- a/MQ/mcbm/startMultiStreamBuildDigiFilterEvents2025_t0.sh.in
+++ b/MQ/mcbm/startMultiStreamBuildDigiFilterEvents2025_t0.sh.in
@@ -21,7 +21,8 @@ if [ $# -ge 3 ]; then
   _pubminsec=5.0
   _pubmaxsec=20.0
 
-  if [ $# -ge 6 ]; then
+  #if [ $# -ge 6 ]; then 
+  if [ $# -eq 6 ]; then 
     _filename=""
     _dirname=""
     _FilterLevel=$4
diff --git a/macro/beamtime/mcbm2025/calTof.sh b/macro/beamtime/mcbm2025/calTof.sh
index 96833237bd0d83834cdaa3f309ad4823261f4565..9fb299b07bc9a894f5198867b0dfdd385ca35dd3 100755
--- a/macro/beamtime/mcbm2025/calTof.sh
+++ b/macro/beamtime/mcbm2025/calTof.sh
@@ -117,8 +117,8 @@ rm ${UpdateLog}
 ChildJobName=cal$SJI
 
 #QUEUE="-p main -t 480 --mem 8000 -J $ChildJobName " 
-#QUEUE="-p high_mem -t 480 --mem 8000 -J $ChildJobName " 
-QUEUE="-p high_mem -t 1000 -A cbm_online --mem 8000 --reservation=cbm_online -J $ChildJobName " 
+QUEUE="-p high_mem -t 480 --mem 8000 -J $ChildJobName " 
+#QUEUE="-p high_mem -t 1000 -A cbm_online --mem 8000 --reservation=cbm_online -J $ChildJobName " 
 if [ $NTs -le 20 ] && [ $AOpt -ge 100 ]; then 
   QUEUE="-p high_mem -t 300:00 --mem 8000 -J $ChildJobName "
 fi 
diff --git a/macro/beamtime/mcbm2025/mcbm_align.sh b/macro/beamtime/mcbm2025/mcbm_align.sh
index 750ae8dbc8b1aef80a3b3e77b1b4fee2530ce5a9..9bc9ac846d3fcec2e2ee2cf896095719ec512726 100755
--- a/macro/beamtime/mcbm2025/mcbm_align.sh
+++ b/macro/beamtime/mcbm2025/mcbm_align.sh
@@ -65,7 +65,7 @@ if [ $NTs -le 10 ] && [ $ACut -ge 100 ]; then
   QUEUE="-p debug -t 30:00 --mem 16000 " 
 fi  
 
-RESERVATION=" --reservation=cbm_online --account=cbm_online"
+#RESERVATION=" --reservation=cbm_online --account=cbm_online"
 
 iter=0;
 if [ $cRun -lt 2400 ]; then 
diff --git a/macro/beamtime/mcbm2025/mcbm_eval_tof.sh b/macro/beamtime/mcbm2025/mcbm_eval_tof.sh
index 845239d474619b80cd04f6c9c0a90d61141a41d5..db965ed58dce05600abdee1a0efe4f9daa4a760c 100755
--- a/macro/beamtime/mcbm2025/mcbm_eval_tof.sh
+++ b/macro/beamtime/mcbm2025/mcbm_eval_tof.sh
@@ -83,8 +83,8 @@ if [ $NTs -le 10 ] && [ $ACut -ge 100 ]; then
   QUEUE="-p debug -t 30:00 --mem 16000  -J $ChildJobName "
 fi  
 if [ $NTs -gt 200 ]; then 
-  #QUEUE="-p high_mem -t 500:00 --mem 16000  -J $ChildJobName "
-  QUEUE="-p high_mem  -A cbm_online --reservation=cbm_online -t 500:00 --mem 16000  -J $ChildJobName "
+  QUEUE="-p high_mem -t 500:00 --mem 16000  -J $ChildJobName "
+  #QUEUE="-p high_mem  -A cbm_online --reservation=cbm_online -t 500:00 --mem 16000  -J $ChildJobName "
 fi  
 FIdreduced=${FId#*.}  # removes Trigger field
 FilterLevel=${FIdreduced:0:2} 
diff --git a/macro/beamtime/mcbm2025/mcbm_fde_align.C b/macro/beamtime/mcbm2025/mcbm_fde_align.C
index 905e72aac4f996b4b1754347a2e3e17f1a5729b2..a6f9252283bb8da71a4ec9df67fb3fe3330811fe 100644
--- a/macro/beamtime/mcbm2025/mcbm_fde_align.C
+++ b/macro/beamtime/mcbm2025/mcbm_fde_align.C
@@ -169,9 +169,9 @@ Bool_t mcbm_fde_align(UInt_t uRunId               = 2912,
       geoSetupTag = "mcbm_beam_2025_01_31_silver";
       iBeamCounterSm=0;
     }    
-    else if (3570 <= uRunId) {
+    else if (3570 <= uRunId) {  //Au2025
       geoSetupTag = "mcbm_beam_2025_01_31_silver";
-      iBeamCounterSm=0;
+      iBeamCounterSm=1;
     }                            
   }
   TString geoFile    = srcDir + "/macro/mcbm/data/" + geoSetupTag + ".geo.root";
diff --git a/macro/beamtime/mcbm2025/mcbm_fde_cal_tof.C b/macro/beamtime/mcbm2025/mcbm_fde_cal_tof.C
index d3bddc326044cca69a860be7437bceda4137a81f..25831d39975a3743b4872022220fde43cd8d69b0 100644
--- a/macro/beamtime/mcbm2025/mcbm_fde_cal_tof.C
+++ b/macro/beamtime/mcbm2025/mcbm_fde_cal_tof.C
@@ -174,7 +174,7 @@ Bool_t mcbm_fde_cal_tof(UInt_t uRunId  = 2912,
       geoSetupTag = "mcbm_beam_2025_01_31_silver";  // to be updated 
       iBeamCounterSm=0;
     }    
-    else if (3560 <= uRunId) {
+    else if (3560 <= uRunId) { // Au2025
       geoSetupTag = "mcbm_beam_2025_01_31_silver";
       iBeamCounterSm=1;
     }