diff --git a/README.md b/README.md
index 266f53376e2..ad66b65e85a 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ cmsenv
 setenv CMSSW_GIT_REFERENCE /cvmfs/cms.cern.ch/cmssw.git.daily
 git cms-init
 
-git clone -b 10_6_X_v1.03 --depth 1 https://github.com/cms-btv-pog/RecoBTag-PerformanceMeasurements.git RecoBTag/PerformanceMeasurements
+git clone -b 10_6_X_v1.04 --depth 1 https://github.com/cms-btv-pog/RecoBTag-PerformanceMeasurements.git RecoBTag/PerformanceMeasurements
 
 scram b -j8
 
diff --git a/data/Summer19UL17_RunB_V4_DATA.db b/data/Summer19UL17_RunB_V4_DATA.db
new file mode 100644
index 00000000000..36c8db545ce
Binary files /dev/null and b/data/Summer19UL17_RunB_V4_DATA.db differ
diff --git a/data/Summer19UL17_RunC_V4_DATA.db b/data/Summer19UL17_RunC_V4_DATA.db
new file mode 100644
index 00000000000..803c50ec70f
Binary files /dev/null and b/data/Summer19UL17_RunC_V4_DATA.db differ
diff --git a/data/Summer19UL17_RunD_V4_DATA.db b/data/Summer19UL17_RunD_V4_DATA.db
new file mode 100644
index 00000000000..e4538f82552
Binary files /dev/null and b/data/Summer19UL17_RunD_V4_DATA.db differ
diff --git a/data/Summer19UL17_RunE_V4_DATA.db b/data/Summer19UL17_RunE_V4_DATA.db
new file mode 100644
index 00000000000..486f6eee1c9
Binary files /dev/null and b/data/Summer19UL17_RunE_V4_DATA.db differ
diff --git a/data/Summer19UL17_RunF_V4_DATA.db b/data/Summer19UL17_RunF_V4_DATA.db
new file mode 100644
index 00000000000..e9862ef8e68
Binary files /dev/null and b/data/Summer19UL17_RunF_V4_DATA.db differ
diff --git a/data/Summer19UL17_V4_MC.db b/data/Summer19UL17_V4_MC.db
new file mode 100644
index 00000000000..881232f91b3
Binary files /dev/null and b/data/Summer19UL17_V4_MC.db differ
diff --git a/python/defaults/2017_UltraLegacy.py b/python/defaults/2017_UltraLegacy.py
index 2c60d9682ad..50a014b95a5 100644
--- a/python/defaults/2017_UltraLegacy.py
+++ b/python/defaults/2017_UltraLegacy.py
@@ -5,12 +5,18 @@
 
 mc = {
 	'inputFiles' : ['/store/mc/RunIISummer19UL17MiniAOD/TTTo2L2Nu_TuneCP5_13TeV-powheg-pythia8/MINIAODSIM/106X_mc2017_realistic_v6-v2/40000/FEDB3CA9-7B9C-4D4B-AB90-C4982D57ADEE.root'],
-	'JPCalibration' : 'JPcalib_MC106X_UL2017_v1',
+		'JPCalibration' : 'JPcalib_MC106X_UL2017_v1',
 	'mcGlobalTag' : '106X_mc2017_realistic_v6',
+    	'usePrivateJEC': True,
+    	'jecDBFileMC': 'Summer19UL17_V4_MC',
+	'usePFchs': True
 	}
 
 data = {
 	'inputFiles' : ['/store/data/Run2017D/JetHT/MINIAOD/17Nov2017-v1/20000/0249B143-8CCC-E711-BA7C-0025905C2CD0.root'],	
-    'JPCalibration' : 'JPcalib_Data106X_UL2017_v1',
+    	'JPCalibration' : 'JPcalib_Data106X_UL2017_v1',
 	'dataGlobalTag' : '106X_dataRun2_v20',
+    	'usePrivateJEC': True,
+    	'jecDBFileData': 'Summer19UL17_RunD_V4_DATA',
+	'usePFchs': True
 }
diff --git a/test/runBTagAnalyzer_cfg.py b/test/runBTagAnalyzer_cfg.py
index db9e49b934f..90439c8b8f1 100644
--- a/test/runBTagAnalyzer_cfg.py
+++ b/test/runBTagAnalyzer_cfg.py
@@ -893,42 +893,54 @@
     if options.runOnData: dbfile=options.jecDBFileData
     else: dbfile=options.jecDBFileMC
     print "\nUsing private SQLite file", dbfile, "\n"
-    process.jec = cms.ESSource("PoolDBESSource",CondDBSetup,
-		    connect = cms.string( "sqlite_fip:RecoBTag/PerformanceMeasurements/data/"+dbfile+'.db'),
-		    toGet =  cms.VPSet(
-			    cms.PSet(
-				    record = cms.string("JetCorrectionsRecord"),
-				    tag = cms.string("JetCorrectorParametersCollection_"+dbfile+"_AK4PF"),
-				    label= cms.untracked.string("AK4PF")
-				    ),
-			    cms.PSet(
-				    record = cms.string("JetCorrectionsRecord"),
-				    tag = cms.string("JetCorrectorParametersCollection_"+dbfile+"_AK4PFchs"),
-				    label= cms.untracked.string("AK4PFchs")
-				    ),
-			    cms.PSet(
-				    record = cms.string("JetCorrectionsRecord"),
-				    tag = cms.string("JetCorrectorParametersCollection_"+dbfile+"_AK4PFPuppi"),
-				    label= cms.untracked.string("AK4PFPuppi")
-				    ),
-			    cms.PSet(
-				    record = cms.string("JetCorrectionsRecord"),
-				    tag = cms.string("JetCorrectorParametersCollection_"+dbfile+"_AK8PF"),
-				    label= cms.untracked.string("AK8PF")
-				    ),
-			    cms.PSet(
-				    record = cms.string("JetCorrectionsRecord"),
-				    tag = cms.string("JetCorrectorParametersCollection_"+dbfile+"_AK8PFchs"),
-				    label= cms.untracked.string("AK8PFchs")
-				    ),
-			    cms.PSet(
-				    record = cms.string("JetCorrectionsRecord"),
-				    tag = cms.string("JetCorrectorParametersCollection_"+dbfile+"_AK8PFPuppi"),
-				    label= cms.untracked.string("AK8PFPuppi")
-				    ),
+    if options.usePFchs:
+	    process.jec = cms.ESSource("PoolDBESSource",CondDBSetup,
+			    connect = cms.string( "sqlite_fip:RecoBTag/PerformanceMeasurements/data/"+dbfile+'.db'),
+			    toGet =  cms.VPSet(
+				    cms.PSet(
+					    record = cms.string("JetCorrectionsRecord"),
+					    tag = cms.string("JetCorrectorParametersCollection_"+dbfile+"_AK4PFchs"),
+					    label= cms.untracked.string("AK4PFchs")
+					    ),
+				    )
 			    )
-		    )
+    else:
 
+            process.jec = cms.ESSource("PoolDBESSource",CondDBSetup,
+                            connect = cms.string( "sqlite_fip:RecoBTag/PerformanceMeasurements/data/"+dbfile+'.db'),
+                            toGet =  cms.VPSet(
+                                   cms.PSet(
+                                           record = cms.string("JetCorrectionsRecord"),
+                                           tag = cms.string("JetCorrectorParametersCollection_"+dbfile+"_AK4PF"),
+                                           label= cms.untracked.string("AK4PF")
+                                           ),
+                                    cms.PSet(
+                                            record = cms.string("JetCorrectionsRecord"),
+                                            tag = cms.string("JetCorrectorParametersCollection_"+dbfile+"_AK4PFchs"),
+                                            label= cms.untracked.string("AK4PFchs")
+                                            ),
+                                   cms.PSet(
+                                           record = cms.string("JetCorrectionsRecord"),
+                                           tag = cms.string("JetCorrectorParametersCollection_"+dbfile+"_AK4PFPuppi"),
+                                           label= cms.untracked.string("AK4PFPuppi")
+                                           ),
+                                   cms.PSet(
+                                           record = cms.string("JetCorrectionsRecord"),
+                                           tag = cms.string("JetCorrectorParametersCollection_"+dbfile+"_AK8PF"),
+                                           label= cms.untracked.string("AK8PF")
+                                           ),
+                                   cms.PSet(
+                                           record = cms.string("JetCorrectionsRecord"),
+                                           tag = cms.string("JetCorrectorParametersCollection_"+dbfile+"_AK8PFchs"),
+                                           label= cms.untracked.string("AK8PFchs")
+                                           ),
+                                   cms.PSet(
+                                           record = cms.string("JetCorrectionsRecord"),
+                                           tag = cms.string("JetCorrectorParametersCollection_"+dbfile+"_AK8PFPuppi"),
+                                           label= cms.untracked.string("AK8PFPuppi")
+                                           ),
+                                    )
+                            )
     process.es_prefer_jec = cms.ESPrefer("PoolDBESSource",'jec')
 
 ### to activate the new JP calibration: using the data base