diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/python/MUON5.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/python/MUON5.py
index 9845a7f0fa142a5381a0cb237314d5596e45e157..98968c1710dc8a90d5a243a2fb05d459c971572d 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/python/MUON5.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/python/MUON5.py
@@ -140,6 +140,11 @@ def MUON5KernelCfg(ConfigFlags, name='MUON5Kernel', **kwargs):
     from DerivationFrameworkMuons.TrackIsolationDecoratorConfig import TrackIsolationCfg
     acc.merge(TrackIsolationCfg(ConfigFlags,TrackCollection="InDetTrackParticles", TrackSelections = trkThinFlags))
     acc.merge(TrackIsolationCfg(ConfigFlags,TrackCollection="ExtrapolatedMuonTrackParticles"))
+
+    from IsolationSelection.IsolationSelectionConfig import IsoCloseByAlgsCfg
+    contNames = [ "Muons", "Electrons", "Photons" ]
+    acc.merge(IsoCloseByAlgsCfg(ConfigFlags, isPhysLite = False, containerNames = contNames, useSelTools = True, stream_name = kwargs['StreamName']))
+
     ### Calo deposits 
     from DerivationFrameworkMuons.MuonsToolsConfig import MuonCaloDepositAlgCfg
     acc.merge(MuonCaloDepositAlgCfg(ConfigFlags,
@@ -242,6 +247,16 @@ def MUON5KernelCfg(ConfigFlags, name='MUON5Kernel', **kwargs):
                                                                        CaloClCollectionSGKey   = "egammaClusters",
                                                                        ConeSize                = 0.4))
     MUON5ThinningTools.append(MUON5ThinningTool2)
+
+    # keep egammaclusters around photons
+    MUON5ThinningTool3 = acc.getPrimaryAndMerge(CaloClusterThinningCfg(ConfigFlags,
+                                                                       name                    = "MUON5ThinningTool3",
+                                                                       StreamName              = kwargs['StreamName'],
+                                                                       SGKey                   = "Photons",
+                                                                       SelectionString         = "Photons.pt>4*GeV",
+                                                                       CaloClCollectionSGKey   = "egammaClusters",
+                                                                       ConeSize                = 0.4))
+    MUON5ThinningTools.append(MUON5ThinningTool3)
     
     ### cell thinning
     acc.merge(thinCaloCellsForDFCfg(ConfigFlags,
@@ -365,7 +380,7 @@ def MUON5Cfg(ConfigFlags):
         "ptcone20_Nonprompt_All_MaxWeightTTVA_pt500", "ptcone20_Nonprompt_All_MaxWeightTTVA_pt1000",
         "ptcone30_Nonprompt_All_MaxWeightTTVA_pt500", "ptcone30_Nonprompt_All_MaxWeightTTVA_pt1000",
         "ptcone40_Nonprompt_All_MaxWeightTTVA_pt500", "ptcone40_Nonprompt_All_MaxWeightTTVA_pt1000",
-        "topoetconecoreConeEnergyCorrection", "topoetconecoreConeSCEnergyCorrection",
+        "topoetconecoreConeEnergyCorrection"
     ]
     ElectronsExtraContent = [
         ".".join(