diff --git a/sbndcode/JobConfigurations/base/prodcosmics_corsika_sbnd.fcl b/sbndcode/JobConfigurations/base/prodcosmics_corsika_sbnd.fcl
index b8c602b20..3fbaf1408 100644
--- a/sbndcode/JobConfigurations/base/prodcosmics_corsika_sbnd.fcl
+++ b/sbndcode/JobConfigurations/base/prodcosmics_corsika_sbnd.fcl
@@ -48,7 +48,7 @@ process_name: CosmicsGen
 services:
 {
 
-  TFileService:         { fileName: "prodcosmics_corsika_sbnd_%p-%tc_hists.root" }
+  TFileService:         { fileName: "hists_prodcosmics_corsika_sbnd_%p-%tc.root" }
                         @table::sbnd_basic_services   # from simulationservices_sbnd.fcl
                         @table::sbnd_random_services  # from simulationservices_sbnd.fcl
                         @table::sbnd_services  # from simulationservices_sbnd.fcl
diff --git a/sbndcode/JobConfigurations/base/prodgenie_bnb_nu_cosmic_sbnd.fcl b/sbndcode/JobConfigurations/base/prodgenie_bnb_nu_cosmic_sbnd.fcl
index 94056b5c3..7932470e4 100644
--- a/sbndcode/JobConfigurations/base/prodgenie_bnb_nu_cosmic_sbnd.fcl
+++ b/sbndcode/JobConfigurations/base/prodgenie_bnb_nu_cosmic_sbnd.fcl
@@ -25,7 +25,7 @@
 process_name: GenieGen
 
 # output files
-services.TFileService.fileName: "prodgenie_bnb_nu_cosmic_sbnd_%p-%tc_hists.root"
+services.TFileService.fileName: "hists_prodgenie_bnb_nu_cosmic_sbnd_%p-%tc.root"
 outputs.out1.fileName: "prodgenie_bnb_nu_cosmic_sbnd_%p-%tc.root"
 
 physics.producers.generator: @local::sbnd_genie_simple
diff --git a/sbndcode/JobConfigurations/base/prodgenie_common_cosmic_sbnd.fcl b/sbndcode/JobConfigurations/base/prodgenie_common_cosmic_sbnd.fcl
index 096771545..f53d36747 100644
--- a/sbndcode/JobConfigurations/base/prodgenie_common_cosmic_sbnd.fcl
+++ b/sbndcode/JobConfigurations/base/prodgenie_common_cosmic_sbnd.fcl
@@ -46,7 +46,7 @@ process_name: GenieGen
 #
 services: {
   
-  TFileService:          { fileName: "prodgenie_common_cosmic_sbnd_%p-%tc_hists.root" }
+  TFileService:          { fileName: "hists_prodgenie_common_cosmic_sbnd_%p-%tc.root" }
   IFDH:                  {} # required by GENIEGen
                          @table::sbnd_basic_services   # from simulationservices_sbnd.fcl
                          @table::sbnd_random_services  # from simulationservices_sbnd.fcl
diff --git a/sbndcode/JobConfigurations/base/prodsingle_common_sbnd.fcl b/sbndcode/JobConfigurations/base/prodsingle_common_sbnd.fcl
index 66e82aec2..3310f6ca2 100644
--- a/sbndcode/JobConfigurations/base/prodsingle_common_sbnd.fcl
+++ b/sbndcode/JobConfigurations/base/prodsingle_common_sbnd.fcl
@@ -31,7 +31,7 @@ services:
 {
                         @table::sbnd_basic_services
                         @table::sbnd_random_services
-  TFileService:         { fileName: "prodeminus_0.1_0.9_sbnd_%p-%tc_hists.root" }
+  TFileService:         { fileName: "hists_prodeminus_0.1_0.9_sbnd_%p-%tc.root" }
   FileCatalogMetadata:  @local::sbnd_file_catalog_mc
 }
 
diff --git a/sbndcode/JobConfigurations/standard/g4/g4_simphotontime_filter.fcl b/sbndcode/JobConfigurations/standard/g4/g4_simphotontime_filter.fcl
index 32d91286b..8dbef235f 100644
--- a/sbndcode/JobConfigurations/standard/g4/g4_simphotontime_filter.fcl
+++ b/sbndcode/JobConfigurations/standard/g4/g4_simphotontime_filter.fcl
@@ -1,16 +1,121 @@
+# File:    g4_simphotontime_filter.fcl
+# Purpose: A geant4 fcl, supposed to run after prodcorsika_proton_intime_filter.fcl, or similar,
+#          for making cosmics in time samples.
+#
+# This runs the new, refactored, LArG4 simulation.
+
+#include "mergesimsources_sbnd.fcl"
+
 #include "standard_g4_sbnd.fcl"
 
-physics.producers.larg4outtime: @local::physics.producers.largeant
-physics.producers.larg4outtime.InputLabels: [ "GenInTimeSorter:outtime" ]
+# Add process to finish the electron drift simulation for the intimes
+physics.producers.simdriftintime: @local::sbnd_simdrift
+
+# Add a geant4 process, that will run only on the outtime cosmics
+physics.producers.loader: { module_type: "PhysListLoader" }
+physics.producers.larg4outtime: @local::sbnd_larg4
+physics.producers.ionandscintouttime: @local::sbnd_ionandscint
+physics.producers.pdfastsimouttime: @local::sbnd_pdfastsim_par
+physics.producers.simdriftouttime: @local::sbnd_simdrift
+
+# Set the appropriate input labels, to run geant4 only on the outtime cosmics
+physics.producers.simdriftintime.SimulationLabel: "ionandscintintime:priorSCE"
+physics.producers.larg4outtime.inputCollections: [ "GenInTimeSorter:outtime" ]
+physics.producers.ionandscintouttime.InputModuleLabels: ["larg4outtime"]
+physics.producers.pdfastsimouttime.SimulationLabel: "ionandscintouttime:priorSCE"
+physics.producers.simdriftouttime.SimulationLabel: "ionandscintouttime:priorSCE"
+
+# Add processes for light simulation outside the active volume (AV) for the intimes
+physics.producers.ionandscintoutintime: @local::sbnd_ionandscint_out
+physics.producers.pdfastsimoutintime: @local::sbnd_pdfastsim_pvs
+physics.producers.ionandscintoutintime.InputModuleLabels: ["larg4intime"]
+physics.producers.pdfastsimoutintime.SimulationLabel: "ionandscintoutintime"
+
+# Add processes for light simulation outside the active volume (AV) for the outtimes
+physics.producers.ionandscintoutouttime: @local::sbnd_ionandscint_out
+physics.producers.pdfastsimoutouttime: @local::sbnd_pdfastsim_pvs
+physics.producers.ionandscintoutouttime.InputModuleLabels: ["larg4outtime"]
+physics.producers.pdfastsimoutouttime.SimulationLabel: "ionandscintoutouttime"
+
+# Add a process that merges the MCParticles
+physics.producers.largeant: @local::sbnd_merge_sim_sources
+physics.producers.largeant.FillMCParticles: true
+physics.producers.largeant.InputSourcesLabels: [ "larg4intime", "larg4outtime"]
+
+# Add a process that merges the SimEnergyDeposits
+physics.producers.ionandscint: @local::sbnd_merge_sim_sources
+physics.producers.ionandscint.FillSimEnergyDeposits: true
+physics.producers.ionandscint.InputSourcesLabels: [ "ionandscintintime", "ionandscintouttime"]
+
+# Add a process that merges the SimChannels
+physics.producers.simdrift: @local::sbnd_merge_sim_sources
+physics.producers.simdrift.FillSimChannels: true
+physics.producers.simdrift.InputSourcesLabels: [ "simdriftintime", "simdriftouttime"]
+
+# Add a process that merges the AuxDetSimChannels TODO
+physics.producers.crtsimch: @local::sbnd_merge_sim_sources
+physics.producers.crtsimch.FillAuxDetSimChannels: true
+physics.producers.crtsimch.InputSourcesLabels: [ "?", "?"]
+
+# Add a process that merges the SimPhotons inside the AV
+physics.producers.pdfastsim: @local::sbnd_merge_sim_sources
+physics.producers.pdfastsim.FillSimPhotons: true
+physics.producers.pdfastsim.InputSourcesLabels: [ "pdfastsimintime", "pdfastsimouttime"]
+
+# Add a process that merges the SimPhotons outside the AV
+physics.producers.pdfastsimout: @local::sbnd_merge_sim_sources
+physics.producers.pdfastsimout.FillSimPhotons: true
+physics.producers.pdfastsimout.InputSourcesLabels: [ "pdfastsimoutintime", "pdfastsimoutouttime"]
+
+# Add all these new modules to the simulate path
+physics.simulate: [ rns
+                  ### Complete intime drift simulation
+                  , simdriftintime
+                  ### Do full Geant4 simulation for the outtimes
+                  , loader
+                  , larg4outtime
+                  , ionandscintouttime
+                  , pdfastsimouttime
+                  , simdriftouttime
+                  ### Simulate the light outside the AV
+                  , ionandscintoutintime
+                  , pdfastsimoutintime
+                  , ionandscintoutouttime
+                  , pdfastsimoutouttime
+                  ### Merge the intime and outtime paths
+                  , largeant
+                  , ionandscint
+                  , simdrift
+                  , pdfastsim
+                  , pdfastsimout
+                  ### Do truth-level reconstruction
+                  , mcreco
+                  ]
 
-physics.producers.largeant: {
-  module_type: "MergeSimSources"
-  InputSourcesLabels: [ "larg4intime","larg4outtime"]
-  TrackIDOffsets: [ 10000000,20000000 ]
-}
+services.ParticleListAction.keepGenTrajectories: ["GenInTimeSorter"]
 
-physics.simulate: [ rns, larg4outtime, largeant, mcreco ]
+# Drop the intime and outtime collections, which have now been
+# been merged into a 'largeant' collection
+outputs.out1.outputCommands: [ "keep *_*_*_*"
+                             # Drop G4
+                             , "drop *_larg4intime_*_*"
+                             , "drop *_larg4outtime_*_*"
+                             # Drop IonAndScint Inside AV
+                             , "drop *_ionandscintintime_*_*"
+                             , "drop *_ionandscintouttime_*_*"
+                             # Drop PDFastSim Inside AV
+                             , "drop *_pdfastsimintime_*_*"
+                             , "drop *_pdfastsimouttime_*_*"
+                             # Drop SimDrift Inside AV
+                             , "drop *_simdriftintime_*_*"
+                             , "drop *_simdriftouttime_*_*"
+                             # Drop IonAndScint Outside AV
+                             , "drop *_ionandscintoutintime_*_*"
+                             , "drop *_ionandscintoutouttime_*_*"
+                             # Drop PDFastSim Ouside AV
+                             , "drop *_pdfastsimoutintime_*_*"
+                             , "drop *_pdfastsimoutouttime_*_*"
+                             ]
 
-outputs.out1.outputCommands: [ "keep *_*_*_*",
-                     "drop *_larg4intime_*_*",
-                     "drop *_larg4outtime_*_*"]
+# Remove unnecesary processes
+physics.producers.ionandscintout: @erase
diff --git a/sbndcode/JobConfigurations/standard/gen/corsika/prodcorsika_proton_intime_filter.fcl b/sbndcode/JobConfigurations/standard/gen/corsika/prodcorsika_proton_intime_filter.fcl
index 610334ba8..f965d2569 100644
--- a/sbndcode/JobConfigurations/standard/gen/corsika/prodcorsika_proton_intime_filter.fcl
+++ b/sbndcode/JobConfigurations/standard/gen/corsika/prodcorsika_proton_intime_filter.fcl
@@ -1,28 +1,66 @@
+# File:    prodcorsika_proton_intime_filter.fcl
+# Purpose: Generates CORSIKA events filtering out events with no cosmics intime
+#
+# This runs the new, refactored, LArG4 simulation.
+#
+# Ported from uBooNE gen-in-time fhicl for use by SBND
+# by Gray Putnam <grayputnam@uchicago.edu>
+
 #include "filtersgenintime_sbnd.fcl"
 #include "filterssimphotonlitetime_sbnd.fcl"
-#include "largeantmodules_sbnd.fcl"
+
+#include "larg4_sbnd.fcl"
+#include "ionandscint_sbnd.fcl"
+#include "PDFastSim_sbnd.fcl"
+#include "simdrift_sbnd.fcl"
 
 #include "prodcorsika_cosmics_proton.fcl"
 
-# Ported from uBooNE gen-in-time fhicl for use by SBND
-# by Gray Putnam <grayputnam@uchicago.edu>
 
+# Add the g4 services
 services: {
   @table::services
   @table::sbnd_g4_services
 }
 
-physics.producers.larg4intime: @local::sbnd_largeant
+# Rename generator to corsika
+physics.producers.corsika: @local::physics.producers.generator
+
+# Add a generation filter, that splits in intime and outtime cosmics
 physics.filters.GenInTimeSorter: @local::sbnd_filtergenintime
+
+# Add a geant4 process, only on the intime cosmics
+physics.producers.loader: { module_type: "PhysListLoader" }
+physics.producers.larg4intime: @local::sbnd_larg4
+physics.producers.ionandscintintime: @local::sbnd_ionandscint
+physics.producers.pdfastsimintime: @local::sbnd_pdfastsim_par
+
+# Add a filter on the geant4 intime output, based on sim photons
 physics.filters.timefilter: @local::sbnd_timefilterssimphotonlitetime
 
-physics.producers.corsika: @local::physics.producers.generator
+# Add all these new modules to the simulate path
+physics.simulate: [ corsika
+                  , GenInTimeSorter
+                  , loader
+                  , larg4intime
+                  , ionandscintintime
+                  , pdfastsimintime
+                  , timefilter
+                  , rns
+                  ]
+
+# Remove unnecesary processes
+physics.producers.generator: @erase
+
+# Set the appropriate input labels
+physics.producers.larg4intime.inputCollections: ["GenInTimeSorter:intime"]
+physics.producers.ionandscintintime.InputModuleLabels: ["larg4intime"]
+physics.producers.pdfastsimintime.SimulationLabel: "ionandscintintime:priorSCE"
+physics.filters.timefilter.SimPhotonsLiteCollectionLabel: "pdfastsimintime"
+
+services.ParticleListAction.keepGenTrajectories: ["GenInTimeSorter"]
 
-physics.simulate: [ corsika, GenInTimeSorter, larg4intime, timefilter, rns ]
 outputs.out1.SelectEvents: [ "simulate" ]
 
-physics.producers.larg4intime.KeepParticlesInVolumes: ["volCryostat", "volTaggerTopHigh", "volTaggerTopLow", "volTaggerSideLeft", "volTaggerSideRight", "volTaggerFaceFront", "volTaggerFaceBack", "volTaggerBot"]
-physics.producers.larg4intime.InputLabels: [ "GenInTimeSorter:intime" ]
-#physics.producers.larg4intime.SparsifyTrajectory: "true"
+process_name: CosmicsCorsikaProtonGenAndG4InTime
 
-process_name: CosmicsCorsikaCMCGenAndG4InTime
diff --git a/sbndcode/LArG4/mergesimsources_sbnd.fcl b/sbndcode/LArG4/mergesimsources_sbnd.fcl
new file mode 100644
index 000000000..f9a425bf6
--- /dev/null
+++ b/sbndcode/LArG4/mergesimsources_sbnd.fcl
@@ -0,0 +1,17 @@
+
+BEGIN_PROLOG
+
+sbnd_merge_sim_sources : {
+  module_type: "MergeSimSources"
+  FillMCParticles:             false
+  FillSimPhotons:              false
+  FillSimChannels:             false
+  FillAuxDetSimChannels:       false
+  FillSimEnergyDeposits:       false
+  InputSourcesLabels:          [ "larg4intime", "larg4outtime"]
+  TrackIDOffsets:              [ 10000000, 20000000 ]
+  StoreReflected:              true
+  EnergyDepositInstanceLabels: [ "priorSCE" ]
+}
+
+END_PROLOG