diff --git a/digi/src/main/java/org/hps/digi/DataOverlayDriver.java b/digi/src/main/java/org/hps/digi/DataOverlayDriver.java
index fc6450aef..733fc7f19 100644
--- a/digi/src/main/java/org/hps/digi/DataOverlayDriver.java
+++ b/digi/src/main/java/org/hps/digi/DataOverlayDriver.java
@@ -62,6 +62,7 @@ public class DataOverlayDriver extends Driver {
 
     private final Queue<String> inputFilePaths = new LinkedList<String>();
     LCIOReader reader = null;
+    private int year = 2019;
 
     /**
      * Collections names to read.
@@ -113,6 +114,10 @@ public void setInputFileList(String inputFileListPath) {
         }
     }
 
+    public void setYear(int year) {
+        this.year = year;
+    }
+
     private EventHeader readNextEvent() throws EndOfDataException {
         EventHeader event = null;
         try {
@@ -241,6 +246,10 @@ protected void startOfData() {
             LOGGER.severe("Failed to read from: " + filePath);
             throw new RuntimeException(e);
         }
+        if (this.year == 2016) {
+            COLLECTION_NAMES = Arrays.asList("EcalReadoutHits", "SVTRawTrackerHits");
+            READOUT_NAMES = Arrays.asList("EcalHits", "TrackerHits");
+        }
     }
 
     private void openNextFile() throws EndOfDataException {
diff --git a/digi/src/main/java/org/hps/digi/EcalDigitizationWithPulserDataMergingReadoutDriver.java b/digi/src/main/java/org/hps/digi/EcalDigitizationWithPulserDataMergingReadoutDriver.java
index 93e679ce6..d0d7a4fdb 100644
--- a/digi/src/main/java/org/hps/digi/EcalDigitizationWithPulserDataMergingReadoutDriver.java
+++ b/digi/src/main/java/org/hps/digi/EcalDigitizationWithPulserDataMergingReadoutDriver.java
@@ -12,6 +12,8 @@
 import org.lcsim.event.RawTrackerHit;
 import org.lcsim.geometry.Detector;
 import org.lcsim.geometry.subdetector.HPSEcal3;
+import org.hps.record.daqconfig.ConfigurationManager;
+import org.hps.record.daqconfig.DAQConfig;
 import org.hps.record.daqconfig2019.ConfigurationManager2019;
 import org.hps.record.daqconfig2019.DAQConfig2019;
 import org.hps.record.daqconfig2019.FADCConfigEcal2019;
@@ -29,28 +31,27 @@ public class EcalDigitizationWithPulserDataMergingReadoutDriver extends Digitiza
     // The DAQ configuration manager for FADC parameters.
     private FADCConfigEcal2019 config = new FADCConfigEcal2019();
     private boolean configStat = false; // Indicates if DAQ configuration is loaded
-    
+
     // The number of nanoseconds in a clock-cycle (sample).
     private static final int nsPerSample = 4;
-    
-    
+
     /** Stores the conditions for this subdetector. */
     private EcalConditions ecalConditions = null;
-    
+
     /** Stores the channel collection for this subdetector. */
     private EcalChannelCollection geoMap = new EcalChannelCollection();
-    
+
     public EcalDigitizationWithPulserDataMergingReadoutDriver() {
         // Set the default values for each subdetector-dependent
         // parameter.
         setGeometryName("Ecal");
-        
+
         setInputHitCollectionName("EcalHits");
         setOutputHitCollectionName("EcalRawHits");
         setTruthRelationsCollectionName("EcalTruthRelations");
         setTriggerPathTruthRelationsCollectionName("TriggerPathTruthRelations");
         setReadoutHitCollectionName("EcalReadoutHits");
-        
+
         setPhotoelectronsPerMeV(EcalUtils.photoelectronsPerMeV);
         setPulseTimeParameter(9.6);
     }
@@ -85,57 +86,86 @@ public void actionPerformed(ActionEvent e) {
                 }
             });
         }
-    }        
-    
-    
+    }
+
+    /**
+     * Sets whether or not the DAQ configuration is applied into the driver
+     * the EvIO data stream or whether to read the configuration from data files.
+     * 
+     * @param state - <code>true</code> indicates that the DAQ configuration is
+     * applied into the readout system, and <code>false</code> that it
+     * is not applied into the readout system.
+     */
+    public void setDaqConfiguration2016AppliedintoReadout(boolean state) {
+        // If the DAQ configuration should be read, attach a listener
+        // to track when it updates.               
+        if (state) {
+            ConfigurationManager.addActionListener(new ActionListener() {
+                @Override
+                public void actionPerformed(ActionEvent e) {
+                    // Get the DAQ configuration.
+                    DAQConfig daq = ConfigurationManager.getInstance();
+
+                    // Load the DAQ settings from the configuration manager.
+                    numSamplesAfter = daq.getFADCConfig().getNSA() / nsPerSample;
+                    numSamplesBefore = daq.getFADCConfig().getNSB() / nsPerSample;
+                    readoutWindow = daq.getFADCConfig().getWindowWidth() / nsPerSample;
+
+                    // Get the FADC configuration.
+                    configStat = true;
+                }
+            });
+        }
+    }
+
     @Override
     public void detectorChanged(Detector detector) {
         // Get a copy of the calorimeter conditions for the detector.
         ecalConditions = DatabaseConditionsManager.getInstance().getEcalConditions();
-        
+
         // Store the calorimeter conditions table for converting between
         // geometric IDs and channel objects.
         geoMap = DatabaseConditionsManager.getInstance().getCachedConditions(EcalChannelCollection.class, "ecal_channels").getCachedData();
-        
+
         // Run the superclass method.
         super.detectorChanged(detector);
     }
-    
+
     @Override
     protected Set<Long> getChannelIDs() {
         return getSubdetector().getNeighborMap().keySet();
     }
-    
+
     @Override
     protected Long getID(RawTrackerHit hit) {
         return hit.getCellID();
     }
-    
+
     @Override
     protected double getGainConditions(long cellID) {
         return findChannel(cellID).getGain().getGain();
     }
-    
+
     @Override
     protected double getNoiseConditions(long channelID) {
         return findChannel(channelID).getCalibration().getNoise();
     }
-    
+
     protected double getPedestalConditions(long cellID) { 
         return findChannel(cellID).getCalibration().getPedestal();
         
     }   
-    
+
     @Override
     protected double getTimeShiftConditions(long cellID) {
         return findChannel(cellID).getTimeShift().getTimeShift();
     }
-    
+
     @Override
     protected int getTimestampFlag() {
         return ReadoutTimestamp.SYSTEM_ECAL;
     }
-    
+
     /**
      * Gets the channel parameters for a given channel ID.
      * @param cellID - The <code>long</code> ID value that represents
diff --git a/steering-files/src/main/resources/org/hps/steering/readout/Overlay.lcsim b/steering-files/src/main/resources/org/hps/steering/readout/Overlay.lcsim
index d4f65276e..8ba3f3540 100644
--- a/steering-files/src/main/resources/org/hps/steering/readout/Overlay.lcsim
+++ b/steering-files/src/main/resources/org/hps/steering/readout/Overlay.lcsim
@@ -8,6 +8,7 @@
         <driver name="OverlayDriver" type="org.hps.digi.DataOverlayDriver">
             <!-- overlay file -->
             <inputFile>${overlayFile}.slcio</inputFile>
+            <!-- <year>2016</year> -->
         </driver>
         <driver name="OutputDriver" type="org.lcsim.util.loop.LCIODriver">
             <!-- output file will contain MC collections from signal and data collections from background -->
diff --git a/steering-files/src/main/resources/org/hps/steering/readout/PhysicsRun2016TrigPairsWithPulserDataMerging.lcsim b/steering-files/src/main/resources/org/hps/steering/readout/PhysicsRun2016TrigPairsWithPulserDataMerging.lcsim
new file mode 100644
index 000000000..7d2d4c48a
--- /dev/null
+++ b/steering-files/src/main/resources/org/hps/steering/readout/PhysicsRun2016TrigPairsWithPulserDataMerging.lcsim
@@ -0,0 +1,269 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+       xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
+    <!-- 
+      @Readout steering file with pairs trigger for 2016 MC.
+      @author <a href="mailto:sgaiser@slac.stanford.edu">Sarah Gaiser</a>
+    -->
+    <execute>
+        <!-- Parameters in the DAQ configuration are applied
+        by the readout system -->
+        <driver name="DAQConfig"/>
+
+        <!-- SLiC Data Input Drivers -->
+        <driver name="EcalHitsInputDriver"/>
+        <driver name="MCParticleInputDriver"/>
+        <driver name="TrackerHitsSVTOutputDriver"/>
+
+        <!-- Pulser Data Input Drivers -->
+        <driver name="EcalRawHitsInputDriver"/>
+        <driver name="RawTrackerHitSensorSetup"/>
+        <driver name="SvtRawHitsInputDriver"/>
+
+        <!-- Calorimeter Readout Simulation Drivers -->
+        <driver name="EcalDigitizationWithPulserDataMergingDriver"/>
+        <driver name="EcalRawConverterDriver"/>
+        <driver name="GTPReadoutDriver"/>
+       
+        <!-- Trigger Simulation -->
+        <driver name="Pair1Trigger"/>
+
+        <driver name="SvtDigitizationWithPulserDataMergingDriver"/>
+
+        <!-- LCIO Output and Data Management Driver -->
+        <driver name="ReadoutManagerDriver"/>
+
+        <driver name="CleanupDriver" />
+    </execute> 
+    
+    <drivers>
+        <!-- The driver handles the DAQ configuration -->
+        <driver name="DAQConfig" type="org.hps.record.daqconfig.DAQConfigDriver">
+            <daqConfigurationAppliedintoReadout>true</daqConfigurationAppliedintoReadout>      
+        </driver>
+
+        <!--
+            Truth handler drivers load truth information from the input SLIC file
+            and pass them off to the readout data manager, where they may be
+            accessed by other readout drivers.
+
+            It is required that these drivers specify the name of the collection
+            that they manage, and be of the appropriate handler type that matches
+            the object type of the collection. They may also, optionally, specify
+            whether the truth collection managed by the driver should be output
+            into the readout file, and if so, over what time range.
+
+            By default, SLIC truth data is not written out. If no output window is
+            specified, and truth is written, the output window will be derived
+            from the readout window and trigger offset parameters of the readout
+            data manager.
+
+            In general, calorimeter truth information (and the related particles
+            data) are best handled by including truth readout in the calorimeter
+            simulation. This will automatically include all calorimeter truth hits
+            and related MC particles in the readout file.
+        -->
+        <driver name="EcalHitsInputDriver" type="org.hps.readout.SimCalorimeterHitReadoutDriver">
+            <collectionName>EcalHits</collectionName>
+
+            <!-- Units of ns. -->
+            <readoutWindowBefore>8.0</readoutWindowBefore>
+            <readoutWindowAfter>32.0</readoutWindowAfter>
+            <persistent>false</persistent>
+        </driver>
+
+        <driver name="MCParticleInputDriver" type="org.hps.readout.MCParticleReadoutDriver">
+            <collectionName>MCParticle</collectionName>
+
+            <!-- Units of ns. -->
+            <readoutWindowBefore>32.0</readoutWindowBefore>
+            <readoutWindowAfter>32.0</readoutWindowAfter>
+            <persistent>false</persistent>
+        </driver>
+
+        <driver name="TrackerHitsSVTOutputDriver" type="org.hps.readout.svt.SVTTrackerHitReadoutDriver">
+            <collectionName>TrackerHits</collectionName>
+
+            <!-- Units of ns. -->
+            <readoutWindowBefore>8.0</readoutWindowBefore>
+            <readoutWindowAfter>32.0</readoutWindowAfter>
+            <persistent>false</persistent>
+        </driver>
+
+        <driver name="EcalRawHitsInputDriver" type="org.hps.digi.RawTrackerHitReadoutDriver">
+            <collectionName>EcalReadoutHits</collectionName>
+
+            <!-- Units of ns. -->
+            <readoutWindowBefore>32.0</readoutWindowBefore>
+            <readoutWindowAfter>32.0</readoutWindowAfter>
+            <persistent>false</persistent>
+        </driver>
+
+        <driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup">
+            <readoutCollections>SVTRawTrackerHits</readoutCollections>
+        </driver>
+
+        <driver name="SvtRawHitsInputDriver" type="org.hps.digi.SvtPulserReadoutDriver">
+            <collectionName>SVTRawTrackerHits</collectionName>            
+            <!-- Units of ns. -->
+            <readoutWindowBefore>32.0</readoutWindowBefore>
+            <readoutWindowAfter>32.0</readoutWindowAfter>
+            <persistent>false</persistent>
+        </driver>
+
+        <!--
+            The calorimeter readout driver handles conversion of SLIC truth
+            hits into voltage pulses and ultimately into ADC counts every 4 ns
+            sample. These samples are then integrated and output as hits which
+            are used internally by the readout simulation in the collection
+            set by variable "outputHitCollectionName".
+
+            When a trigger occurs, the ADC buffer is used to generate readout
+            hits. The exact form these take differs based on the mode that is
+            simulated, but they are always output to the collection defined by
+            variable "readoutHitCollectionName".
+
+            If truth information is enabled, then a set of truth relations are
+            output as well that link each readout hit to all of the truth hits
+            that are associated with it. Additionally, all truth hits as well
+            as the particle (and its parents) that generated that truth hit
+            are written out to ensure that they are available post-readout.
+            The additional truth information is automatically written to the
+            same collection name as the input truth data. If a truth handler
+            driver also outputs data into this collection, the two will merge.
+        -->
+        <driver name="EcalDigitizationWithPulserDataMergingDriver" type="org.hps.digi.EcalDigitizationWithPulserDataMergingReadoutDriver">
+            <!-- LCIO Collection Names -->
+            <inputHitCollectionName>EcalHits</inputHitCollectionName>
+            <inputPulserDataCollectionName>PulserDataEcalReadoutHits</inputPulserDataCollectionName>
+            <outputHitCollectionName>EcalRawHits</outputHitCollectionName>
+            <readoutHitCollectionName>EcalReadoutHits</readoutHitCollectionName>
+            <truthRelationsCollectionName>EcalTruthRelations</truthRelationsCollectionName>
+            <triggerPathTruthRelationsCollectionName>TriggerPathTruthRelations</triggerPathTruthRelationsCollectionName>
+
+            <daqConfiguration2016AppliedintoReadout>true</daqConfiguration2016AppliedintoReadout>   
+
+            <!-- Driver Parameters -->
+            <mode>1</mode>                                  <!-- Allowed values: 1, 3, or 7. -->
+            <addNoise>true</addNoise>
+
+            <!-- 
+                Readout offset is not the same as the old system - it measures
+                amount of samples that are included before the trigger time in
+                the ADC readout window. The old version can be converted by
+                selecting a readout window equal to (readoutLatency - 64).
+            -->
+            <readoutOffset>10</readoutOffset>               <!-- Units of 4 ns clock-cycles. -->
+
+            <!--
+                The digitization driver produces as output a list of ADC values
+                within a specified window, in emulation of Mode-1 data. This
+                removes the truth information that is otherwise present in the
+                original SLiC output. Setting this option to true creates new
+                LCRelation objects that link the ADC list to the truth hits that
+                created it and stores this in readout. For production running,
+                this should generally be off to save space. Truth hits will be
+                included in readout automatically - the truth hit driver above
+                does not need to be persistent.
+            -->
+            <writeTruth>false</writeTruth>
+
+            <!--
+                As above, except that truth relations are persisted for the
+                readout hits that are seen by the clusterer and trigger. This
+                is useful if some analysis needs to be performed at the readout
+                level. Otherwise, this should be left off.
+            -->
+            <writeTriggerPathTruth>false</writeTriggerPathTruth>
+        </driver>
+
+        <!--
+            The raw converter handles the conversion of simulated ADC pulses from
+            the calorimeter readout driver into proper hits that can be used for
+            triggering.
+
+            Note that it allows for these hits to be written to LCIO if desired,
+            though by default they are not persisted. This is generally unneeded,
+            since the clusterer will automatically output the hits which appear in
+            GTP clusters if cluster output is enabled.
+        -->
+        <driver name="EcalRawConverterDriver" type="org.hps.readout.ecal.updated.EcalRawConverterReadoutDriver">
+            <!--
+                Define the LCIO collection names. The input collection should
+                come from the digitization driver.
+            -->
+            <inputCollectionName>EcalRawHits</inputCollectionName>
+            <outputCollectionName>EcalCorrectedHits</outputCollectionName>
+
+            <numberSamplesAfter>25</numberSamplesAfter>     <!-- Units of 4 ns clock-cycles. -->
+            <numberSamplesBefore>5</numberSamplesBefore>    <!-- Units of 4 ns clock-cycles. -->
+            <daqConfiguration2016AppliedintoReadout>true</daqConfiguration2016AppliedintoReadout>
+
+            <!--
+                Outputs all the trigger-level hits within the readout window.
+                This is not generally necessary outside of specialized
+                circumstances. Note that all readout hits associated with GTP
+                clusters will automatically be included if GTP clusters are
+                persisted.
+            -->
+            <persistent>false</persistent>
+        </driver>
+
+        <!--
+            The GTP clusterer creates clusters from converted calorimeter hits
+            for use in the trigger. It take two parametesr: the clustering
+            window, which specifies the number of clock-cycles in which a seed
+            hit candidate must be a spatiotemporal maximum, and seed energy
+            threshold, which specifies how much energy a seed hit candidate
+            must have in order to be used.
+
+            The GTP clusterer is able to be persisted into LCIO. If persisted,
+            it will output all of the clusters in the readout window range
+            (either specified manually as with the truth drivers or using the
+            default readout window and trigger offset of the manager). It will
+            also output all of the hits contained in each cluster into the
+            output file as well.
+        -->
+        <driver name="GTPReadoutDriver" type="org.hps.readout.ecal.updated.GTPClusterReadoutDriver">
+
+            <daqConfiguration2016AppliedintoReadout>true</daqConfiguration2016AppliedintoReadout>             
+            <!-- Units of 4 ns clock-cycles. -->
+            <clusterWindow>4</clusterWindow>
+            <!-- Units of GeV. -->
+            <seedEnergyThreshold>0.100</seedEnergyThreshold>
+
+            <!--
+                Specifies whether GTP clusters should be persisted in the
+                output LCIO data. This should generally be false for production
+                running to save space, but can be useful for some analyses, as
+                the exact trigger-time clusters are not otherwise recoverable
+                after readout.
+            -->
+            <persistent>false</persistent>
+        </driver>
+
+        <driver name="Pair1Trigger" type="org.hps.readout.trigger.PairTriggerReadoutDriver">
+            <inputCollectionName>EcalClustersGTP</inputCollectionName>
+
+            <!-- Units of 2 ns beam bunches. -->
+            <deadTime>15</deadTime>
+
+            <!-- Units of GeV. -->
+            <seedEnergyLow>0.100</seedEnergyLow>
+        </driver>
+
+        <driver name="SvtDigitizationWithPulserDataMergingDriver" type="org.hps.digi.SvtDigitizationWithPulserDataMergingReadoutDriver">
+            <pulserDataCollectionName>PulserDataSVTRawTrackerHits</pulserDataCollectionName>
+            <enablePileupCut>false</enablePileupCut>
+            <useTimingConditions>true</useTimingConditions>
+            <addNoise>true</addNoise>
+        </driver>
+
+        <driver name="ReadoutManagerDriver" type="org.hps.readout.ReadoutDataManager">
+            <readoutWindow>200</readoutWindow>
+            <outputFile>${outputFile}.slcio</outputFile>
+        </driver>
+
+        <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver" />
+    </drivers>
+</lcsim>
diff --git a/steering-files/src/main/resources/org/hps/steering/recon/PhysicsRun2016FullReconMC_KF_TrackClusterMatcher_StripHitKiller.lcsim b/steering-files/src/main/resources/org/hps/steering/recon/PhysicsRun2016FullReconMC_KF_TrackClusterMatcher_StripHitKiller.lcsim
index e7b8bf343..db412e561 100644
--- a/steering-files/src/main/resources/org/hps/steering/recon/PhysicsRun2016FullReconMC_KF_TrackClusterMatcher_StripHitKiller.lcsim
+++ b/steering-files/src/main/resources/org/hps/steering/recon/PhysicsRun2016FullReconMC_KF_TrackClusterMatcher_StripHitKiller.lcsim
@@ -141,6 +141,7 @@
             <beamConV0VerticesColName>BeamspotConstrainedV0Vertices_KF</beamConV0VerticesColName>
             <targetConV0CandidatesColName>TargetConstrainedV0Candidates_KF</targetConV0CandidatesColName>
             <targetConV0VerticesColName>TargetConstrainedV0Vertices_KF</targetConV0VerticesColName>
+	    <finalStateParticlesColName>FinalStateParticles_KF</finalStateParticlesColName>
             <includeUnmatchedTracksInFSP>true</includeUnmatchedTracksInFSP>
             <useInternalVertexXYPositions>false</useInternalVertexXYPositions>
             <beamPositionX>-0.224</beamPositionX>