diff --git a/UserTools/AssignBunchTimingMC/AssignBunchTimingMC.cpp b/UserTools/AssignBunchTimingMC/AssignBunchTimingMC.cpp
index e92b2adb6..673fdbd39 100644
--- a/UserTools/AssignBunchTimingMC/AssignBunchTimingMC.cpp
+++ b/UserTools/AssignBunchTimingMC/AssignBunchTimingMC.cpp
@@ -175,9 +175,9 @@ bool AssignBunchTimingMC::LoadStores()
 
 void AssignBunchTimingMC::BNBtiming()
 {
-    // Determined from GENIE samples (as of Oct 2024)
-    const double tank_time = 67.0;    // Tank neutrino arrival time: 67ns
-    const double world_time = 33.0;   // WORLD neutrino arrival time: 33ns
+    // Determined from GENIE samples (as of Dec 2024)
+    const double tank_time = 33.0;    // Tank neutrino arrival time: 33ns
+    const double world_time = 33.0;   // WORLD neutrino arrival time: 33ns  (As of Dec 2024, World samples have not yet been re-produced fully)
     
     if (ftriggertime == 0) {
         new_nu_time = (fsample == 0) ? (TrueNuIntxVtx_T - tank_time) : (TrueNuIntxVtx_T - world_time);
diff --git a/UserTools/AssignBunchTimingMC/README.md b/UserTools/AssignBunchTimingMC/README.md
index 5ca1644e9..ff1dab79f 100644
--- a/UserTools/AssignBunchTimingMC/README.md
+++ b/UserTools/AssignBunchTimingMC/README.md
@@ -21,11 +21,11 @@ bunchinterval 18.936   # BNB bunch spacings [ns]
 bunchcount 81          # number of BNB bunches per spill
 
 sampletype 0           # Tank (0) or World (1) genie samples you are running over
-prompttriggertime 0    # WCSim prompt trigger settings: (0 = default, t0 = 0 when a particle enters the volume)
+prompttriggertime 1    # WCSim prompt trigger settings: (0 = default, t0 = 0 when a particle enters the volume)
                        #                                (1 = modified, t0 = 0 when the neutrino beam dump begins)
 ```
 
 
 ## Additional information
 
-The "bunchTimes" have a spill structure that starts at ~0 ns and extends to M ns (depending on the bunch spacing and number of bunches). The tool is currently configured to the most recent Genie sample production (tank: 2023, world: early 2024) for both the WCSim tank and world events (both of which have different "beam dump" starting times and prompt trigger times).
+The "bunchTimes" have a spill structure that starts at ~0 ns and extends to M ns (depending on the bunch spacing and number of bunches). The tool is currently configured to the most recent Genie sample production (tank: Dec 2024, world: early 2024) for both the WCSim tank and world events (both of which have different "beam dump" starting times and prompt trigger times).
diff --git a/configfiles/BeamClusterAnalysisMC/AssignBunchTimingMCConfig b/configfiles/BeamClusterAnalysisMC/AssignBunchTimingMCConfig
new file mode 100644
index 000000000..e868945b3
--- /dev/null
+++ b/configfiles/BeamClusterAnalysisMC/AssignBunchTimingMCConfig
@@ -0,0 +1,12 @@
+# AssignBunchTimingMC Config File
+
+verbosity 0
+
+# BNB properties taken from: MicroBooNE https://doi.org/10.1103/PhysRevD.108.052010
+bunchwidth 1.308       # BNB instrinic bunch spread [ns]
+bunchinterval 18.936   # BNB bunch spacings [ns]
+bunchcount 81          # number of BNB bunches per spill
+
+sampletype 0           # Tank (0) or World (1) genie samples you are running over
+prompttriggertime 1    # WCSim prompt trigger settings: (0 = default, t0 = 0 when a particle enters the volume)
+                       #                                (1 = modified, t0 = 0 when the neutrino beam dump begins)
diff --git a/configfiles/BeamClusterAnalysisMC/PhaseIITreeMakerConfig b/configfiles/BeamClusterAnalysisMC/PhaseIITreeMakerConfig
index 6e9d0a0f7..316b98195 100644
--- a/configfiles/BeamClusterAnalysisMC/PhaseIITreeMakerConfig
+++ b/configfiles/BeamClusterAnalysisMC/PhaseIITreeMakerConfig
@@ -1,6 +1,6 @@
 verbose 5
 
-OutputFile MCBeam_Gst_new_Run9000_NoSplitSubTriggers.ntuple.root
+OutputFile MCBeam.ntuple.root
 TankClusterProcessing 1
 MRDClusterProcessing 1
 TriggerProcessing 1
@@ -17,4 +17,5 @@ SimpleReco_fill 0
 Reweight_fill 0
 muonTruthRecoDiff_fill 0
 IsData 0
-HasGenie 0
+HasGenie 1
+HasBNBtimingMC 1
diff --git a/configfiles/BeamClusterAnalysisMC/ToolsConfig b/configfiles/BeamClusterAnalysisMC/ToolsConfig
index 55400ce09..4913dd192 100644
--- a/configfiles/BeamClusterAnalysisMC/ToolsConfig
+++ b/configfiles/BeamClusterAnalysisMC/ToolsConfig
@@ -9,4 +9,5 @@ myFindMrdTracks FindMrdTracks configfiles/BeamClusterAnalysisMC/FindMrdTracksCon
 myClusterFinder ClusterFinder ./configfiles/BeamClusterAnalysisMC/ClusterFinderConfig
 myClusterClassifiers ClusterClassifiers ./configfiles/BeamClusterAnalysisMC/ClusterClassifiersConfig
 myEventSelector EventSelector ./configfiles/BeamClusterAnalysisMC/EventSelectorConfig
+myAssignBunchTimingMC AssignBunchTimingMC ./configfiles/BeamClusterAnalysisMC/AssignBunchTimingMCConfig
 myPhaseIITreeMaker PhaseIITreeMaker ./configfiles/BeamClusterAnalysisMC/PhaseIITreeMakerConfig
diff --git a/configfiles/CC_MC_RECO_ntuple/AssignBunchTimingMCConfig b/configfiles/CC_MC_RECO_ntuple/AssignBunchTimingMCConfig
new file mode 100644
index 000000000..e868945b3
--- /dev/null
+++ b/configfiles/CC_MC_RECO_ntuple/AssignBunchTimingMCConfig
@@ -0,0 +1,12 @@
+# AssignBunchTimingMC Config File
+
+verbosity 0
+
+# BNB properties taken from: MicroBooNE https://doi.org/10.1103/PhysRevD.108.052010
+bunchwidth 1.308       # BNB instrinic bunch spread [ns]
+bunchinterval 18.936   # BNB bunch spacings [ns]
+bunchcount 81          # number of BNB bunches per spill
+
+sampletype 0           # Tank (0) or World (1) genie samples you are running over
+prompttriggertime 1    # WCSim prompt trigger settings: (0 = default, t0 = 0 when a particle enters the volume)
+                       #                                (1 = modified, t0 = 0 when the neutrino beam dump begins)
diff --git a/configfiles/CC_MC_RECO_ntuple/PhaseIITreeMakerConfig b/configfiles/CC_MC_RECO_ntuple/PhaseIITreeMakerConfig
index a6c6c09b1..271e31814 100644
--- a/configfiles/CC_MC_RECO_ntuple/PhaseIITreeMakerConfig
+++ b/configfiles/CC_MC_RECO_ntuple/PhaseIITreeMakerConfig
@@ -15,6 +15,10 @@ SimpleReco_fill 1
 RingCounting_fill 1
 Reweight_fill 1
 MuonFitter_fill 1
+HasBNBtimingMC 1
+TankClusterProcessing 1
+MRDClusterProcessing 1
+TriggerProcessing 1
 
 OutputFile PhaseIITree_0.0.0.root
 #NumEventsWritten 2000
diff --git a/configfiles/CC_MC_RECO_ntuple/ToolsConfig b/configfiles/CC_MC_RECO_ntuple/ToolsConfig
index e0c6ea660..d4e47f5f7 100644
--- a/configfiles/CC_MC_RECO_ntuple/ToolsConfig
+++ b/configfiles/CC_MC_RECO_ntuple/ToolsConfig
@@ -19,5 +19,6 @@ myRingCounting PythonScript configfiles/CC_MC_RECO_ntuple/RingCountingConfig
 #myVtxExtendedVertexFinder VtxExtendedVertexFinder
 #mySimpleReconstruction SimpleReconstruction configfiles/CC_MC_RECO_ntuple/SimpleReconstructionConfig
 myMuonFitter MuonFitter configfiles/CC_MC_RECO_ntuple/MuonFitterConfig
+myAssignBunchTimingMC AssignBunchTimingMC ./configfiles/CC_MC_RECO_ntuple/AssignBunchTimingMCConfig
 myPhaseIITreeMaker PhaseIITreeMaker configfiles/CC_MC_RECO_ntuple/PhaseIITreeMakerConfig