diff --git a/Reconstruction/Jet/JetCalibTools/python/JetCalibToolsConfig.py b/Reconstruction/Jet/JetCalibTools/python/JetCalibToolsConfig.py
index 9c07309ed95eafa4e268622ff68092e8ec622be6..7c367b149aabd32b18186040d5cdd647d55484ad 100644
--- a/Reconstruction/Jet/JetCalibTools/python/JetCalibToolsConfig.py
+++ b/Reconstruction/Jet/JetCalibTools/python/JetCalibToolsConfig.py
@@ -24,23 +24,25 @@ all = ['getJetCalibTool']
 pflowcontexts = {
     "T0":("JES_MC15cRecommendation_PFlow_Aug2016_rel21.config","00-04-77","JetArea_Residual_EtaJES"),
     # Omit smearing, to avoid any efficiency loss
-    "AnalysisLatest":("JES_data2017_2016_2015_Consolidated_PFlow_2018_Rel21.config","00-04-82","JetArea_Residual_EtaJES_GSC_InSitu"),
+    "AnalysisLatest":("JES_data2017_2016_2015_Consolidated_PFlow_2018_Rel21.config","00-04-82","JetArea_Residual_EtaJES_GSC_Insitu"),
 }
 
 topocontexts = {
     "T0":("JES_MC15cRecommendation_May2016_rel21.config","00-04-77","JetArea_Residual_EtaJES"),
     # Placeholder from a vague approximation of the 2017 setup?
-    "Trigger":("JES_MC15cRecommendation_May2016_Trigger.config","00-04-77","JetArea_Residual_EtaJES_InSitu"),
+    "TrigEMSubJES":("JES_MC15cRecommendation_May2016_Trigger.config","00-04-77","JetArea_EtaJES_DEV"),
+    "TrigEMSubJESIS":("JES_MC15cRecommendation_May2016_Trigger.config","00-04-77","JetArea_EtaJES_Insitu_DEV"),
+    "TrigEMGSC":("JES_MC15cRecommendation_May2016_Trigger.config","00-04-77","JetArea_EtaJES_DEV"),
     # Omit smearing, to avoid any efficiency loss
-    "AnalysisLatest":("JES_data2017_2016_2015_Consolidated_EMTopo_2018_Rel21.config","00-04-82","JetArea_Residual_EtaJES_GSC_InSitu"),
+    "AnalysisLatest":("JES_data2017_2016_2015_Consolidated_EMTopo_2018_Rel21.config","00-04-82","JetArea_Residual_EtaJES_GSC_Insitu"),
 }
 
 rscanlc2 = {
-    "RScanLatest":("JES_MC16Recommendation_Rscan2LC_22Feb2018_rel21.config","00-04-81","JetArea_Residual_EtaJES_GSC_InSitu")
+    "RScanLatest":("JES_MC16Recommendation_Rscan2LC_22Feb2018_rel21.config","00-04-81","JetArea_Residual_EtaJES_GSC_Insitu")
 }
 
 rscanlc6 = {
-    "RScanLatest":("JES_MC16Recommendation_Rscan6LC_22Feb2018_rel21.config","00-04-81","JetArea_Residual_EtaJES_GSC_InSitu")
+    "RScanLatest":("JES_MC16Recommendation_Rscan6LC_22Feb2018_rel21.config","00-04-81","JetArea_Residual_EtaJES_GSC_Insitu")
 }
 
 fatjetcontexts = {
@@ -61,6 +63,10 @@ calibcontexts = {
     "AntiKt4EMPFlow":pflowcontexts,
     "AntiKt4EMTopo":topocontexts,
     "AntiKt4LCTopo":topocontexts,
+    "TrigAntiKt4EMTopoSubJES":topocontexts,
+    "TrigAntiKt4EMTopoSubJESIS":topocontexts,
+    "TrigAntiKt4EMTopoGSC":topocontexts,
+    #"TrigEMSubJES":topocontexts,
     # Standard trimmed
     "AntiKt10LCTopoTrimmedPtFrac5SmallR20":fatjetcontexts,
     # R-Scan
@@ -98,7 +104,7 @@ def getJetCalibTool(jetcollection, context, data_type, calibseq = ""):
         # Check that the calib sequence requests something sensible for the in situ calibration
         # Leave other checks for the tool code.
         # Might need to specialise if we decide MC trigger jets should also have in situ.
-        if calibseq_tmp.endswith("InSitu"):
+        if calibseq_tmp.endswith("Insitu"):
             if data_type == 'data':
                 if not jetcollection in hasInSitu:
                     raise ValueError("In situ calibration does not exist for {0}, context {1}".format(jetcollection,context))
@@ -141,7 +147,7 @@ def getJetCalibToolPrereqs(modspec,jetdef):
     calibcontext, data_type, calibseq = getCalibSpecsFromString(modspec)
     if calibseq=="":
         cfg, calibarea, calibseq = calibcontexts[jetdef.basename][calibcontext]
-    # For now, only dependent on calibseq -- can ignore InSitu, which is
+    # For now, only dependent on calibseq -- can ignore Insitu, which is
     # added when getting the concrete tool
     prereqs = []
     prereqs.append("mod:ConstitFourMom")
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/jetMenuDefs.py b/Trigger/TrigValidation/TrigUpgradeTest/python/jetMenuDefs.py
index cc041120927f664a4335a369f81f4e4e61d15ec2..e2c8dd42b72a20ea45ff375d490e570e185d5972 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/jetMenuDefs.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/jetMenuDefs.py
@@ -4,9 +4,10 @@
 from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import RecoFragmentsPool, MenuSequence
 from AthenaConfiguration.AllConfigFlags import ConfigFlags
     
-def jetMenuSequence():
+def jetMenuSequence(jetdef):
     """ Function to create the jet Menu Sequence"""
-    
+   
+    ConfigFlags.jetdef=jetdef
     ## RoIs = 'FSJETRoI'
     #reco sequence
     from TrigUpgradeTest.jetDefs import jetAthSequence
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu.py b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu.py
index a39871d67d209973eb3435e8f3d4667805e14ee8..97d6e4d685f54d93b1c2c947e6905cd27db947fe 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu.py
@@ -125,21 +125,17 @@ if opt.doMuonSlice == True:
 if opt.doJetSlice == True:
     from TrigUpgradeTest.jetMenuDefs import jetMenuSequence
 
-    jetSeq1 = jetMenuSequence()
-    jetstep1=ChainStep("Step1_jet", [jetSeq1])
+    jetSeq1 = jetMenuSequence("EMTopoSubJES")
+    step1=ChainStep("Step1_jet", [jetSeq1])
+    jetSeq2 = jetMenuSequence("EMTopoSubJESIS")
+    step2=ChainStep("Step1_jet", [jetSeq2])
     
     jetChains  = [
-      Chain(name='HLT_j85',  Seed="L1_J20",  ChainSteps=[jetstep1]  ),
-      Chain(name='HLT_j45', Seed="L1_J20",  ChainSteps=[jetstep1]  ),
-      Chain(name='HLT_j420', Seed='L1_J20', ChainSteps=[jetstep1] ),
-      Chain(name='HLT_j225_gsc420_boffperf_split', Seed='L1_J20', ChainSteps=[jetstep1] ),
-      Chain(name='HLT_j260_320eta490', Seed='L1_J20', ChainSteps=[jetstep1] ),
-
-      Chain(name='HLT_3j200', Seed='L1_J20', ChainSteps=[jetstep1] ),
-      Chain(name='HLT_5j70_0eta240_L14J15', Seed='L1_J20', ChainSteps=[jetstep1] ),
-      Chain(name='HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet', Seed='L1_J20',  ChainSteps=[jetstep1]  ),
+        Chain(name='HLT_j85',  Seed="L1_J20",  ChainSteps=[step1]  ),
+        Chain(name='HLT_j45', Seed="L1_J20",  ChainSteps=[step1]  ),
+        Chain(name='HLT_j45_subjes', Seed="L1_J20",  ChainSteps=[step2]  )
+        ]
 
-    ]
     testChains += jetChains