diff --git a/Analysis/hh_bbww.py b/Analysis/hh_bbww.py
index 8bb0934..fe431cc 100644
--- a/Analysis/hh_bbww.py
+++ b/Analysis/hh_bbww.py
@@ -85,6 +85,7 @@ def GetWeight(channel, cat, boosted_categories):  # do you need all these args?
     for lep_index in [1, 2]:
         total_weight = f"{total_weight} * {GetLepWeight(lep_index)}"
     total_weight = f"{total_weight} * {GetTriggerWeight()}"
+    total_weight = f"{total_weight} * weight_bTagShape_Central"
     return total_weight
 
 
diff --git a/Corrections b/Corrections
index 4ea755f..ef30f19 160000
--- a/Corrections
+++ b/Corrections
@@ -1 +1 @@
-Subproject commit 4ea755f3c8e1d1d7ae9647403a960dab008581c7
+Subproject commit ef30f19c87489462406b7b4cb7659c6e85d461a0
diff --git a/FLAF b/FLAF
index e53523d..837e43f 160000
--- a/FLAF
+++ b/FLAF
@@ -1 +1 @@
-Subproject commit e53523d5c04a49806feb25bdb86a803924d84c67
+Subproject commit 837e43f6697b2bf90b59dcd8e95d5c961d2896e1
diff --git a/config/global.yaml b/config/global.yaml
index c33c4b3..667d831 100644
--- a/config/global.yaml
+++ b/config/global.yaml
@@ -17,7 +17,7 @@ nEventsPerFile:
 
 corrections:
   mu:
-    stage: HistTuple
+    stages: [ HistTuple, AnalysisCache ]
     columns:
       pfRelIso04_all: Muon_pfRelIso04_all
       tightId: Muon_tightId
@@ -26,16 +26,16 @@ corrections:
       mediumId: Muon_mediumId
       looseId: Muon_looseId
   trigger:
-    stage: HistTuple
+    stages: [ HistTuple, AnalysisCache ]
     mode: SF
-  ele: { stage: HistTuple }
+  ele: { stages: [ HistTuple, AnalysisCache ] }
   fatjet:
-    stage: HistTuple # AnaTuple
+    stages: [ HistTuple, AnalysisCache ] # AnaTuple
     ana: bbWW
     tagger: particleNetWithMass_HbbvsQCD
     fatJetName: fatbjet # SelectedFatJet
   muScaRe: { stage: AnaTuple, mu_pt_for_ScaReApplication: "nano" }
-  eleES: { stage: AnaTuple }
+  eleES: { stages: [ AnaTuple, AnalysisCache ] }
   lumi: { stage: AnaTuple }
   xs: { stage: AnaTuple }
   gen: { stage: AnaTuple }
@@ -50,10 +50,12 @@ corrections:
     stage: AnaTuple
     apply_jet_horns_fix: true
   btag:
-    stages: [ AnaTuple, HistTuple ]
+    normFilePattern: data/{version}/AnalysisCacheAggregationTask/{period}/{dataset_name}/BtagShape/aggregatedCache.json
+    stages: [ AnaTuple, HistTuple, AnalysisCache ]
     modes:
       AnaTuple: none # just load to define WP ID branches
-      HistTuple: shape
+      AnalysisCache: shape
+      HistTuple: shape_and_norm
     tagger: particleNet
     jetCollection: centralJet
 extraFormat_for_triggerMatchingAndSF:
@@ -267,6 +269,57 @@ payload_producers:
     awkward_based: True
     uproot_stepsize: '50MB'
     dependencies:
+  BtagShape:
+    producers_module_name: BtagShapeProducer
+    producer_name: BtagShapeProducer
+    weight_module: Analysis.hh_bbww
+    save_as: json
+    needs_aggregation: True
+    target_groups: [ "signals", "backgrounds" ]
+    is_global: True
+    columns: [ ]
+    bins:
+      e_2: "channelId == static_cast<int>(Channel::e) && ncentralJet == 2"
+      e_3: "channelId == static_cast<int>(Channel::e) && ncentralJet == 3"
+      e_4: "channelId == static_cast<int>(Channel::e) && ncentralJet == 4"
+      e_5: "channelId == static_cast<int>(Channel::e) && ncentralJet == 5"
+      e_6: "channelId == static_cast<int>(Channel::e) && ncentralJet == 6"
+      e_7: "channelId == static_cast<int>(Channel::e) && ncentralJet == 7"
+      e_8: "channelId == static_cast<int>(Channel::e) && ncentralJet >= 8"
+      mu_2: "channelId == static_cast<int>(Channel::mu) && ncentralJet == 2"
+      mu_3: "channelId == static_cast<int>(Channel::mu) && ncentralJet == 3"
+      mu_4: "channelId == static_cast<int>(Channel::mu) && ncentralJet == 4"
+      mu_5: "channelId == static_cast<int>(Channel::mu) && ncentralJet == 5"
+      mu_6: "channelId == static_cast<int>(Channel::mu) && ncentralJet == 6"
+      mu_7: "channelId == static_cast<int>(Channel::mu) && ncentralJet == 7"
+      mu_8: "channelId == static_cast<int>(Channel::mu) && ncentralJet >= 8"
+      eE_2: "channelId == static_cast<int>(Channel::eE) && ncentralJet == 2"
+      eE_3: "channelId == static_cast<int>(Channel::eE) && ncentralJet == 3"
+      eE_4: "channelId == static_cast<int>(Channel::eE) && ncentralJet == 4"
+      eE_5: "channelId == static_cast<int>(Channel::eE) && ncentralJet == 5"
+      eE_6: "channelId == static_cast<int>(Channel::eE) && ncentralJet == 6"
+      eE_7: "channelId == static_cast<int>(Channel::eE) && ncentralJet == 7"
+      eE_8: "channelId == static_cast<int>(Channel::eE) && ncentralJet >= 8"
+      eMu_2: "channelId == static_cast<int>(Channel::eMu) && ncentralJet == 2"
+      eMu_3: "channelId == static_cast<int>(Channel::eMu) && ncentralJet == 3"
+      eMu_4: "channelId == static_cast<int>(Channel::eMu) && ncentralJet == 4"
+      eMu_5: "channelId == static_cast<int>(Channel::eMu) && ncentralJet == 5"
+      eMu_6: "channelId == static_cast<int>(Channel::eMu) && ncentralJet == 6"
+      eMu_7: "channelId == static_cast<int>(Channel::eMu) && ncentralJet == 7"
+      eMu_8: "channelId == static_cast<int>(Channel::eMu) && ncentralJet >= 8"
+      muMu_2: "channelId == static_cast<int>(Channel::muMu) && ncentralJet == 2"
+      muMu_3: "channelId == static_cast<int>(Channel::muMu) && ncentralJet == 3"
+      muMu_4: "channelId == static_cast<int>(Channel::muMu) && ncentralJet == 4"
+      muMu_5: "channelId == static_cast<int>(Channel::muMu) && ncentralJet == 5"
+      muMu_6: "channelId == static_cast<int>(Channel::muMu) && ncentralJet == 6"
+      muMu_7: "channelId == static_cast<int>(Channel::muMu) && ncentralJet == 7"
+      muMu_8: "channelId == static_cast<int>(Channel::muMu) && ncentralJet >= 8"
+    n_cpus: 4
+    max_runtime: 8.0
+    cmssw_env: False
+    awkward_based: True
+    uproot_stepsize: '50MB'
+    dependencies:
 
 region: All
 region_default: SR