diff --git a/Simulation/Digitization/CMakeLists.txt b/Simulation/Digitization/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..4c7f48a9f6968ac003dd6c51b24442efcb9903de
--- /dev/null
+++ b/Simulation/Digitization/CMakeLists.txt
@@ -0,0 +1,18 @@
+################################################################################
+# Package: Digitization
+################################################################################
+
+# Declare the package name:
+atlas_subdir( Digitization )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PUBLIC
+                          Control/MinimalRunTime
+                          PRIVATE
+                          TestPolicy )
+
+# Install files from the package:
+atlas_install_python_modules( python/*.py )
+atlas_install_joboptions( share/*.py share/jobOpts/*.py )
+atlas_install_runtime( data/*.ascii test/Digitization_TestConfiguration.xml )
+
diff --git a/Simulation/Digitization/python/DigiOutput.py b/Simulation/Digitization/python/DigiOutput.py
index 943385f8a7e59d06e8bceb2e1bfec639f48f7423..62cbe8b6a2284a9e161ada7b667146b9dd90a8b3 100644
--- a/Simulation/Digitization/python/DigiOutput.py
+++ b/Simulation/Digitization/python/DigiOutput.py
@@ -38,9 +38,7 @@ def getStreamRDO_ItemList(log):
                 StreamRDO_ItemList+=["PRD_MultiTruthCollection#*"]
         if DetFlags.writeRDOPool.Muon_on():
             StreamRDO_ItemList+=["CscSimDataCollection#CSC_SDO"]
-            StreamRDO_ItemList+=["MuonSimDataCollection#MDT_SDO"]
-            StreamRDO_ItemList+=["MuonSimDataCollection#RPC_SDO"]
-            StreamRDO_ItemList+=["MuonSimDataCollection#TGC_SDO"]
+            StreamRDO_ItemList+=["MuonSimDataCollection#*"]
     # Forward Detector Output
     if DetFlags.digitize.Lucid_on():
         if DetFlags.writeRDOPool.Lucid_on():
diff --git a/Simulation/Digitization/python/DigitizationFlags.py b/Simulation/Digitization/python/DigitizationFlags.py
index 55705874af609edf9f028f97e36e64700af943fc..58e7e0475e116238f8861b808045c0eff166c9c0 100755
--- a/Simulation/Digitization/python/DigitizationFlags.py
+++ b/Simulation/Digitization/python/DigitizationFlags.py
@@ -358,7 +358,7 @@ class finalBunchCrossing(JobProperty):
     """
     statusOn=True
     allowedTypes=['int']
-    StoredValue=32
+    StoredValue=6 #32
 
 #
 class HighPtMinBiasInputCols(JobProperty):