diff --git a/Control/CalypsoExample/Reconstruction/scripts/faser_reco.py b/Control/CalypsoExample/Reconstruction/scripts/faser_reco.py
index 4daa95ec84edf0369cc6369d2334bb64c8d71885..72235c1f2bb0d6f1167e4b12350ecb5214ecd580 100755
--- a/Control/CalypsoExample/Reconstruction/scripts/faser_reco.py
+++ b/Control/CalypsoExample/Reconstruction/scripts/faser_reco.py
@@ -101,7 +101,11 @@ else:
 ConfigFlags.Input.ProjectName = "data20"
 ConfigFlags.GeoModel.Align.Dynamic    = False
 
+# Flags for later
 useCKF = True
+useCal = False
+useLHC = False
+
 # Enable ACTS material corrections, this crashes testbeam geometries
 ConfigFlags.TrackingGeometry.MaterialSource = "/cvmfs/faser.cern.ch/repo/sw/database/DBRelease/current/acts/material-maps.json"
 
@@ -115,6 +119,7 @@ elif runtype == "TestBeamData" or runtype == "TestBeamMC":
     ConfigFlags.GeoModel.FaserVersion = "FASER-TB00" 
     ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-TB00"
     useCKF = False
+    useCal = True
 
 # New TI12 geometry (ugh)
 elif runtype == "TI12Data02":
@@ -127,6 +132,8 @@ elif runtype == "TI12Data03":
     # ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-02"
     # Use the updated field map
     ConfigFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03"
+    useCal = True
+    useLHC = True
 
 else:
     print("Invalid run type found:", runtype)
@@ -178,8 +185,9 @@ else:
 from FaserGeoModel.FaserGeoModelConfig import FaserGeometryCfg
 acc.merge(FaserGeometryCfg(ConfigFlags))
 
-from LHCDataAlgs.LHCDataAlgConfig import LHCDataAlgCfg
-acc.merge(LHCDataAlgCfg(ConfigFlags))
+if useLHC:
+    from LHCDataAlgs.LHCDataAlgConfig import LHCDataAlgCfg
+    acc.merge(LHCDataAlgCfg(ConfigFlags))
 
 # Set up algorithms
 from WaveRecAlgs.WaveRecAlgsConfig import WaveformReconstructionCfg    
@@ -189,7 +197,7 @@ acc.merge(WaveformReconstructionCfg(ConfigFlags))
 if args.isMC:
     # Not ready for MC quite yet
     pass
-else:
+elif useCal:
     from CaloRecAlgs.CaloRecAlgsConfig import CalorimeterReconstructionCfg
     acc.merge(CalorimeterReconstructionCfg(ConfigFlags))
 
@@ -232,8 +240,6 @@ itemList = [ "xAOD::EventInfo#*"
              , "xAOD::EventAuxInfo#*"
              , "xAOD::FaserTriggerData#*"
              , "xAOD::FaserTriggerDataAux#*"
-             , "xAOD::FaserLHCData#*"
-             , "xAOD::FaserLHCDataAux#*"
              , "FaserSiHitCollection#*"  # Strip hits, do we want this?
              , "FaserSCT_RDO_Container#*" 
              , "FaserSCT_SpacePointContainer#*"
@@ -241,6 +247,9 @@ itemList = [ "xAOD::EventInfo#*"
              , "TrackCollection#*"
 ]
 #
+if useLHC:
+    itemList.extend( ["xAOD::FaserLHCData#*", "xAOD::FaserLHCDataAux#*"] )
+
 if args.isMC:
     # Make xAOD versions of truth
     from Reconstruction.xAODTruthCnvAlgConfig import xAODTruthCnvAlgCfg