diff --git a/Simulation/Digitization/python/DigitizationConfigFlags.py b/Simulation/Digitization/python/DigitizationConfigFlags.py
index 8c37d85be85293a14a35850404d760ccd7737010..0a9b688717fc01c31fce3f8f50bd61d516546201 100644
--- a/Simulation/Digitization/python/DigitizationConfigFlags.py
+++ b/Simulation/Digitization/python/DigitizationConfigFlags.py
@@ -75,13 +75,13 @@ def createDigitizationCfgFlags():
     # Run Calorimeter noise simulation
     flags.addFlag("Digitization.DoCaloNoise", True)
     # Compute and store DigiTruth information
-    flags.addFlag("Digitization.DoDigiTruth", True)
+    flags.addFlag("Digitization.DoDigiTruth", False)
     # Use high-gain Forward Calorimeters
     flags.addFlag("Digitization.HighGainFCal", False)
     # Use high-gain ElectroMagnetic EndCap Inner Wheel
     flags.addFlag("Digitization.HighGainEMECIW", True)
     # Do global pileup digitization
-    flags.addFlag("Digitization.Pileup", True)
+    flags.addFlag("Digitization.Pileup", False)
     # TRT Range cut used in simulation in mm. Should be 0.05 or 30.
     flags.addFlag("Digitization.TRTRangeCut", lambda prevFlags : float(GetFileMD(prevFlags.Input.Files).get('TRTRangeCut', 0.05)))
     # Write out truth information?
diff --git a/TileCalorimeter/TileSimAlgs/python/TileHitVecToCntConfig.py b/TileCalorimeter/TileSimAlgs/python/TileHitVecToCntConfig.py
index 6997178703148bc9fc04d83b753cdaffd88c71b2..7421ac72c6e2c7d1c0a526ed4820a1736042c665 100644
--- a/TileCalorimeter/TileSimAlgs/python/TileHitVecToCntConfig.py
+++ b/TileCalorimeter/TileSimAlgs/python/TileHitVecToCntConfig.py
@@ -6,6 +6,7 @@ from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
 from AthenaConfiguration.ComponentFactory import CompFactory
 from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
 from Digitization.PileUpMergeSvcConfigNew import PileUpMergeSvcCfg, PileUpXingFolderCfg
+from Digitization.PileUpToolsConfig import PileUpToolsCfg
 
 def getTileFirstXing():
     """Return the earliest bunch crossing time for which interactions will be sent to the TileHitVecToCntTool"""
@@ -76,8 +77,7 @@ def TileHitVecToCntToolCfg(flags, **kwargs):
     if flags.Digitization.DoXingByXingPileUp: # PileUpTool approach
         kwargs.setdefault("FirstXing", getTileFirstXing() )
         kwargs.setdefault("LastXing",  getTileLastXing() )
-
-    if flags.Detector.OverlayTile:
+    elif flags.Digitization.Pileup:
         rangetool = acc.popToolsAndMerge(TileRangeCfg(flags))
         acc.merge(PileUpMergeSvcCfg(flags, Intervals=rangetool))
 
@@ -94,7 +94,6 @@ def TileHitVecToCntCfg(flags, **kwargs):
         flags  -- Athena configuration flags (ConfigFlags)
     """
 
-    kwargs.setdefault('name', 'TileHitVecToCnt')
     acc = ComponentAccumulator()
 
     if 'DigitizationTool' not in kwargs:
@@ -102,14 +101,13 @@ def TileHitVecToCntCfg(flags, **kwargs):
         kwargs.setdefault('DigitizationTool', tool)
 
     # choose which alg to attach to, following PileUpToolsCfg
-    if flags.Digitization.DoXingByXingPileUp or flags.Detector.OverlayTile:
+    if flags.Detector.OverlayTile:
+        kwargs.setdefault('name', 'TileHitVecToCnt')
         Alg = CompFactory.TileHitVecToCnt
+        acc.addEventAlgo(Alg(**kwargs))
     else:
-        Alg = CompFactory.DigitizationAlg
-        kwargs["name"] = "StandardPileUpToolsAlg"
         kwargs["PileUpTools"] = [kwargs.pop("DigitizationTool")]
-
-    acc.addEventAlgo(Alg(**kwargs))
+        acc.merge(PileUpToolsCfg(flags, **kwargs))
 
     return acc