diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopBoostedTaggingCPTools.cxx b/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopBoostedTaggingCPTools.cxx
index a52a873a5fdaa90487cbcab0a7d4a83ecda4e97f..5f0761a2df6be97a37fc527e0777434729937ec7 100644
--- a/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopBoostedTaggingCPTools.cxx
+++ b/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopBoostedTaggingCPTools.cxx
@@ -138,17 +138,17 @@ namespace top {
       
       // Top taggers
       std::string taggerType = "JSSWTopTaggerDNN";
-      setConfig(taggerType,"DNNTaggerTopQuarkContained50","JSSDNNTagger_AntiKt10LCTopoTrimmed_TopQuarkContained_MC16_20201203_50Eff.dat");
-      setConfig(taggerType,"DNNTaggerTopQuarkContained80","JSSDNNTagger_AntiKt10LCTopoTrimmed_TopQuarkContained_MC16_20201203_80Eff.dat");
-      setConfig(taggerType,"DNNTaggerTopQuarkInclusive50","JSSDNNTagger_AntiKt10LCTopoTrimmed_TopQuarkInclusive_MC16_20201203_50Eff.dat");
-      setConfig(taggerType,"DNNTaggerTopQuarkInclusive80","JSSDNNTagger_AntiKt10LCTopoTrimmed_TopQuarkInclusive_MC16_20201203_80Eff.dat");
+      setConfig(taggerType,"DNNTaggerTopQuarkContained50","JSSDNNTagger_AntiKt10LCTopoTrimmed_TopQuarkContained_MC16_20201216_50Eff.dat");
+      setConfig(taggerType,"DNNTaggerTopQuarkContained80","JSSDNNTagger_AntiKt10LCTopoTrimmed_TopQuarkContained_MC16_20201216_80Eff.dat");
+      setConfig(taggerType,"DNNTaggerTopQuarkInclusive50","JSSDNNTagger_AntiKt10LCTopoTrimmed_TopQuarkInclusive_MC16_20201216_50Eff.dat");
+      setConfig(taggerType,"DNNTaggerTopQuarkInclusive80","JSSDNNTagger_AntiKt10LCTopoTrimmed_TopQuarkInclusive_MC16_20201216_80Eff.dat");
       
       // WZ taggers
       taggerType="SmoothedWZTagger";
-      setConfig(taggerType,"SmoothWContained50","SmoothedContainedWTagger_AntiKt10LCTopoTrimmed_FixedSignalEfficiency50_MC16_20201203.dat");
-      setConfig(taggerType,"SmoothWContained80","SmoothedContainedWTagger_AntiKt10LCTopoTrimmed_FixedSignalEfficiency80_MC16_20201203.dat");
-      setConfig(taggerType,"SmoothZContained50","SmoothedContainedZTagger_AntiKt10LCTopoTrimmed_FixedSignalEfficiency50_MC16_20201203.dat");
-      setConfig(taggerType,"SmoothZContained80","SmoothedContainedZTagger_AntiKt10LCTopoTrimmed_FixedSignalEfficiency80_MC16_20201203.dat");
+      setConfig(taggerType,"SmoothWContained50","SmoothedContainedWTagger_AntiKt10LCTopoTrimmed_FixedSignalEfficiency50_MC16_20201216.dat");
+      setConfig(taggerType,"SmoothWContained80","SmoothedContainedWTagger_AntiKt10LCTopoTrimmed_FixedSignalEfficiency80_MC16_20201216.dat");
+      setConfig(taggerType,"SmoothZContained50","SmoothedContainedZTagger_AntiKt10LCTopoTrimmed_FixedSignalEfficiency50_MC16_20201216.dat");
+      setConfig(taggerType,"SmoothZContained80","SmoothedContainedZTagger_AntiKt10LCTopoTrimmed_FixedSignalEfficiency80_MC16_20201216.dat");
 
     } else if (m_config->sgKeyLargeRJets() == "AntiKt10TrackCaloClusterTrimmedPtFrac5SmallR20Jets") {
       // WZ taggers
diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker/Root/JetObjectCollectionMaker.cxx b/PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker/Root/JetObjectCollectionMaker.cxx
index 8614976aa94e9b906aef0c8aeaecedbdb2819e4b..89dd7a76d2fc02967a37ef0123e97813e9f792cf 100644
--- a/PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker/Root/JetObjectCollectionMaker.cxx
+++ b/PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker/Root/JetObjectCollectionMaker.cxx
@@ -648,7 +648,20 @@ namespace top {
                                   && jet->pt() < 3000e3);
             }
             if (!calibratable_jet) continue;
+	    
+	    ///-- Apply large-R jet tagging SF uncertainties --///
+	    for (std::pair<const std::string, ToolHandle<ICPJetUncertaintiesTool> >& tagSF : m_tagSFuncertTool) {
+	      std::string fullName=tagSF.first;
+	      std::replace(std::begin(fullName),std::end(fullName),':','_');
+	      const SG::AuxElement::Accessor< char > acc("passedRangeCheck_" + fullName);
+	      
+	      if(acc.isAvailable(*jet) && acc(*jet)) {
+		top::check(tagSF.second->applyCorrection(*jet), "Failed to applyCorrection");
+	      }
+            }
+	    
           }
+	  
           ///-- Apply Corrrection --///
           if (!(isLargeR && !m_config->isMC())) { //Large-R jet uncertainties don't apply to Data
             top::check(tool->applyCorrection(*jet), "Failed to applyCorrection");
@@ -676,19 +689,6 @@ namespace top {
 		       "Failed to apply fJVT decoration");
 	  }
 
-
-          ///-- Apply large-R jet tagging SF uncertainties --///
-          if (isLargeR && m_config->isMC()) {
-            for (std::pair<const std::string, ToolHandle<ICPJetUncertaintiesTool> >& tagSF : m_tagSFuncertTool) {
-	      std::string fullName=tagSF.first;
-	      std::replace(std::begin(fullName),std::end(fullName),':','_');
-	      const SG::AuxElement::Accessor< char > acc("passedRangeCheck_" + fullName);
-	      
-	      if(acc.isAvailable(*jet) && acc(*jet)) {
-		top::check(tagSF.second->applyCorrection(*jet), "Failed to applyCorrection");
-	      }
-            }
-          }
         }
 
         ///-- set links to original objects- needed for MET calculation --///