diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/data.yaml b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/data.yaml
index fd874e0693..602220e8df 100644
--- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/data.yaml
+++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/data.yaml
@@ -1,4 +1,6 @@
 data_central:
+- 0.0473835
+- 0.0405684
 - 0.0343165
 - 0.0291566
 - 0.0248037
@@ -37,3 +39,4 @@ data_central:
 - 5.5219e-07
 - 2.01646e-07
 - 5.11526e-08
+- 2.51767e-06
diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/filter.py b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/filter.py
index 80508b1da4..f4dfd6d967 100644
--- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/filter.py
+++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/filter.py
@@ -1,101 +1,93 @@
 """
-
+This file contains the piece of code needed to implement the ATLAS ZpT 
+measurement at 13 TeV. We consider the combined electron-muon measurement, for
+which a total uncorrelated and a total correlated ucnertainties are given. The 
+measurement is normalised to the fiducial cross section, therefore there is no
+luminosity ucnertainty. The first three bins in pT are cropped, because of
+the impossiblity of producing theoretical predictions.
 """
 
-from filter_utils import get_data_values, get_kinematics, get_systematics
 import yaml
 
-UNCORRELATED_SYS = ["Stat (Data)", "Stat (MC)", "Efficiencies (Uncorellated)"]
-
-
-def filter_ATLAS_Z_13TEV_PT_data_kinetic():
+def get_tables():
     """
-    writes data central values and kinematics
-    to respective .yaml file
+    Get the Hepdata table
     """
-    with open("metadata.yaml", "r") as file:
-        metadata = yaml.safe_load(file)
-
-    version = metadata["hepdata"]["version"]
-
-    # tables for Z->l+l- observable
-    tables = metadata["implemented_observables"][0]["tables"]
+    hepdata_tables = ["rawdata/HEPData-ins1768911-v3-Table_4a.yaml"]
 
-    kin = get_kinematics(tables, version)
-    central_values = get_data_values(tables, version)
+    return hepdata_tables
 
+def get_all():
+    """
+    Returns data, kinematics and uncertainties for dumping in the .yaml files
+    """
+    data_central = []
+    kinematics = []
+    uncertainties = []
+
+    hepdata_tables = get_tables()
+    for table in hepdata_tables:
+        with open(table, 'r') as f:
+            input = yaml.safe_load(f)
+            
+        # Central values
+        data_values = input["dependent_variables"][0]["values"]
+        for data_value in data_values:
+            data_central.append(data_value["value"])
+        # Kinematic bins
+        kin_values = input["independent_variables"][0]["values"]
+        for kin_value in kin_values:
+            kin = {
+                'pT': {'min': kin_value['low'],
+                       'mid': 0.5 * (kin_value['low'] + kin_value['high']),
+                       'max': kin_value['high']},
+                'm_ll': {'min': None, 'mid': 91.2, 'max': None},}
+               
+            kinematics.append(kin)
+        # Uncertainties
+        i = 0
+        for data_value in data_values:
+            errors = data_value["errors"]
+            uncertainty = {}
+            for error in errors:
+                uncertainty[error["label"]] = float(error["symerror"].replace('%',''))*data_central[i]/100.
+                uncertainty.update(uncertainty)
+                
+            uncertainties.append(uncertainty)
+            i = i+1
+
+    n=3
+    return (data_central[n:], kinematics[n:], uncertainties[n:])
+
+def filter_ATLAS_Z0J_13TEV_PT():
+    """
+    Dumps data, kinematics, and uncertainties on .yaml files
+    """
+    central_values, kinematics, uncertainties = get_all()
+    # Central values
     data_central_yaml = {"data_central": central_values}
-    kinematics_yaml = {"bins": kin}
+    # Kinematics
+    kinematics_yaml = {"bins": kinematics}
+    # Uncertainties
+    treatment = {"correlated uncertainty": "ADD",
+                 "uncorrelated uncertainty": "ADD",}
+    correlation = {"correlated uncertainty": "CORR",
+                 "uncorrelated uncertainty": "UNCORR",}
+    definitions = {}
+    for key,value in uncertainties[0].items():
+        definition = {key :
+                      {"description": key,
+                       "treatment": treatment[key],
+                       "type": correlation[key]}}
+        definitions.update(definition)
+    uncertainties_yaml = {"definitions": definitions,"bins": uncertainties}
 
-    # write central values and kinematics to yaml file
     with open("data.yaml", "w") as file:
         yaml.dump(data_central_yaml, file, sort_keys=False)
-
     with open("kinematics.yaml", "w") as file:
         yaml.dump(kinematics_yaml, file, sort_keys=False)
-
-
-def filter_ATLAS_Z_13TEV_PT_uncertainties():
-    """
-    writes uncertainties to respective .yaml file
-    """
-
-    with open("metadata.yaml", "r") as file:
-        metadata = yaml.safe_load(file)
-
-    version = metadata["hepdata"]["version"]
-    # tables for Z->l+l- observable
-    tables = metadata["implemented_observables"][0]["tables"]
-
-    systematics_LL = get_systematics(tables, version)
-
-    systematics = {"LL": systematics_LL}
-
-    # error definition
-    error_definitions = {}
-    errors = {}
-
-    for obs in ["LL"]:
-
-        error_definitions[obs] = {}
-
-        for sys in systematics[obs]:
-
-            if sys[0]['name'] in UNCORRELATED_SYS:
-                error_definitions[obs][sys[0]['name']] = {
-                    "description": f"{sys[0]['name']} from HEPDATA",
-                    "treatment": "ADD",
-                    "type": "UNCORR",
-                }
-
-            else:
-                error_definitions[obs][sys[0]['name']] = {
-                    "description": f"{sys[0]['name']} from HEPDATA",
-                    "treatment": "ADD",
-                    "type": "CORR",
-                }
-
-        # TODO:
-        # store error in dict
-        errors[obs] = []
-
-        central_values = get_data_values(tables, version)
-
-        for i in range(len(central_values)):
-            error_value = {}
-
-            for sys in systematics[obs]:
-                error_value[sys[0]['name']] = float(sys[0]['values'][i])
-
-            errors[obs].append(error_value)
-
-        uncertainties_yaml = {"definitions": error_definitions[obs], "bins": errors[obs]}
-
-        # write uncertainties
-        with open(f"uncertainties.yaml", 'w') as file:
-            yaml.dump(uncertainties_yaml, file, sort_keys=False)
-
-
+    with open("uncertainties.yaml", "w") as file:
+        yaml.dump(uncertainties_yaml, file, sort_keys=False)
+        
 if __name__ == "__main__":
-    filter_ATLAS_Z_13TEV_PT_data_kinetic()
-    filter_ATLAS_Z_13TEV_PT_uncertainties()
+    filter_ATLAS_Z0J_13TEV_PT()
diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/filter_utils.py b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/filter_utils.py
deleted file mode 100644
index f65397c1ce..0000000000
--- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/filter_utils.py
+++ /dev/null
@@ -1,105 +0,0 @@
-import yaml
-
-
-def get_kinematics(table, version):
-    """
-    returns the relevant kinematics values.
-
-    Parameters
-    ----------
-    table : list
-
-    version : int
-            integer read from metadata.yaml that
-            indicated the version of the hepdata
-            tables
-
-    Returns
-    -------
-    list
-        list containing the kinematic values for all
-        hepdata tables
-    """
-    kin = []
-
-    hepdata_table = f"rawdata/HEPData-ins1768911-v3-Tabulated_Figure_6.yaml"
-
-    with open(hepdata_table, 'r') as file:
-        input = yaml.safe_load(file)
-
-    for pt in input["independent_variables"][0]['values']:
-        kin_value = {
-            'pT': {'min': pt['low'], 'mid': 0.5 * (pt['low'] + pt['high']), 'max': pt['high']},
-            'm_Z2': {'min': None, 'mid': 8317.44, 'max': None},
-            'sqrts': {'min': None, 'mid': 13000.0, 'max': None},
-        }
-
-        kin.append(kin_value)
-
-    return kin
-
-
-def get_data_values(tables, version):
-    """
-    returns the central data.
-
-    Parameters
-    ----------
-    tables : list
-            list that enumerates the table number
-
-    version : int
-            integer read from metadata.yaml that
-            indicated the version of the hepdata
-            tables
-
-    Returns
-    -------
-    list
-        list containing the central values for all
-        hepdata tables
-
-    """
-
-    data_central = []
-
-    hepdata_table = f"rawdata/HEPData-ins1768911-v3-Tabulated_Figure_6.yaml"
-
-    with open(hepdata_table, 'r') as file:
-        input = yaml.safe_load(file)
-
-    values = input['dependent_variables'][0]['values']
-
-    for value in values:
-        data_central.append(value['value'])
-
-    return data_central
-
-
-def get_systematics(tables, version):
-    """ """
-    uncertainties = []
-
-    hepdata_table = f"rawdata/HEPData-ins1768911-v{version}-Table_{tables[0]}.yaml"
-
-    with open(hepdata_table, 'r') as file:
-        input = yaml.safe_load(file)
-
-    dependent_vars = input['dependent_variables']
-
-    # skip 1st entry as these are central data values
-    for dep_var in dependent_vars[1:]:
-
-        name = dep_var['header']['name']
-        # skip first 4 and last entry as these central values are not contained
-        # in Tabulated Figure 6
-        values = [d['value'] for d in dep_var['values'][4:-1]]
-        uncertainties.append([{"name": name, "values": values}])
-
-    return uncertainties
-
-
-if __name__ == "__main__":
-    # get_kinematics(tables=[7], version=3)
-    # get_data_values(tables=[7], version=3)
-    get_systematics(tables=[5], version=3)
diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/kinematics.yaml b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/kinematics.yaml
index b9fc4971f5..c6a12622b6 100644
--- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/kinematics.yaml
+++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/kinematics.yaml
@@ -1,457 +1,329 @@
 bins:
+- pT:
+    min: 6
+    mid: 7.0
+    max: 8
+  m_ll:
+    min: null
+    mid: 91.2
+    max: null
+- pT:
+    min: 8
+    mid: 9.0
+    max: 10
+  m_ll:
+    min: null
+    mid: 91.2
+    max: null
 - pT:
     min: 10
     mid: 11.0
     max: 12
-  m_Z2:
+  m_ll:
     min: null
-    mid: 8317.44
-    max: null
-  sqrts:
-    min: null
-    mid: 13000.0
+    mid: 91.2
     max: null
 - pT:
     min: 12
     mid: 13.0
     max: 14
-  m_Z2:
+  m_ll:
     min: null
-    mid: 8317.44
-    max: null
-  sqrts:
-    min: null
-    mid: 13000.0
+    mid: 91.2
     max: null
 - pT:
     min: 14
     mid: 15.0
     max: 16
-  m_Z2:
+  m_ll:
     min: null
-    mid: 8317.44
-    max: null
-  sqrts:
-    min: null
-    mid: 13000.0
+    mid: 91.2
     max: null
 - pT:
     min: 16
     mid: 17.0
     max: 18
-  m_Z2:
-    min: null
-    mid: 8317.44
-    max: null
-  sqrts:
+  m_ll:
     min: null
-    mid: 13000.0
+    mid: 91.2
     max: null
 - pT:
     min: 18
     mid: 19.0
     max: 20
-  m_Z2:
-    min: null
-    mid: 8317.44
-    max: null
-  sqrts:
+  m_ll:
     min: null
-    mid: 13000.0
+    mid: 91.2
     max: null
 - pT:
     min: 20
     mid: 21.25
     max: 22.5
-  m_Z2:
+  m_ll:
     min: null
-    mid: 8317.44
-    max: null
-  sqrts:
-    min: null
-    mid: 13000.0
+    mid: 91.2
     max: null
 - pT:
     min: 22.5
     mid: 23.75
     max: 25
-  m_Z2:
+  m_ll:
     min: null
-    mid: 8317.44
-    max: null
-  sqrts:
-    min: null
-    mid: 13000.0
+    mid: 91.2
     max: null
 - pT:
     min: 25
     mid: 26.25
     max: 27.5
-  m_Z2:
+  m_ll:
     min: null
-    mid: 8317.44
-    max: null
-  sqrts:
-    min: null
-    mid: 13000.0
+    mid: 91.2
     max: null
 - pT:
     min: 27.5
     mid: 28.75
     max: 30
-  m_Z2:
-    min: null
-    mid: 8317.44
-    max: null
-  sqrts:
+  m_ll:
     min: null
-    mid: 13000.0
+    mid: 91.2
     max: null
 - pT:
     min: 30
     mid: 31.5
     max: 33
-  m_Z2:
-    min: null
-    mid: 8317.44
-    max: null
-  sqrts:
+  m_ll:
     min: null
-    mid: 13000.0
+    mid: 91.2
     max: null
 - pT:
     min: 33
     mid: 34.5
     max: 36
-  m_Z2:
+  m_ll:
     min: null
-    mid: 8317.44
-    max: null
-  sqrts:
-    min: null
-    mid: 13000.0
+    mid: 91.2
     max: null
 - pT:
     min: 36
     mid: 37.5
     max: 39
-  m_Z2:
+  m_ll:
     min: null
-    mid: 8317.44
-    max: null
-  sqrts:
-    min: null
-    mid: 13000.0
+    mid: 91.2
     max: null
 - pT:
     min: 39
     mid: 40.5
     max: 42
-  m_Z2:
-    min: null
-    mid: 8317.44
-    max: null
-  sqrts:
+  m_ll:
     min: null
-    mid: 13000.0
+    mid: 91.2
     max: null
 - pT:
     min: 42
     mid: 43.5
     max: 45
-  m_Z2:
-    min: null
-    mid: 8317.44
-    max: null
-  sqrts:
+  m_ll:
     min: null
-    mid: 13000.0
+    mid: 91.2
     max: null
 - pT:
     min: 45
     mid: 46.5
     max: 48
-  m_Z2:
-    min: null
-    mid: 8317.44
-    max: null
-  sqrts:
+  m_ll:
     min: null
-    mid: 13000.0
+    mid: 91.2
     max: null
 - pT:
     min: 48
     mid: 49.5
     max: 51
-  m_Z2:
+  m_ll:
     min: null
-    mid: 8317.44
-    max: null
-  sqrts:
-    min: null
-    mid: 13000.0
+    mid: 91.2
     max: null
 - pT:
     min: 51
     mid: 52.5
     max: 54
-  m_Z2:
+  m_ll:
     min: null
-    mid: 8317.44
-    max: null
-  sqrts:
-    min: null
-    mid: 13000.0
+    mid: 91.2
     max: null
 - pT:
     min: 54
     mid: 55.5
     max: 57
-  m_Z2:
+  m_ll:
     min: null
-    mid: 8317.44
-    max: null
-  sqrts:
-    min: null
-    mid: 13000.0
+    mid: 91.2
     max: null
 - pT:
     min: 57
     mid: 59.0
     max: 61
-  m_Z2:
-    min: null
-    mid: 8317.44
-    max: null
-  sqrts:
+  m_ll:
     min: null
-    mid: 13000.0
+    mid: 91.2
     max: null
 - pT:
     min: 61
     mid: 63.0
     max: 65
-  m_Z2:
-    min: null
-    mid: 8317.44
-    max: null
-  sqrts:
+  m_ll:
     min: null
-    mid: 13000.0
+    mid: 91.2
     max: null
 - pT:
     min: 65
     mid: 67.5
     max: 70
-  m_Z2:
+  m_ll:
     min: null
-    mid: 8317.44
-    max: null
-  sqrts:
-    min: null
-    mid: 13000.0
+    mid: 91.2
     max: null
 - pT:
     min: 70
     mid: 72.5
     max: 75
-  m_Z2:
+  m_ll:
     min: null
-    mid: 8317.44
-    max: null
-  sqrts:
-    min: null
-    mid: 13000.0
+    mid: 91.2
     max: null
 - pT:
     min: 75
     mid: 77.5
     max: 80
-  m_Z2:
-    min: null
-    mid: 8317.44
-    max: null
-  sqrts:
+  m_ll:
     min: null
-    mid: 13000.0
+    mid: 91.2
     max: null
 - pT:
     min: 80
     mid: 82.5
     max: 85
-  m_Z2:
-    min: null
-    mid: 8317.44
-    max: null
-  sqrts:
+  m_ll:
     min: null
-    mid: 13000.0
+    mid: 91.2
     max: null
 - pT:
     min: 85
     mid: 90.0
     max: 95
-  m_Z2:
-    min: null
-    mid: 8317.44
-    max: null
-  sqrts:
+  m_ll:
     min: null
-    mid: 13000.0
+    mid: 91.2
     max: null
 - pT:
     min: 95
     mid: 100.0
     max: 105
-  m_Z2:
+  m_ll:
     min: null
-    mid: 8317.44
-    max: null
-  sqrts:
-    min: null
-    mid: 13000.0
+    mid: 91.2
     max: null
 - pT:
     min: 105
     mid: 115.0
     max: 125
-  m_Z2:
+  m_ll:
     min: null
-    mid: 8317.44
-    max: null
-  sqrts:
-    min: null
-    mid: 13000.0
+    mid: 91.2
     max: null
 - pT:
     min: 125
     mid: 137.5
     max: 150
-  m_Z2:
-    min: null
-    mid: 8317.44
-    max: null
-  sqrts:
+  m_ll:
     min: null
-    mid: 13000.0
+    mid: 91.2
     max: null
 - pT:
     min: 150
     mid: 162.5
     max: 175
-  m_Z2:
-    min: null
-    mid: 8317.44
-    max: null
-  sqrts:
+  m_ll:
     min: null
-    mid: 13000.0
+    mid: 91.2
     max: null
 - pT:
     min: 175
     mid: 187.5
     max: 200
-  m_Z2:
-    min: null
-    mid: 8317.44
-    max: null
-  sqrts:
+  m_ll:
     min: null
-    mid: 13000.0
+    mid: 91.2
     max: null
 - pT:
     min: 200
     mid: 225.0
     max: 250
-  m_Z2:
+  m_ll:
     min: null
-    mid: 8317.44
-    max: null
-  sqrts:
-    min: null
-    mid: 13000.0
+    mid: 91.2
     max: null
 - pT:
     min: 250
     mid: 275.0
     max: 300
-  m_Z2:
+  m_ll:
     min: null
-    mid: 8317.44
-    max: null
-  sqrts:
-    min: null
-    mid: 13000.0
+    mid: 91.2
     max: null
 - pT:
     min: 300
     mid: 325.0
     max: 350
-  m_Z2:
-    min: null
-    mid: 8317.44
-    max: null
-  sqrts:
+  m_ll:
     min: null
-    mid: 13000.0
+    mid: 91.2
     max: null
 - pT:
     min: 350
     mid: 375.0
     max: 400
-  m_Z2:
-    min: null
-    mid: 8317.44
-    max: null
-  sqrts:
+  m_ll:
     min: null
-    mid: 13000.0
+    mid: 91.2
     max: null
 - pT:
     min: 400
     mid: 435.0
     max: 470
-  m_Z2:
-    min: null
-    mid: 8317.44
-    max: null
-  sqrts:
+  m_ll:
     min: null
-    mid: 13000.0
+    mid: 91.2
     max: null
 - pT:
     min: 470
     mid: 510.0
     max: 550
-  m_Z2:
+  m_ll:
     min: null
-    mid: 8317.44
-    max: null
-  sqrts:
-    min: null
-    mid: 13000.0
+    mid: 91.2
     max: null
 - pT:
     min: 550
     mid: 600.0
     max: 650
-  m_Z2:
+  m_ll:
     min: null
-    mid: 8317.44
-    max: null
-  sqrts:
-    min: null
-    mid: 13000.0
+    mid: 91.2
     max: null
 - pT:
     min: 650
     mid: 775.0
     max: 900
-  m_Z2:
+  m_ll:
     min: null
-    mid: 8317.44
+    mid: 91.2
     max: null
-  sqrts:
+- pT:
+    min: 900
+    mid: 1700.0
+    max: 2500
+  m_ll:
     min: null
-    mid: 13000.0
+    mid: 91.2
     max: null
diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/metadata.yaml b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/metadata.yaml
index cc93946fd8..0afbbd4ea3 100644
--- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/metadata.yaml
+++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/metadata.yaml
@@ -1,8 +1,8 @@
 setname: "ATLAS_Z0J_13TEV_PT"
 
-version: 1
+version: 2
 
-version_comment: "Initial implementation, central values taken from table 26, systematics from table 5."
+version_comment: "This version fixes a bug and extends the implementation version 1. The bug is as follows: In the previous version two HepData tables were used, separately for the central value and for the uncertainties (Tables 26 and 5, respectively). However, it was not realised that the two differ for the bin normalisation, which is, on average, of 2 GeV. Uncertainties were therefore, on average, a factor of 2 smaller than what they should be. The extension is as follows: in the previous version only a subset of pT bins were implemented. The full pT spectrum is now implemented. The bugged version, used for the pheno paper, is removed, but can be retrieved from the github history."
 
 # References
 arXiv:
@@ -24,7 +24,7 @@ implemented_observables:
     label: r"$1/\sigma_{fid}d\\sigma/dp_{T}^{\\l\\l}$"
     units: "[1/GeV]"
 
-  ndata: 38
+  ndata: 41
 
   tables: [5]
   process_type: DY_NC_PT
@@ -34,26 +34,26 @@ implemented_observables:
     x_scale: log
     plot_x: pT
 
-  kinematic_coverage: [pT, m_Z2, sqrts]
+  kinematic_coverage: [pT, m_ll]
 
   kinematics:
     variables:
       pT: {description: "lepton pair transverse momentum", label: '$p_T$', units: ""}
-      m_Z2: {description: "Z boson mass squared", label: '$M_Z^2$', units: "GeV"}
-      sqrts: {description: "center of mass energy", label: '$\sqrt(s)$', units: "GeV"}
+      m_ll: {description: "lepton pair invariant mass", label: '$m_{\ell\ell}$', units: "GeV"}
 
     file: kinematics.yaml
 
-    # Data
   data_central: data.yaml
   data_uncertainties:
   - uncertainties.yaml
 
-    # Theory
+  # Theory
   theory:
-    shifts:
-      ATLAS_Z0J_13TEV_PT_LL: 9
+    #shifts:
+    #  ATLAS_Z0J_13TEV_PT_LL: 9
     FK_tables:
     - - ATLAS_Z0J_13TEV_PT_LL
     - - ATLAS_Z0_13TEV_TOT
     operation: 'ratio'
+
+      
\ No newline at end of file
diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/rawdata/HEPData-ins1768911-v3-Table_4a.yaml b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/rawdata/HEPData-ins1768911-v3-Table_4a.yaml
new file mode 100644
index 0000000000..ffcac3a194
--- /dev/null
+++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/rawdata/HEPData-ins1768911-v3-Table_4a.yaml
@@ -0,0 +1,272 @@
+dependent_variables:
+- header: {name: '$1/\sigma_{fid} \times d\sigma/dp_{T}^{ll}$', units: 1/GEV}
+  values:
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.146737%}
+    - {label: uncorrelated uncertainty, symerror: 0.182654%}
+    value: 0.024189
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.0545108%}
+    - {label: uncorrelated uncertainty, symerror: 0.0780657%}
+    value: 0.0511438
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.0506089%}
+    - {label: uncorrelated uncertainty, symerror: 0.0749981%}
+    value: 0.0532324
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.0455932%}
+    - {label: uncorrelated uncertainty, symerror: 0.0802127%}
+    value: 0.0473835
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.042823%}
+    - {label: uncorrelated uncertainty, symerror: 0.0902423%}
+    value: 0.0405684
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.0600343%}
+    - {label: uncorrelated uncertainty, symerror: 0.107591%}
+    value: 0.0343165
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.0707218%}
+    - {label: uncorrelated uncertainty, symerror: 0.124372%}
+    value:  0.0291566
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.0609953%}
+    - {label: uncorrelated uncertainty, symerror: 0.136582%}
+    value: 0.0248037
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.0461217%}
+    - {label: uncorrelated uncertainty, symerror: 0.145373%}
+    value: 0.021268
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.034637%}
+    - {label: uncorrelated uncertainty, symerror: 0.156366%}
+    value: 0.018325
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.025768%}
+    - {label: uncorrelated uncertainty, symerror: 0.1367%}
+    value: 0.0156045
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.0339854%}
+    - {label: uncorrelated uncertainty, symerror: 0.152269%}
+    value: 0.01318
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.0411065%}
+    - {label: uncorrelated uncertainty, symerror: 0.168553%}  
+    value: 0.0112073
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.0508971%}
+    - {label: uncorrelated uncertainty, symerror: 0.186374%}
+    value: 0.00955676
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.0594864%}
+    - {label: uncorrelated uncertainty, symerror: 0.172167%}
+    value: 0.00810287
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.0779726%} 
+    - {label: uncorrelated uncertainty, symerror: 0.194268%}
+    value: 0.00678809
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.0936059%}
+    - {label: uncorrelated uncertainty, symerror: 0.213769%}
+    value: 0.00575628
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.115529%}
+    - {label: uncorrelated uncertainty, symerror: 0.231418%}
+    value: 0.00487686
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.12481%}
+    - {label: uncorrelated uncertainty, symerror: 0.254212%}
+    value: 0.00416884
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.144971%}
+    - {label: uncorrelated uncertainty, symerror: 0.282523%}
+    value: 0.00352131
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.167357%}
+    - {label: uncorrelated uncertainty, symerror: 0.314478%}
+    value: 0.00297507
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.182218%}
+    - {label: uncorrelated uncertainty, symerror: 0.345915%}
+    value: 0.00254333
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.199666%}
+    - {label: uncorrelated uncertainty, symerror: 0.378715%}
+    value: 0.00218319
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.15297%}
+    - {label: uncorrelated uncertainty, symerror: 0.309867%}
+    value: 0.00187701
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.165993%}
+    - {label: uncorrelated uncertainty, symerror: 0.351415%}
+    value: 0.0015932
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.155726%}
+    - {label: uncorrelated uncertainty, symerror: 0.320541%}
+    value: 0.00135193
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.173562%}
+    - {label: uncorrelated uncertainty, symerror: 0.373781%}
+    value: 0.0011323
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.20141%}
+    - {label: uncorrelated uncertainty, symerror: 0.429775%}
+    value: 0.00095743
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.222191%}
+    - {label: uncorrelated uncertainty, symerror: 0.489079%}
+    value: 0.000814977
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.140104%}
+    - {label: uncorrelated uncertainty, symerror: 0.286435%}
+    value: 0.000653718
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.176807%}    
+    - {label: uncorrelated uncertainty, symerror: 0.365727%}
+    value: 0.000484859
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.123019%}
+    - {label: uncorrelated uncertainty, symerror: 0.24768%}
+    value: 0.000329051
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.157454%}
+    - {label: uncorrelated uncertainty, symerror: 0.318812%}
+    value: 0.000186048
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.23722%}
+    - {label: uncorrelated uncertainty, symerror: 0.507926%}
+    value: 0.000104998
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.302697%}
+    - {label: uncorrelated uncertainty, symerror: 0.781114%}
+    value: 6.12794e-05
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.219307%}
+    - {label: uncorrelated uncertainty, symerror: 0.65891%}
+    value: 3.0584e-05
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.344574%}
+    - {label: uncorrelated uncertainty, symerror: 1.38523%}
+    value: 1.22113e-05
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.561799%}
+    - {label: uncorrelated uncertainty, symerror: 2.25044%}
+    value: 5.90263e-06
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.897993%}
+    - {label: uncorrelated uncertainty, symerror: 3.75137%}
+    value: 2.77421e-06
+  - errors:
+    - {label: correlated uncertainty, symerror: 0.824661%}
+    - {label: uncorrelated uncertainty, symerror: 4.87351%}
+    value:  1.25134e-06
+  - errors:
+    - {label: correlated uncertainty, symerror: 1.15515%}
+    - {label: uncorrelated uncertainty, symerror: 7.90601%}
+    value: 5.5219e-07
+  - errors:
+    - {label: correlated uncertainty, symerror: 1.54467%}
+    - {label: uncorrelated uncertainty, symerror: 12.8626%}
+    value: 2.01646e-07
+  - errors:
+    - {label: correlated uncertainty, symerror: 1.82228%}
+    - {label: uncorrelated uncertainty, symerror: 15.7307%}
+    value: 5.11526e-08
+  - errors:
+    - {label: correlated uncertainty, symerror: 6.30741%}
+    - {label: uncorrelated uncertainty, symerror: 60.3046%}
+    value: 2.51767e-06
+- header: {name: '$k_{dressed}$'}
+  values:
+  - {value: 0.978339}
+  - {value: 0.984972}
+  - {value: 0.994351}
+  - {value: 1.0028}
+  - {value: 1.00782}
+  - {value: 1.01148}
+  - {value: 1.01278}
+  - {value: 1.01303}
+  - {value: 1.01202}
+  - {value: 1.00898}
+  - {value: 1.00616}
+  - {value: 1.00317}
+  - {value: 0.999679}
+  - {value: 0.999156}
+  - {value: 0.997824}
+  - {value: 0.99582}
+  - {value: 0.993993}
+  - {value: 0.992858}
+  - {value: 0.991661}
+  - {value: 0.99251}
+  - {value: 0.991217}
+  - {value: 0.992147}
+  - {value: 0.993846}
+  - {value: 0.994163}
+  - {value: 0.993764}
+  - {value: 0.99512}
+  - {value: 0.995087}
+  - {value: 0.9953}
+  - {value: 0.994741}
+  - {value: 0.995926}
+  - {value: 0.995122}
+  - {value: 0.995673}
+  - {value: 0.994211}
+  - {value: 0.993365}
+  - {value: 0.992277}
+  - {value: 0.995338}
+  - {value: 0.997277}
+  - {value: 0.99423}
+  - {value: 0.991436}
+  - {value: 0.990586}
+  - {value: 0.993825}
+  - {value: 0.995003}
+  - {value: 0.989972}
+  - {value: 0.963637}
+independent_variables:
+- header: {name: 'Bin $p_{T}^{ll}$', units: GEV}
+  values:
+  - {high: 2, low: 0}
+  - {high: 4, low: 2}
+  - {high: 6, low: 4}
+  - {high: 8, low: 6}
+  - {high: 10, low: 8}
+  - {high: 12, low: 10}
+  - {high: 14, low: 12}
+  - {high: 16, low: 14}
+  - {high: 18, low: 16}
+  - {high: 20, low: 18}
+  - {high: 22.5, low: 20}
+  - {high: 25, low: 22.5}
+  - {high: 27.5, low: 25}
+  - {high: 30, low: 27.5}
+  - {high: 33, low: 30}
+  - {high: 36, low: 33}
+  - {high: 39, low: 36}
+  - {high: 42, low: 39}
+  - {high: 45, low: 42}
+  - {high: 48, low: 45}
+  - {high: 51, low: 48}
+  - {high: 54, low: 51}
+  - {high: 57, low: 54}
+  - {high: 61, low: 57}
+  - {high: 65, low: 61}
+  - {high: 70, low: 65}
+  - {high: 75, low: 70}
+  - {high: 80, low: 75}
+  - {high: 85, low: 80}
+  - {high: 95, low: 85}
+  - {high: 105, low: 95}
+  - {high: 125, low: 105}
+  - {high: 150, low: 125}
+  - {high: 175, low: 150}
+  - {high: 200, low: 175}
+  - {high: 250, low: 200}
+  - {high: 300, low: 250}
+  - {high: 350, low: 300}
+  - {high: 400, low: 350}
+  - {high: 470, low: 400}
+  - {high: 550, low: 470}
+  - {high: 650, low: 550}
+  - {high: 900, low: 650}
+  - {high: 2500, low: 900}
diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/rawdata/HEPData-ins1768911-v3-Table_5.yaml b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/rawdata/HEPData-ins1768911-v3-Table_5.yaml
deleted file mode 100644
index b6490ec293..0000000000
--- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/rawdata/HEPData-ins1768911-v3-Table_5.yaml
+++ /dev/null
@@ -1,738 +0,0 @@
-dependent_variables:
-- header: {name: '$1/\sigma_{fid}d\sigma/dp_{T}^{\mu\mu}$', units: 1/GEV}
-  values:
-  - {value: 0.0483485}
-  - {value: 0.102336}
-  - {value: 0.106454}
-  - {value: 0.0949447}
-  - {value: 0.0811024}
-  - {value: 0.068568}
-  - {value: 0.0583926}
-  - {value: 0.0495932}
-  - {value: 0.0426003}
-  - {value: 0.0365929}
-  - {value: 0.039024}
-  - {value: 0.0328605}
-  - {value: 0.0280475}
-  - {value: 0.0238817}
-  - {value: 0.0242942}
-  - {value: 0.0203863}
-  - {value: 0.0172779}
-  - {value: 0.0146252}
-  - {value: 0.0124869}
-  - {value: 0.0105421}
-  - {value: 0.00896744}
-  - {value: 0.00760829}
-  - {value: 0.00648499}
-  - {value: 0.00752818}
-  - {value: 0.00635331}
-  - {value: 0.00675757}
-  - {value: 0.00565293}
-  - {value: 0.00477561}
-  - {value: 0.00405529}
-  - {value: 0.00652509}
-  - {value: 0.00486299}
-  - {value: 0.00656466}
-  - {value: 0.00463292}
-  - {value: 0.0026228}
-  - {value: 0.00151905}
-  - {value: 0.00152326}
-  - {value: 0.000600594}
-  - {value: 0.000295887}
-  - {value: 0.00014254}
-  - {value: 8.61709e-05}
-  - {value: 4.60894e-05}
-  - {value: 2.04842e-05}
-  - {value: 1.25171e-05}
-  - {value: 2.59777e-06}
-- header: {name: Stat (Data)}
-  values:
-  - {value: 8.35956e-05}
-  - {value: 7.67909e-05}
-  - {value: 7.58289e-05}
-  - {value: 7.48749e-05}
-  - {value: 7.33895e-05}
-  - {value: 7.17653e-05}
-  - {value: 6.94675e-05}
-  - {value: 6.63969e-05}
-  - {value: 6.17612e-05}
-  - {value: 5.77664e-05}
-  - {value: 5.39635e-05}
-  - {value: 5.06942e-05}
-  - {value: 4.75316e-05}
-  - {value: 4.48241e-05}
-  - {value: 4.20221e-05}
-  - {value: 4.00194e-05}
-  - {value: 3.7446e-05}
-  - {value: 3.4088e-05}
-  - {value: 3.18739e-05}
-  - {value: 3.01246e-05}
-  - {value: 2.84876e-05}
-  - {value: 2.70051e-05}
-  - {value: 2.53968e-05}
-  - {value: 2.38027e-05}
-  - {value: 2.30294e-05}
-  - {value: 2.23957e-05}
-  - {value: 2.19764e-05}
-  - {value: 2.13142e-05}
-  - {value: 2.07709e-05}
-  - {value: 1.94042e-05}
-  - {value: 1.84027e-05}
-  - {value: 1.68795e-05}
-  - {value: 1.51898e-05}
-  - {value: 1.35198e-05}
-  - {value: 1.20941e-05}
-  - {value: 1.02064e-05}
-  - {value: 8.57885e-06}
-  - {value: 6.71408e-06}
-  - {value: 5.30023e-06}
-  - {value: 4.3265e-06}
-  - {value: 3.51926e-06}
-  - {value: 2.7789e-06}
-  - {value: 2.16589e-06}
-  - {value: 1.74143e-06}
-- header: {name: Stat (MC)}
-  values:
-  - {value: 6.37438e-05}
-  - {value: 5.83828e-05}
-  - {value: 5.82812e-05}
-  - {value: 5.73778e-05}
-  - {value: 5.61428e-05}
-  - {value: 5.474e-05}
-  - {value: 5.2111e-05}
-  - {value: 4.86351e-05}
-  - {value: 4.51803e-05}
-  - {value: 4.23546e-05}
-  - {value: 3.97985e-05}
-  - {value: 3.74849e-05}
-  - {value: 3.53303e-05}
-  - {value: 3.3345e-05}
-  - {value: 3.14638e-05}
-  - {value: 2.96676e-05}
-  - {value: 2.75656e-05}
-  - {value: 2.56061e-05}
-  - {value: 2.40094e-05}
-  - {value: 2.25086e-05}
-  - {value: 2.1003e-05}
-  - {value: 1.96268e-05}
-  - {value: 1.8331e-05}
-  - {value: 1.71423e-05}
-  - {value: 1.64036e-05}
-  - {value: 1.56341e-05}
-  - {value: 1.51939e-05}
-  - {value: 1.46701e-05}
-  - {value: 1.40044e-05}
-  - {value: 1.30219e-05}
-  - {value: 1.21705e-05}
-  - {value: 1.10661e-05}
-  - {value: 9.98235e-06}
-  - {value: 8.93984e-06}
-  - {value: 7.9546e-06}
-  - {value: 6.66204e-06}
-  - {value: 5.54456e-06}
-  - {value: 4.25548e-06}
-  - {value: 3.18385e-06}
-  - {value: 2.61206e-06}
-  - {value: 2.15748e-06}
-  - {value: 1.6112e-06}
-  - {value: 1.26463e-06}
-  - {value: 1.00279e-06}
-- header: {name: Efficiencies (Uncorellated)}
-  values:
-  - {value: 9.95475e-06}
-  - {value: 8.43697e-06}
-  - {value: 8.39228e-06}
-  - {value: 8.02855e-06}
-  - {value: 7.62052e-06}
-  - {value: 7.12003e-06}
-  - {value: 6.10127e-06}
-  - {value: 4.94684e-06}
-  - {value: 3.89108e-06}
-  - {value: 2.98307e-06}
-  - {value: 2.29224e-06}
-  - {value: 1.84072e-06}
-  - {value: 1.47619e-06}
-  - {value: 1.19656e-06}
-  - {value: 1.05868e-06}
-  - {value: 1.01334e-06}
-  - {value: 9.52163e-07}
-  - {value: 9.32742e-07}
-  - {value: 1.0063e-06}
-  - {value: 1.12277e-06}
-  - {value: 1.26063e-06}
-  - {value: 1.33511e-06}
-  - {value: 1.37111e-06}
-  - {value: 1.39809e-06}
-  - {value: 1.50361e-06}
-  - {value: 1.6905e-06}
-  - {value: 2.25177e-06}
-  - {value: 2.9503e-06}
-  - {value: 3.4922e-06}
-  - {value: 3.90433e-06}
-  - {value: 4.5605e-06}
-  - {value: 4.88845e-06}
-  - {value: 5.02588e-06}
-  - {value: 5.0556e-06}
-  - {value: 5.01282e-06}
-  - {value: 4.83028e-06}
-  - {value: 4.5748e-06}
-  - {value: 3.9375e-06}
-  - {value: 3.44839e-06}
-  - {value: 3.04439e-06}
-  - {value: 2.66722e-06}
-  - {value: 1.80584e-06}
-  - {value: 1.20132e-06}
-  - {value: 0}
-- header: {name: Scale}
-  values:
-  - {value: 8.06284e-05}
-  - {value: 6.27959e-05}
-  - {value: 6.48323e-05}
-  - {value: 5.68417e-05}
-  - {value: 3.77564e-05}
-  - {value: 1.98692e-05}
-  - {value: 6.02976e-06}
-  - {value: -2.79757e-06}
-  - {value: -6.10522e-06}
-  - {value: -1.10568e-05}
-  - {value: -1.23219e-05}
-  - {value: -1.52471e-05}
-  - {value: -1.60245e-05}
-  - {value: -1.56591e-05}
-  - {value: -1.70632e-05}
-  - {value: -1.85262e-05}
-  - {value: -1.85507e-05}
-  - {value: -1.98298e-05}
-  - {value: -1.78683e-05}
-  - {value: -1.78014e-05}
-  - {value: -1.74292e-05}
-  - {value: -1.61827e-05}
-  - {value: -1.48547e-05}
-  - {value: -1.26621e-05}
-  - {value: -1.08967e-05}
-  - {value: -9.89894e-06}
-  - {value: -9.34883e-06}
-  - {value: -8.15195e-06}
-  - {value: -6.65262e-06}
-  - {value: -6.49504e-06}
-  - {value: -5.68654e-06}
-  - {value: -5.25178e-06}
-  - {value: -4.52099e-06}
-  - {value: -3.3474e-06}
-  - {value: -2.65642e-06}
-  - {value: -1.86636e-06}
-  - {value: -1.01055e-06}
-  - {value: -7.28519e-07}
-  - {value: -4.23367e-07}
-  - {value: -2.73916e-07}
-  - {value: -1.28097e-07}
-  - {value: -9.40508e-08}
-  - {value: -6.31804e-08}
-  - {value: -4.99628e-08}
-- header: {name: Resolution}
-  values:
-  - {value: -4.28443e-05}
-  - {value: -7.05279e-05}
-  - {value: -7.26597e-05}
-  - {value: -3.63975e-05}
-  - {value: 1.97555e-05}
-  - {value: 5.84463e-05}
-  - {value: 6.11683e-05}
-  - {value: 4.96738e-05}
-  - {value: 3.30354e-05}
-  - {value: 2.60181e-05}
-  - {value: 2.03084e-05}
-  - {value: 1.38317e-05}
-  - {value: 1.20235e-05}
-  - {value: 8.07986e-06}
-  - {value: 4.19756e-06}
-  - {value: 1.49509e-06}
-  - {value: 7.40895e-07}
-  - {value: 2.58524e-06}
-  - {value: 4.52804e-06}
-  - {value: 2.34797e-06}
-  - {value: 1.90124e-06}
-  - {value: 1.68493e-06}
-  - {value: 8.46977e-07}
-  - {value: 1.00756e-06}
-  - {value: 9.59722e-07}
-  - {value: -6.45403e-08}
-  - {value: -1.17319e-07}
-  - {value: 1.33488e-06}
-  - {value: 1.17755e-06}
-  - {value: 4.24838e-07}
-  - {value: 5.09838e-07}
-  - {value: 2.18449e-08}
-  - {value: 3.78211e-07}
-  - {value: 1.48667e-06}
-  - {value: 3.6665e-07}
-  - {value: 1.29541e-07}
-  - {value: 3.58043e-07}
-  - {value: 7.01139e-08}
-  - {value: 1.97343e-07}
-  - {value: 1.35954e-07}
-  - {value: -3.82766e-08}
-  - {value: 3.78e-08}
-  - {value: 9.05661e-08}
-  - {value: 1.15136e-07}
-- header: {name: Muon Saggita}
-  values:
-  - {value: 7.43367e-07}
-  - {value: -7.73359e-06}
-  - {value: -8.38056e-07}
-  - {value: -1.86534e-06}
-  - {value: 1.3535e-06}
-  - {value: 4.87774e-06}
-  - {value: 3.25268e-06}
-  - {value: 9.75616e-07}
-  - {value: 2.83518e-06}
-  - {value: 1.95059e-06}
-  - {value: 1.12455e-06}
-  - {value: 1.54483e-06}
-  - {value: 1.77062e-06}
-  - {value: 1.6488e-06}
-  - {value: 3.16e-06}
-  - {value: 2.9723e-06}
-  - {value: 1.76665e-06}
-  - {value: 6.17704e-07}
-  - {value: 5.04182e-07}
-  - {value: -1.57807e-07}
-  - {value: 7.91841e-07}
-  - {value: -5.67574e-07}
-  - {value: -1.53013e-06}
-  - {value: -7.67405e-07}
-  - {value: -5.12532e-07}
-  - {value: -8.38272e-08}
-  - {value: 1.17481e-07}
-  - {value: -6.24295e-07}
-  - {value: -1.88947e-07}
-  - {value: -5.19957e-07}
-  - {value: -1.45038e-07}
-  - {value: 1.67385e-07}
-  - {value: 1.90734e-07}
-  - {value: -1.2971e-07}
-  - {value: 2.11125e-07}
-  - {value: -7.20025e-09}
-  - {value: 5.50235e-07}
-  - {value: -7.57883e-08}
-  - {value: 2.2637e-08}
-  - {value: 4.65252e-08}
-  - {value: -6.08179e-08}
-  - {value: -8.05586e-08}
-  - {value: -2.08975e-07}
-  - {value: -1.48298e-07}
-- header: {name: Efficiencies (Corellated)}
-  values:
-  - {value: 3.87313e-07}
-  - {value: 3.34268e-07}
-  - {value: 3.31919e-07}
-  - {value: 3.07232e-07}
-  - {value: 2.53077e-07}
-  - {value: 1.95681e-07}
-  - {value: 1.52499e-07}
-  - {value: 1.32704e-07}
-  - {value: 1.27998e-07}
-  - {value: 1.23313e-07}
-  - {value: 1.21131e-07}
-  - {value: 1.17825e-07}
-  - {value: 1.21933e-07}
-  - {value: 1.27991e-07}
-  - {value: 1.24853e-07}
-  - {value: 1.15733e-07}
-  - {value: 1.13246e-07}
-  - {value: 1.05721e-07}
-  - {value: 9.42208e-08}
-  - {value: 7.8914e-08}
-  - {value: 7.02334e-08}
-  - {value: 6.0653e-08}
-  - {value: 5.48623e-08}
-  - {value: 4.72786e-08}
-  - {value: 4.34535e-08}
-  - {value: 4.19056e-08}
-  - {value: 4.39376e-08}
-  - {value: 4.28303e-08}
-  - {value: 4.68971e-08}
-  - {value: 5.24325e-08}
-  - {value: 5.77501e-08}
-  - {value: 5.8729e-08}
-  - {value: 6.20607e-08}
-  - {value: 6.06227e-08}
-  - {value: 5.81755e-08}
-  - {value: 5.07157e-08}
-  - {value: 4.06072e-08}
-  - {value: 3.23173e-08}
-  - {value: 2.60259e-08}
-  - {value: 1.76095e-08}
-  - {value: 1.34607e-08}
-  - {value: 1.04764e-08}
-  - {value: 8.54736e-09}
-  - {value: 0}
-- header: {name: Isolation}
-  values:
-  - {value: -4.18797e-07}
-  - {value: -2.568e-07}
-  - {value: -2.84694e-07}
-  - {value: -3.05259e-07}
-  - {value: -3.21406e-07}
-  - {value: -2.92554e-07}
-  - {value: -2.18755e-07}
-  - {value: -1.42078e-07}
-  - {value: -7.13211e-08}
-  - {value: -1.24541e-08}
-  - {value: 3.40861e-08}
-  - {value: 7.36893e-08}
-  - {value: 1.05107e-07}
-  - {value: 1.3236e-07}
-  - {value: 1.53502e-07}
-  - {value: 1.65516e-07}
-  - {value: 1.67276e-07}
-  - {value: 1.6175e-07}
-  - {value: 1.46781e-07}
-  - {value: 1.28402e-07}
-  - {value: 1.06839e-07}
-  - {value: 8.23239e-08}
-  - {value: 5.7094e-08}
-  - {value: 3.51944e-08}
-  - {value: 1.79093e-08}
-  - {value: 4.49587e-09}
-  - {value: -1.10006e-08}
-  - {value: -2.44197e-08}
-  - {value: -3.42587e-08}
-  - {value: -3.45687e-08}
-  - {value: -2.76893e-08}
-  - {value: -1.45591e-08}
-  - {value: 5.49643e-09}
-  - {value: 2.20514e-08}
-  - {value: 3.55273e-08}
-  - {value: 5.03334e-08}
-  - {value: 5.54564e-08}
-  - {value: 5.67922e-08}
-  - {value: 6.69081e-08}
-  - {value: 6.70416e-08}
-  - {value: 6.52608e-08}
-  - {value: 6.94277e-08}
-  - {value: 7.33839e-08}
-  - {value: 8.46319e-08}
-- header: {name: Trigger}
-  values:
-  - {value: 3.75372e-07}
-  - {value: 2.52567e-07}
-  - {value: 2.76859e-07}
-  - {value: 2.37779e-07}
-  - {value: 2.10548e-07}
-  - {value: 1.15319e-07}
-  - {value: 9.71047e-08}
-  - {value: 8.05904e-08}
-  - {value: 8.29725e-08}
-  - {value: 5.55809e-08}
-  - {value: 8.62634e-08}
-  - {value: 9.41138e-08}
-  - {value: 9.55364e-08}
-  - {value: 9.55465e-08}
-  - {value: 9.70565e-08}
-  - {value: 1.00412e-07}
-  - {value: 1.12278e-07}
-  - {value: 8.81191e-08}
-  - {value: 8.81487e-08}
-  - {value: 9.25549e-08}
-  - {value: 1.04588e-07}
-  - {value: 9.02184e-08}
-  - {value: 8.77286e-08}
-  - {value: 7.78705e-08}
-  - {value: 6.66279e-08}
-  - {value: 5.70898e-08}
-  - {value: 6.6948e-08}
-  - {value: 5.68307e-08}
-  - {value: 4.72464e-08}
-  - {value: 3.84579e-08}
-  - {value: 2.90513e-08}
-  - {value: 2.99702e-08}
-  - {value: 2.97613e-08}
-  - {value: 1.31443e-08}
-  - {value: 5.87751e-09}
-  - {value: 4.42277e-09}
-  - {value: 3.94941e-09}
-  - {value: 3.41196e-09}
-  - {value: 1.96811e-09}
-  - {value: 1.48804e-09}
-  - {value: 1.47186e-09}
-  - {value: 1.43169e-09}
-  - {value: 1.04108e-09}
-  - {value: 1.23154e-09}
-- header: {name: Muon (TTVA)}
-  values:
-  - {value: 1.31656e-07}
-  - {value: 1.10606e-07}
-  - {value: 1.16966e-07}
-  - {value: 9.84276e-08}
-  - {value: 6.50403e-08}
-  - {value: 3.40175e-08}
-  - {value: 2.47162e-08}
-  - {value: 2.73643e-08}
-  - {value: 3.07492e-08}
-  - {value: 3.15496e-08}
-  - {value: 4.03474e-08}
-  - {value: 4.85094e-08}
-  - {value: 6.22857e-08}
-  - {value: 6.6568e-08}
-  - {value: 6.23622e-08}
-  - {value: 6.4541e-08}
-  - {value: 6.18923e-08}
-  - {value: 5.92534e-08}
-  - {value: 5.41781e-08}
-  - {value: 4.11462e-08}
-  - {value: 3.44895e-08}
-  - {value: 2.86764e-08}
-  - {value: 2.41059e-08}
-  - {value: 2.10892e-08}
-  - {value: 1.48838e-08}
-  - {value: 1.43036e-08}
-  - {value: 1.85314e-08}
-  - {value: 1.78049e-08}
-  - {value: 1.88156e-08}
-  - {value: 1.87857e-08}
-  - {value: 1.83084e-08}
-  - {value: 1.78685e-08}
-  - {value: 1.60882e-08}
-  - {value: 1.0181e-08}
-  - {value: 7.66417e-09}
-  - {value: 5.04696e-09}
-  - {value: 3.29871e-09}
-  - {value: 2.47786e-09}
-  - {value: 1.53263e-09}
-  - {value: 7.49586e-10}
-  - {value: 3.26564e-10}
-  - {value: 3.50994e-10}
-  - {value: 3.04279e-10}
-  - {value: 3.20122e-10}
-- header: {name: Z-vertex reweighting}
-  values:
-  - {value: 6.07862e-07}
-  - {value: -9.78373e-07}
-  - {value: -7.84356e-08}
-  - {value: -3.15197e-07}
-  - {value: 6.92879e-08}
-  - {value: 1.45025e-07}
-  - {value: -1.00394e-07}
-  - {value: -1.59619e-07}
-  - {value: 1.00215e-07}
-  - {value: 2.27018e-08}
-  - {value: -1.27428e-07}
-  - {value: -1.52972e-07}
-  - {value: -2.7066e-07}
-  - {value: -1.97182e-08}
-  - {value: 8.22088e-08}
-  - {value: 8.99594e-08}
-  - {value: 3.73921e-08}
-  - {value: 1.61865e-07}
-  - {value: 2.84696e-07}
-  - {value: 3.49903e-07}
-  - {value: 6.95854e-08}
-  - {value: -4.72017e-08}
-  - {value: -6.21159e-08}
-  - {value: 5.48967e-08}
-  - {value: 6.94822e-08}
-  - {value: 7.28613e-08}
-  - {value: 2.04456e-08}
-  - {value: 3.99906e-08}
-  - {value: 1.90233e-07}
-  - {value: 1.9247e-07}
-  - {value: 2.09709e-07}
-  - {value: 1.87948e-07}
-  - {value: 1.36273e-07}
-  - {value: 1.56472e-07}
-  - {value: 1.86299e-07}
-  - {value: 1.21902e-07}
-  - {value: 7.91474e-08}
-  - {value: 1.98127e-08}
-  - {value: 1.32503e-08}
-  - {value: 3.37543e-08}
-  - {value: 1.28093e-08}
-  - {value: 5.65969e-09}
-  - {value: -7.63006e-09}
-  - {value: -6.05567e-09}
-- header: {name: Pile-Up}
-  values:
-  - {value: 2.9157e-05}
-  - {value: -1.17836e-05}
-  - {value: 1.58838e-05}
-  - {value: -2.24518e-06}
-  - {value: -1.71301e-06}
-  - {value: 5.05812e-07}
-  - {value: -7.96941e-06}
-  - {value: -6.7597e-06}
-  - {value: -5.00779e-07}
-  - {value: 3.02638e-06}
-  - {value: -2.07097e-06}
-  - {value: 7.05864e-07}
-  - {value: -1.85933e-06}
-  - {value: -2.63947e-06}
-  - {value: -6.2528e-06}
-  - {value: 2.01307e-06}
-  - {value: 3.8748e-06}
-  - {value: 4.30215e-06}
-  - {value: 5.96245e-06}
-  - {value: 3.93887e-06}
-  - {value: 1.66478e-06}
-  - {value: 1.86437e-06}
-  - {value: -1.53326e-06}
-  - {value: -2.54874e-06}
-  - {value: -4.28194e-06}
-  - {value: -6.36055e-06}
-  - {value: -4.71622e-06}
-  - {value: -3.52917e-06}
-  - {value: -2.83033e-06}
-  - {value: -1.92523e-06}
-  - {value: -2.24286e-06}
-  - {value: -1.31029e-06}
-  - {value: -1.44537e-06}
-  - {value: -3.4362e-07}
-  - {value: 1.57331e-07}
-  - {value: -1.60957e-06}
-  - {value: -4.53731e-07}
-  - {value: -2.60461e-08}
-  - {value: 2.11241e-07}
-  - {value: -3.27592e-07}
-  - {value: -4.9854e-07}
-  - {value: 2.46545e-07}
-  - {value: -1.12114e-07}
-  - {value: 3.25105e-09}
-- header: {name: Model}
-  values:
-  - {value: 2.25619e-05}
-  - {value: -4.51831e-05}
-  - {value: 8.19483e-07}
-  - {value: -1.03865e-05}
-  - {value: 1.17742e-05}
-  - {value: -1.11864e-05}
-  - {value: -1.47197e-05}
-  - {value: -3.52029e-06}
-  - {value: 8.49558e-06}
-  - {value: -5.49603e-06}
-  - {value: 2.01242e-06}
-  - {value: -6.19182e-06}
-  - {value: 1.60522e-06}
-  - {value: -2.45685e-06}
-  - {value: -4.081e-07}
-  - {value: -3.29613e-06}
-  - {value: 2.62187e-06}
-  - {value: 2.60744e-08}
-  - {value: 1.08053e-06}
-  - {value: 2.94885e-06}
-  - {value: 2.81772e-06}
-  - {value: 4.04169e-06}
-  - {value: 4.70821e-06}
-  - {value: 4.38535e-06}
-  - {value: 5.17698e-06}
-  - {value: 6.56265e-06}
-  - {value: 5.13726e-06}
-  - {value: 7.06317e-06}
-  - {value: 6.57973e-06}
-  - {value: 7.42633e-06}
-  - {value: 6.24654e-06}
-  - {value: 6.94908e-06}
-  - {value: 5.20604e-06}
-  - {value: 5.02928e-06}
-  - {value: 3.53347e-06}
-  - {value: 2.413e-06}
-  - {value: 1.38539e-06}
-  - {value: 1.11055e-06}
-  - {value: 4.41613e-07}
-  - {value: 4.21401e-07}
-  - {value: -1.26955e-08}
-  - {value: 1.62069e-07}
-  - {value: 1.12009e-07}
-  - {value: -7.93151e-08}
-- header: {name: Background}
-  values:
-  - {value: 2.89323e-06}
-  - {value: 2.39593e-06}
-  - {value: 2.58874e-06}
-  - {value: 2.56676e-06}
-  - {value: 2.6144e-06}
-  - {value: 2.53068e-06}
-  - {value: 2.40286e-06}
-  - {value: 2.39151e-06}
-  - {value: 2.44995e-06}
-  - {value: 2.43522e-06}
-  - {value: 2.50026e-06}
-  - {value: 2.64906e-06}
-  - {value: 2.75984e-06}
-  - {value: 2.92749e-06}
-  - {value: 3.035e-06}
-  - {value: 3.12866e-06}
-  - {value: 3.22543e-06}
-  - {value: 3.35076e-06}
-  - {value: 3.3264e-06}
-  - {value: 3.3412e-06}
-  - {value: 3.53285e-06}
-  - {value: 3.6471e-06}
-  - {value: 3.85463e-06}
-  - {value: 4.07802e-06}
-  - {value: 4.19639e-06}
-  - {value: 4.29432e-06}
-  - {value: 5.11883e-06}
-  - {value: 5.61711e-06}
-  - {value: 6.48474e-06}
-  - {value: 6.60558e-06}
-  - {value: 6.3272e-06}
-  - {value: 5.94929e-06}
-  - {value: 5.65289e-06}
-  - {value: 4.50194e-06}
-  - {value: 3.39571e-06}
-  - {value: 1.95583e-06}
-  - {value: 1.1472e-06}
-  - {value: 7.45763e-07}
-  - {value: 5.08448e-07}
-  - {value: 2.68876e-07}
-  - {value: 1.52496e-07}
-  - {value: 1.01672e-07}
-  - {value: 7.4095e-08}
-  - {value: 5.26604e-08}
-independent_variables:
-- header: {name: 'Bin $p_{T}^{\mu\mu}$', units: GEV}
-  values:
-  - {high: 2, low: 0}
-  - {high: 4, low: 2}
-  - {high: 6, low: 4}
-  - {high: 8, low: 6}
-  - {high: 10, low: 8}
-  - {high: 12, low: 10}
-  - {high: 14, low: 12}
-  - {high: 16, low: 14}
-  - {high: 18, low: 16}
-  - {high: 20, low: 18}
-  - {high: 22.5, low: 20}
-  - {high: 25, low: 22.5}
-  - {high: 27.5, low: 25}
-  - {high: 30, low: 27.5}
-  - {high: 33, low: 30}
-  - {high: 36, low: 33}
-  - {high: 39, low: 36}
-  - {high: 42, low: 39}
-  - {high: 45, low: 42}
-  - {high: 48, low: 45}
-  - {high: 51, low: 48}
-  - {high: 54, low: 51}
-  - {high: 57, low: 54}
-  - {high: 61, low: 57}
-  - {high: 65, low: 61}
-  - {high: 70, low: 65}
-  - {high: 75, low: 70}
-  - {high: 80, low: 75}
-  - {high: 85, low: 80}
-  - {high: 95, low: 85}
-  - {high: 105, low: 95}
-  - {high: 125, low: 105}
-  - {high: 150, low: 125}
-  - {high: 175, low: 150}
-  - {high: 200, low: 175}
-  - {high: 250, low: 200}
-  - {high: 300, low: 250}
-  - {high: 350, low: 300}
-  - {high: 400, low: 350}
-  - {high: 470, low: 400}
-  - {high: 550, low: 470}
-  - {high: 650, low: 550}
-  - {high: 900, low: 650}
-  - {high: 2500, low: 900}
diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/rawdata/HEPData-ins1768911-v3-Table_7.yaml b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/rawdata/HEPData-ins1768911-v3-Table_7.yaml
deleted file mode 100644
index 7fdd74a753..0000000000
--- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/rawdata/HEPData-ins1768911-v3-Table_7.yaml
+++ /dev/null
@@ -1,738 +0,0 @@
-dependent_variables:
-- header: {name: '$1/\sigma_{fid}d\sigma/dp_{T}^{ee}$', units: 1/GEV}
-  values:
-  - {value: 0.0483395}
-  - {value: 0.102195}
-  - {value: 0.106443}
-  - {value: 0.0944305}
-  - {value: 0.081111}
-  - {value: 0.0686732}
-  - {value: 0.0581359}
-  - {value: 0.0495928}
-  - {value: 0.0424074}
-  - {value: 0.0367425}
-  - {value: 0.0389868}
-  - {value: 0.0331081}
-  - {value: 0.0279712}
-  - {value: 0.0239159}
-  - {value: 0.0243428}
-  - {value: 0.020337}
-  - {value: 0.0172603}
-  - {value: 0.0146538}
-  - {value: 0.0125492}
-  - {value: 0.0106034}
-  - {value: 0.00886316}
-  - {value: 0.00766768}
-  - {value: 0.00666047}
-  - {value: 0.00748112}
-  - {value: 0.00641097}
-  - {value: 0.00676931}
-  - {value: 0.00568527}
-  - {value: 0.00481647}
-  - {value: 0.00411745}
-  - {value: 0.00656875}
-  - {value: 0.00484376}
-  - {value: 0.00661927}
-  - {value: 0.0046954}
-  - {value: 0.00264589}
-  - {value: 0.00156345}
-  - {value: 0.00154866}
-  - {value: 0.000631177}
-  - {value: 0.000300889}
-  - {value: 0.000140033}
-  - {value: 9.14383e-05}
-  - {value: 4.30812e-05}
-  - {value: 2.06103e-05}
-  - {value: 1.37714e-05}
-  - {value: 2.7636e-06}
-- header: {name: Stat (Data)}
-  values:
-  - {value: 0.000102371}
-  - {value: 9.49075e-05}
-  - {value: 9.27015e-05}
-  - {value: 9.4858e-05}
-  - {value: 9.29048e-05}
-  - {value: 9.13038e-05}
-  - {value: 8.77165e-05}
-  - {value: 8.51632e-05}
-  - {value: 8.03754e-05}
-  - {value: 7.4751e-05}
-  - {value: 6.91288e-05}
-  - {value: 6.55885e-05}
-  - {value: 6.20441e-05}
-  - {value: 5.84111e-05}
-  - {value: 5.43868e-05}
-  - {value: 5.09393e-05}
-  - {value: 4.77284e-05}
-  - {value: 4.33461e-05}
-  - {value: 4.06221e-05}
-  - {value: 3.78764e-05}
-  - {value: 3.5859e-05}
-  - {value: 3.34094e-05}
-  - {value: 3.16998e-05}
-  - {value: 2.97563e-05}
-  - {value: 2.84602e-05}
-  - {value: 2.76552e-05}
-  - {value: 2.67771e-05}
-  - {value: 2.56738e-05}
-  - {value: 2.45876e-05}
-  - {value: 2.29524e-05}
-  - {value: 2.13104e-05}
-  - {value: 1.91321e-05}
-  - {value: 1.70873e-05}
-  - {value: 1.50925e-05}
-  - {value: 1.32953e-05}
-  - {value: 1.08143e-05}
-  - {value: 8.74212e-06}
-  - {value: 6.65678e-06}
-  - {value: 5.13199e-06}
-  - {value: 4.25983e-06}
-  - {value: 3.40444e-06}
-  - {value: 2.45674e-06}
-  - {value: 2.00646e-06}
-  - {value: 1.61831e-06}
-- header: {name: Stat (MC)}
-  values:
-  - {value: 8.09829e-05}
-  - {value: 7.44497e-05}
-  - {value: 7.4079e-05}
-  - {value: 7.31161e-05}
-  - {value: 7.17112e-05}
-  - {value: 7.00266e-05}
-  - {value: 6.69025e-05}
-  - {value: 6.27443e-05}
-  - {value: 5.84981e-05}
-  - {value: 5.49052e-05}
-  - {value: 5.15031e-05}
-  - {value: 4.83938e-05}
-  - {value: 4.55475e-05}
-  - {value: 4.29211e-05}
-  - {value: 4.04721e-05}
-  - {value: 3.81011e-05}
-  - {value: 3.54582e-05}
-  - {value: 3.30128e-05}
-  - {value: 3.10321e-05}
-  - {value: 2.92111e-05}
-  - {value: 2.7404e-05}
-  - {value: 2.57572e-05}
-  - {value: 2.42184e-05}
-  - {value: 2.27957e-05}
-  - {value: 2.19838e-05}
-  - {value: 2.11016e-05}
-  - {value: 2.07621e-05}
-  - {value: 2.02587e-05}
-  - {value: 1.94961e-05}
-  - {value: 1.83752e-05}
-  - {value: 1.73845e-05}
-  - {value: 1.59935e-05}
-  - {value: 1.46043e-05}
-  - {value: 1.32128e-05}
-  - {value: 1.18844e-05}
-  - {value: 1.00768e-05}
-  - {value: 8.52524e-06}
-  - {value: 6.65474e-06}
-  - {value: 5.07138e-06}
-  - {value: 4.22219e-06}
-  - {value: 3.51076e-06}
-  - {value: 2.64566e-06}
-  - {value: 2.07519e-06}
-  - {value: 1.63666e-06}
-- header: {name: Efficiencies (Uncorellated)}
-  values:
-  - {value: 7.22891e-06}
-  - {value: 7.18163e-06}
-  - {value: 6.08446e-06}
-  - {value: 6.70296e-06}
-  - {value: 6.31176e-06}
-  - {value: 6.08136e-06}
-  - {value: 5.77708e-06}
-  - {value: 6.05748e-06}
-  - {value: 6.39294e-06}
-  - {value: 5.81985e-06}
-  - {value: 5.24487e-06}
-  - {value: 4.93536e-06}
-  - {value: 5.05399e-06}
-  - {value: 5.20552e-06}
-  - {value: 5.1138e-06}
-  - {value: 5.25854e-06}
-  - {value: 4.90172e-06}
-  - {value: 4.85719e-06}
-  - {value: 4.58636e-06}
-  - {value: 4.13876e-06}
-  - {value: 3.85815e-06}
-  - {value: 3.71002e-06}
-  - {value: 3.52942e-06}
-  - {value: 3.40751e-06}
-  - {value: 2.90491e-06}
-  - {value: 2.80487e-06}
-  - {value: 2.44491e-06}
-  - {value: 2.45262e-06}
-  - {value: 2.20911e-06}
-  - {value: 2.28263e-06}
-  - {value: 2.09001e-06}
-  - {value: 1.90618e-06}
-  - {value: 1.68432e-06}
-  - {value: 1.52197e-06}
-  - {value: 1.18985e-06}
-  - {value: 9.87466e-07}
-  - {value: 8.21905e-07}
-  - {value: 7.32572e-07}
-  - {value: 5.91105e-07}
-  - {value: 5.09875e-07}
-  - {value: 2.53065e-07}
-  - {value: 1.92831e-07}
-  - {value: 1.67278e-07}
-  - {value: 1.30595e-07}
-- header: {name: Scale}
-  values:
-  - {value: 5.74042e-05}
-  - {value: 4.26257e-05}
-  - {value: 4.63821e-05}
-  - {value: 4.32444e-05}
-  - {value: 3.29997e-05}
-  - {value: 2.51705e-05}
-  - {value: 1.53554e-05}
-  - {value: 8.25684e-06}
-  - {value: 1.7743e-06}
-  - {value: -2.52894e-06}
-  - {value: -4.44667e-06}
-  - {value: -7.91584e-06}
-  - {value: -1.17235e-05}
-  - {value: -1.4944e-05}
-  - {value: -1.71182e-05}
-  - {value: -1.7969e-05}
-  - {value: -1.97807e-05}
-  - {value: -2.14742e-05}
-  - {value: -2.20046e-05}
-  - {value: -2.13968e-05}
-  - {value: -2.11376e-05}
-  - {value: -1.97205e-05}
-  - {value: -1.74363e-05}
-  - {value: -1.48847e-05}
-  - {value: -1.21268e-05}
-  - {value: -9.62642e-06}
-  - {value: -7.33729e-06}
-  - {value: -4.80769e-06}
-  - {value: -3.10729e-06}
-  - {value: -1.64398e-06}
-  - {value: -4.0303e-07}
-  - {value: 2.24266e-07}
-  - {value: 5.28301e-07}
-  - {value: 9.48076e-07}
-  - {value: 1.27241e-06}
-  - {value: 1.22838e-06}
-  - {value: 9.02861e-07}
-  - {value: 5.16388e-07}
-  - {value: 3.74232e-07}
-  - {value: 1.99243e-07}
-  - {value: 1.21779e-07}
-  - {value: 5.24385e-08}
-  - {value: 5.68144e-08}
-  - {value: 2.68711e-08}
-- header: {name: Resolution}
-  values:
-  - {value: -8.73084e-06}
-  - {value: -2.36882e-06}
-  - {value: -3.37921e-06}
-  - {value: -2.79117e-06}
-  - {value: -4.31868e-06}
-  - {value: -2.1314e-06}
-  - {value: -2.01192e-06}
-  - {value: -7.40268e-07}
-  - {value: -3.35542e-07}
-  - {value: -3.65744e-07}
-  - {value: 6.83458e-07}
-  - {value: 1.87648e-06}
-  - {value: 2.96786e-06}
-  - {value: 2.58708e-06}
-  - {value: 3.7847e-06}
-  - {value: 4.16607e-06}
-  - {value: 4.53774e-06}
-  - {value: 3.54601e-06}
-  - {value: 3.26079e-06}
-  - {value: 2.66431e-06}
-  - {value: 3.75639e-06}
-  - {value: 1.88264e-06}
-  - {value: 7.42297e-07}
-  - {value: 1.12361e-06}
-  - {value: 1.02775e-06}
-  - {value: 1.77267e-07}
-  - {value: 3.97475e-09}
-  - {value: -2.53902e-07}
-  - {value: -4.45023e-07}
-  - {value: -3.76437e-07}
-  - {value: -7.55535e-07}
-  - {value: -9.60867e-07}
-  - {value: -7.91375e-07}
-  - {value: -9.841e-07}
-  - {value: -1.03048e-06}
-  - {value: -6.24733e-07}
-  - {value: -3.65867e-07}
-  - {value: -2.13644e-07}
-  - {value: -1.92717e-07}
-  - {value: -1.03995e-07}
-  - {value: -1.11694e-08}
-  - {value: 7.86313e-09}
-  - {value: -2.20764e-08}
-  - {value: -1.79767e-08}
-- header: {name: Electron (Reco)}
-  values:
-  - {value: 3.73609e-05}
-  - {value: 2.59224e-05}
-  - {value: 2.56501e-05}
-  - {value: 2.47024e-05}
-  - {value: 1.79945e-05}
-  - {value: 1.36729e-05}
-  - {value: 1.01267e-05}
-  - {value: 4.1364e-06}
-  - {value: 1.96642e-07}
-  - {value: -2.9938e-06}
-  - {value: -3.14029e-06}
-  - {value: -4.71249e-06}
-  - {value: -6.99516e-06}
-  - {value: -1.00311e-05}
-  - {value: -1.19435e-05}
-  - {value: -1.19122e-05}
-  - {value: -1.05337e-05}
-  - {value: -1.02591e-05}
-  - {value: -8.71854e-06}
-  - {value: -7.83448e-06}
-  - {value: -7.62361e-06}
-  - {value: -6.24645e-06}
-  - {value: -5.8664e-06}
-  - {value: -5.50491e-06}
-  - {value: -5.37919e-06}
-  - {value: -5.07208e-06}
-  - {value: -3.69542e-06}
-  - {value: -3.76334e-06}
-  - {value: -4.15117e-06}
-  - {value: -4.11166e-06}
-  - {value: -3.85005e-06}
-  - {value: -3.23428e-06}
-  - {value: -3.23507e-06}
-  - {value: -3.66205e-06}
-  - {value: -2.7668e-06}
-  - {value: -1.85805e-06}
-  - {value: -1.24302e-06}
-  - {value: -9.03214e-07}
-  - {value: -5.32538e-07}
-  - {value: -3.27019e-07}
-  - {value: -1.35082e-07}
-  - {value: -1.0457e-07}
-  - {value: -2.80426e-08}
-  - {value: 3.32287e-09}
-- header: {name: Electron (ID)}
-  values:
-  - {value: 8.03197e-05}
-  - {value: 4.72418e-05}
-  - {value: 5.60831e-05}
-  - {value: 5.43746e-05}
-  - {value: 5.3162e-05}
-  - {value: 4.63812e-05}
-  - {value: 3.203e-05}
-  - {value: 2.2394e-05}
-  - {value: 1.39467e-05}
-  - {value: 7.22148e-06}
-  - {value: 7.83375e-07}
-  - {value: -6.96084e-06}
-  - {value: -1.23785e-05}
-  - {value: -1.64871e-05}
-  - {value: -2.26757e-05}
-  - {value: -2.40263e-05}
-  - {value: -2.51184e-05}
-  - {value: -2.56432e-05}
-  - {value: -2.32065e-05}
-  - {value: -2.10945e-05}
-  - {value: -1.91288e-05}
-  - {value: -1.58017e-05}
-  - {value: -1.40339e-05}
-  - {value: -1.23998e-05}
-  - {value: -1.08854e-05}
-  - {value: -1.04187e-05}
-  - {value: -1.04548e-05}
-  - {value: -1.00943e-05}
-  - {value: -1.11345e-05}
-  - {value: -1.19792e-05}
-  - {value: -1.18675e-05}
-  - {value: -1.17343e-05}
-  - {value: -1.17395e-05}
-  - {value: -1.0981e-05}
-  - {value: -1.00176e-05}
-  - {value: -7.77185e-06}
-  - {value: -5.59799e-06}
-  - {value: -4.3859e-06}
-  - {value: -3.09999e-06}
-  - {value: -1.67309e-06}
-  - {value: -8.50604e-07}
-  - {value: -5.94727e-07}
-  - {value: -4.03555e-07}
-  - {value: -2.35804e-07}
-- header: {name: Isolation}
-  values:
-  - {value: 1.65751e-05}
-  - {value: 1.42725e-05}
-  - {value: 1.02572e-05}
-  - {value: 1.12324e-05}
-  - {value: 8.98859e-06}
-  - {value: 6.06504e-06}
-  - {value: 5.00706e-06}
-  - {value: 3.95519e-06}
-  - {value: 1.24691e-06}
-  - {value: 1.77617e-06}
-  - {value: 1.70805e-06}
-  - {value: 2.72345e-06}
-  - {value: 7.85105e-07}
-  - {value: 4.45172e-07}
-  - {value: -9.63387e-07}
-  - {value: -3.14654e-07}
-  - {value: -1.40364e-06}
-  - {value: -1.37496e-06}
-  - {value: -2.18904e-06}
-  - {value: -1.46434e-06}
-  - {value: -1.33538e-06}
-  - {value: -1.22848e-06}
-  - {value: -1.33439e-06}
-  - {value: -1.07009e-06}
-  - {value: -1.55554e-06}
-  - {value: -9.52577e-07}
-  - {value: -2.53386e-07}
-  - {value: -3.37072e-07}
-  - {value: -5.83773e-07}
-  - {value: -1.0178e-06}
-  - {value: -1.2812e-06}
-  - {value: -2.19813e-06}
-  - {value: -4.19073e-06}
-  - {value: -5.63121e-06}
-  - {value: -6.08203e-06}
-  - {value: -6.07504e-06}
-  - {value: -6.00115e-06}
-  - {value: -5.78748e-06}
-  - {value: -4.72147e-06}
-  - {value: -2.64485e-06}
-  - {value: -1.40241e-06}
-  - {value: -9.78136e-07}
-  - {value: -6.87393e-07}
-  - {value: -4.66472e-07}
-- header: {name: Trigger}
-  values:
-  - {value: -4.8553e-06}
-  - {value: 3.24566e-06}
-  - {value: -2.17557e-06}
-  - {value: -1.75834e-06}
-  - {value: -1.2642e-06}
-  - {value: -2.596e-06}
-  - {value: -2.0835e-07}
-  - {value: -1.62556e-06}
-  - {value: -2.11783e-06}
-  - {value: -2.55249e-06}
-  - {value: -4.05737e-06}
-  - {value: -2.95096e-06}
-  - {value: -1.92744e-06}
-  - {value: 1.42226e-07}
-  - {value: 7.7965e-08}
-  - {value: 1.18112e-06}
-  - {value: 9.78354e-07}
-  - {value: 2.26498e-06}
-  - {value: 1.61594e-06}
-  - {value: 1.73715e-06}
-  - {value: 1.41973e-06}
-  - {value: 1.48449e-06}
-  - {value: 1.09001e-06}
-  - {value: 1.1286e-06}
-  - {value: 3.80179e-07}
-  - {value: 1.16025e-06}
-  - {value: 8.58463e-07}
-  - {value: 1.07845e-06}
-  - {value: 1.71664e-06}
-  - {value: 1.29961e-06}
-  - {value: 1.04069e-06}
-  - {value: 1.04583e-06}
-  - {value: 7.03697e-07}
-  - {value: 4.37115e-07}
-  - {value: 1.89404e-07}
-  - {value: -3.10393e-07}
-  - {value: -1.67002e-07}
-  - {value: -4.56421e-08}
-  - {value: 5.1524e-08}
-  - {value: 6.36341e-09}
-  - {value: 4.87548e-08}
-  - {value: 5.87578e-08}
-  - {value: 1.16622e-08}
-  - {value: 3.27958e-08}
-- header: {name: Charge Id}
-  values:
-  - {value: 2.19879e-05}
-  - {value: 1.45338e-05}
-  - {value: 1.79093e-05}
-  - {value: 1.86286e-05}
-  - {value: 1.71715e-05}
-  - {value: 1.59027e-05}
-  - {value: 1.06905e-05}
-  - {value: 8.10809e-06}
-  - {value: 4.61484e-06}
-  - {value: 1.44475e-06}
-  - {value: -1.22615e-06}
-  - {value: -1.44461e-06}
-  - {value: -2.39323e-06}
-  - {value: -2.3009e-06}
-  - {value: -3.57821e-06}
-  - {value: -3.94914e-06}
-  - {value: -3.6432e-06}
-  - {value: -3.85321e-06}
-  - {value: -3.85997e-06}
-  - {value: -3.39963e-06}
-  - {value: -2.79689e-06}
-  - {value: -1.83311e-06}
-  - {value: -2.11803e-06}
-  - {value: -2.86641e-06}
-  - {value: -3.17032e-06}
-  - {value: -2.56195e-06}
-  - {value: -4.46218e-06}
-  - {value: -5.94209e-06}
-  - {value: -7.89254e-06}
-  - {value: -8.64825e-06}
-  - {value: -9.31798e-06}
-  - {value: -9.10617e-06}
-  - {value: -9.61383e-06}
-  - {value: -8.43784e-06}
-  - {value: -7.06103e-06}
-  - {value: -4.96444e-06}
-  - {value: -3.27046e-06}
-  - {value: -2.04391e-06}
-  - {value: -1.33877e-06}
-  - {value: -5.29771e-07}
-  - {value: -1.73327e-07}
-  - {value: -2.39057e-07}
-  - {value: -1.43797e-07}
-  - {value: -1.17062e-07}
-- header: {name: Z-vertex reweighting}
-  values:
-  - {value: -3.27826e-06}
-  - {value: 1.36765e-06}
-  - {value: -1.1038e-06}
-  - {value: -2.76603e-07}
-  - {value: -9.88798e-07}
-  - {value: -1.85839e-06}
-  - {value: -2.9962e-07}
-  - {value: 1.03776e-08}
-  - {value: 2.03028e-07}
-  - {value: -1.04481e-06}
-  - {value: -2.82457e-06}
-  - {value: -2.39576e-06}
-  - {value: -2.10399e-06}
-  - {value: -1.9756e-06}
-  - {value: -1.67093e-06}
-  - {value: -2.27941e-06}
-  - {value: -1.32427e-06}
-  - {value: -1.76951e-07}
-  - {value: 3.96311e-07}
-  - {value: 4.76305e-07}
-  - {value: 3.35941e-08}
-  - {value: -3.48414e-07}
-  - {value: -7.09269e-07}
-  - {value: -3.84104e-07}
-  - {value: -6.22888e-07}
-  - {value: -8.8158e-07}
-  - {value: -8.80948e-07}
-  - {value: -9.44644e-07}
-  - {value: -3.74807e-07}
-  - {value: -2.77235e-08}
-  - {value: -2.87579e-07}
-  - {value: 1.5445e-07}
-  - {value: 2.68969e-07}
-  - {value: 3.3263e-07}
-  - {value: 3.40817e-07}
-  - {value: 1.3882e-07}
-  - {value: 3.24352e-09}
-  - {value: 5.66633e-08}
-  - {value: -7.09518e-08}
-  - {value: -5.27226e-08}
-  - {value: -4.60219e-08}
-  - {value: -4.3803e-08}
-  - {value: -5.90428e-09}
-  - {value: 1.68386e-08}
-- header: {name: Pile-Up}
-  values:
-  - {value: -3.40566e-05}
-  - {value: -4.01083e-05}
-  - {value: -1.37389e-05}
-  - {value: -2.41436e-05}
-  - {value: -1.75158e-05}
-  - {value: -2.91158e-06}
-  - {value: 6.10415e-06}
-  - {value: 1.61151e-05}
-  - {value: 2.9557e-05}
-  - {value: 1.55313e-05}
-  - {value: 1.00657e-05}
-  - {value: 9.50428e-06}
-  - {value: 1.83657e-06}
-  - {value: -5.23909e-06}
-  - {value: -7.73929e-06}
-  - {value: -1.24314e-05}
-  - {value: -7.29718e-06}
-  - {value: 1.4216e-06}
-  - {value: -1.67951e-06}
-  - {value: -3.75802e-06}
-  - {value: 1.76047e-06}
-  - {value: 1.04288e-06}
-  - {value: 4.29646e-06}
-  - {value: 3.06658e-06}
-  - {value: 4.17778e-06}
-  - {value: 4.87923e-06}
-  - {value: 5.73931e-06}
-  - {value: 7.83532e-06}
-  - {value: 4.24394e-06}
-  - {value: 4.76129e-06}
-  - {value: 7.66828e-06}
-  - {value: 5.46106e-06}
-  - {value: 7.46966e-06}
-  - {value: 8.1348e-06}
-  - {value: 3.75396e-06}
-  - {value: 3.82663e-06}
-  - {value: 2.40198e-06}
-  - {value: 1.71655e-06}
-  - {value: 1.50308e-06}
-  - {value: 3.80076e-07}
-  - {value: -4.82333e-07}
-  - {value: -5.9623e-08}
-  - {value: 2.18436e-07}
-  - {value: -1.03233e-07}
-- header: {name: Model}
-  values:
-  - {value: 0.000169138}
-  - {value: -4.85964e-06}
-  - {value: 7.43061e-05}
-  - {value: 7.93487e-07}
-  - {value: -1.82486e-05}
-  - {value: -8.4347e-05}
-  - {value: -0.000120036}
-  - {value: -8.76534e-05}
-  - {value: -3.68101e-05}
-  - {value: -2.44645e-06}
-  - {value: 1.14007e-05}
-  - {value: 8.55061e-06}
-  - {value: 1.44948e-05}
-  - {value: 1.62808e-05}
-  - {value: 1.92359e-05}
-  - {value: 1.72122e-05}
-  - {value: 1.20915e-05}
-  - {value: 1.23697e-05}
-  - {value: 1.21488e-05}
-  - {value: 2.19193e-07}
-  - {value: 3.43858e-06}
-  - {value: -2.08563e-06}
-  - {value: -3.92087e-07}
-  - {value: 1.44022e-06}
-  - {value: -2.50433e-06}
-  - {value: -2.14736e-06}
-  - {value: -2.18063e-06}
-  - {value: -3.85195e-06}
-  - {value: -5.92048e-06}
-  - {value: -6.16516e-06}
-  - {value: -8.2277e-06}
-  - {value: -9.81968e-06}
-  - {value: -1.09102e-05}
-  - {value: -7.8952e-06}
-  - {value: -1.0862e-05}
-  - {value: -7.84688e-06}
-  - {value: -5.73949e-06}
-  - {value: -3.52641e-06}
-  - {value: -2.2412e-06}
-  - {value: -1.23635e-06}
-  - {value: -7.92413e-07}
-  - {value: -2.13684e-07}
-  - {value: -8.44079e-08}
-  - {value: -7.07108e-08}
-- header: {name: Background}
-  values:
-  - {value: 4.60024e-05}
-  - {value: 3.27621e-05}
-  - {value: 3.58775e-05}
-  - {value: 3.30396e-05}
-  - {value: 2.65565e-05}
-  - {value: 1.97696e-05}
-  - {value: 1.23759e-05}
-  - {value: 7.1499e-06}
-  - {value: 3.72263e-06}
-  - {value: 6.19995e-07}
-  - {value: -1.42466e-06}
-  - {value: -2.99966e-06}
-  - {value: -4.75746e-06}
-  - {value: -5.74626e-06}
-  - {value: -6.42772e-06}
-  - {value: -6.84323e-06}
-  - {value: -7.2868e-06}
-  - {value: -7.53001e-06}
-  - {value: -7.844e-06}
-  - {value: -7.90314e-06}
-  - {value: -8.24127e-06}
-  - {value: -8.66496e-06}
-  - {value: -9.24032e-06}
-  - {value: -9.63899e-06}
-  - {value: -9.67172e-06}
-  - {value: -9.84973e-06}
-  - {value: -1.09577e-05}
-  - {value: -1.13264e-05}
-  - {value: -1.21091e-05}
-  - {value: -1.17502e-05}
-  - {value: -1.07569e-05}
-  - {value: -9.85639e-06}
-  - {value: -8.97617e-06}
-  - {value: -6.93188e-06}
-  - {value: -5.22174e-06}
-  - {value: -3.15496e-06}
-  - {value: -1.83193e-06}
-  - {value: -1.2298e-06}
-  - {value: -8.4747e-07}
-  - {value: -4.70712e-07}
-  - {value: -2.61734e-07}
-  - {value: -1.81369e-07}
-  - {value: -1.31375e-07}
-  - {value: -8.84721e-08}
-independent_variables:
-- header: {name: 'Bin $p_{T}^{ee}$', units: GEV}
-  values:
-  - {high: 2, low: 0}
-  - {high: 4, low: 2}
-  - {high: 6, low: 4}
-  - {high: 8, low: 6}
-  - {high: 10, low: 8}
-  - {high: 12, low: 10}
-  - {high: 14, low: 12}
-  - {high: 16, low: 14}
-  - {high: 18, low: 16}
-  - {high: 20, low: 18}
-  - {high: 22.5, low: 20}
-  - {high: 25, low: 22.5}
-  - {high: 27.5, low: 25}
-  - {high: 30, low: 27.5}
-  - {high: 33, low: 30}
-  - {high: 36, low: 33}
-  - {high: 39, low: 36}
-  - {high: 42, low: 39}
-  - {high: 45, low: 42}
-  - {high: 48, low: 45}
-  - {high: 51, low: 48}
-  - {high: 54, low: 51}
-  - {high: 57, low: 54}
-  - {high: 61, low: 57}
-  - {high: 65, low: 61}
-  - {high: 70, low: 65}
-  - {high: 75, low: 70}
-  - {high: 80, low: 75}
-  - {high: 85, low: 80}
-  - {high: 95, low: 85}
-  - {high: 105, low: 95}
-  - {high: 125, low: 105}
-  - {high: 150, low: 125}
-  - {high: 175, low: 150}
-  - {high: 200, low: 175}
-  - {high: 250, low: 200}
-  - {high: 300, low: 250}
-  - {high: 350, low: 300}
-  - {high: 400, low: 350}
-  - {high: 470, low: 400}
-  - {high: 550, low: 470}
-  - {high: 650, low: 550}
-  - {high: 900, low: 650}
-  - {high: 2500, low: 900}
diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/rawdata/HEPData-ins1768911-v3-Tabulated_Figure_6.yaml b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/rawdata/HEPData-ins1768911-v3-Tabulated_Figure_6.yaml
deleted file mode 100644
index d610160f04..0000000000
--- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/rawdata/HEPData-ins1768911-v3-Tabulated_Figure_6.yaml
+++ /dev/null
@@ -1,466 +0,0 @@
-dependent_variables:
-- header: {name: Data}
-  values:
-  - errors:
-    - {label: systematic uncertainty, symerror: 4.22803e-05}
-    value: 0.0343165
-  - errors:
-    - {label: systematic uncertainty, symerror: 4.17154e-05}
-    value: 0.0291566
-  - errors:
-    - {label: systematic uncertainty, symerror: 3.71021e-05}
-    value: 0.0248037
-  - errors:
-    - {label: systematic uncertainty, symerror: 3.24368e-05}
-    value: 0.021268
-  - errors:
-    - {label: systematic uncertainty, symerror: 2.93486e-05}
-    value: 0.018325
-  - errors:
-    - {label: systematic uncertainty, symerror: 2.1707e-05}
-    value: 0.0156045
-  - errors:
-    - {label: systematic uncertainty, symerror: 2.05628e-05}
-    value: 0.01318
-  - errors:
-    - {label: systematic uncertainty, symerror: 1.94438e-05}
-    value: 0.0112073
-  - errors:
-    - {label: systematic uncertainty, symerror: 1.84635e-05}
-    value: 0.00955676
-  - errors:
-    - {label: systematic uncertainty, symerror: 1.47597e-05}
-    value: 0.00810287
-  - errors:
-    - {label: systematic uncertainty, symerror: 1.42096e-05}
-    value: 0.00678809
-  - errors:
-    - {label: systematic uncertainty, symerror: 1.34331e-05}
-    value: 0.00575628
-  - errors:
-    - {label: systematic uncertainty, symerror: 1.26141e-05}
-    value: 0.00487686
-  - errors:
-    - {label: systematic uncertainty, symerror: 1.18061e-05}
-    value: 0.00416884
-  - errors:
-    - {label: systematic uncertainty, symerror: 1.11818e-05}
-    value: 0.00352131
-  - errors:
-    - {label: systematic uncertainty, symerror: 1.05983e-05}
-    value: 0.00297507
-  - errors:
-    - {label: systematic uncertainty, symerror: 9.94376e-06}
-    value: 0.00254333
-  - errors:
-    - {label: systematic uncertainty, symerror: 9.34678e-06}
-    value: 0.00218319
-  - errors:
-    - {label: systematic uncertainty, symerror: 6.48633e-06}
-    value: 0.00187701
-  - errors:
-    - {label: systematic uncertainty, symerror: 6.1919e-06}
-    value: 0.0015932
-  - errors:
-    - {label: systematic uncertainty, symerror: 4.81784e-06}
-    value: 0.00135193
-  - errors:
-    - {label: systematic uncertainty, symerror: 4.66633e-06}
-    value: 0.0011323
-  - errors:
-    - {label: systematic uncertainty, symerror: 4.54424e-06}
-    value: 0.00095743
-  - errors:
-    - {label: systematic uncertainty, symerror: 4.37793e-06}
-    value: 0.000814977
-  - errors:
-    - {label: systematic uncertainty, symerror: 2.08447e-06}
-    value: 0.000653718
-  - errors:
-    - {label: systematic uncertainty, symerror: 1.96961e-06}
-    value: 0.000484859
-  - errors:
-    - {label: systematic uncertainty, symerror: 9.09987e-07}
-    value: 0.000329051
-  - errors:
-    - {label: systematic uncertainty, symerror: 6.61538e-07}
-    value: 0.000186048
-  - errors:
-    - {label: systematic uncertainty, symerror: 5.88609e-07}
-    value: 0.000104998
-  - errors:
-    - {label: systematic uncertainty, symerror: 5.13346e-07}
-    value: 6.12794e-05
-  - errors:
-    - {label: systematic uncertainty, symerror: 2.1239e-07}
-    value: 3.0584e-05
-  - errors:
-    - {label: systematic uncertainty, symerror: 1.7431e-07}
-    value: 1.22113e-05
-  - errors:
-    - {label: systematic uncertainty, symerror: 1.36912e-07}
-    value: 5.90263e-06
-  - errors:
-    - {label: systematic uncertainty, symerror: 1.07011e-07}
-    value: 2.77421e-06
-  - errors:
-    - {label: systematic uncertainty, symerror: 6.18513e-08}
-    value: 1.25134e-06
-  - errors:
-    - {label: systematic uncertainty, symerror: 4.41197e-08}
-    value: 5.5219e-07
-  - errors:
-    - {label: systematic uncertainty, symerror: 2.61233e-08}
-    value: 2.01646e-07
-  - errors:
-    - {label: systematic uncertainty, symerror: 8.10047e-09}
-    value: 5.11526e-08
-- header: {name: NNLOjet}
-  values:
-  - errors:
-    - asymerror: {minus: -0.000928396, plus: 0.000757317}
-      label: systematic uncertainty
-    value: 0.0380557
-  - errors:
-    - asymerror: {minus: -0.000575129, plus: 0.000476175}
-      label: systematic uncertainty
-    value: 0.031536
-  - errors:
-    - asymerror: {minus: -0.000464836, plus: 0.0003151}
-      label: systematic uncertainty
-    value: 0.0259986
-  - errors:
-    - asymerror: {minus: -0.000283612, plus: 0.000434038}
-      label: systematic uncertainty
-    value: 0.0220682
-  - errors:
-    - asymerror: {minus: -0.000258206, plus: 0.000224893}
-      label: systematic uncertainty
-    value: 0.0186252
-  - errors:
-    - asymerror: {minus: -0.000244722, plus: 0.000187336}
-      label: systematic uncertainty
-    value: 0.015662
-  - errors:
-    - asymerror: {minus: -0.000230139, plus: 0.000200008}
-      label: systematic uncertainty
-    value: 0.0131076
-  - errors:
-    - asymerror: {minus: -0.000197197, plus: 0.000216108}
-      label: systematic uncertainty
-    value: 0.0110405
-  - errors:
-    - asymerror: {minus: -0.000203926, plus: 0.000130179}
-      label: systematic uncertainty
-    value: 0.00942853
-  - errors:
-    - asymerror: {minus: -0.000175182, plus: 0.000134752}
-      label: systematic uncertainty
-    value: 0.00794182
-  - errors:
-    - asymerror: {minus: -0.000173028, plus: 0.000128132}
-      label: systematic uncertainty
-    value: 0.00670778
-  - errors:
-    - asymerror: {minus: -0.000134947, plus: 0.000101604}
-      label: systematic uncertainty
-    value: 0.00561435
-  - errors:
-    - asymerror: {minus: -0.000119747, plus: 8.12955e-05}
-      label: systematic uncertainty
-    value: 0.00476179
-  - errors:
-    - asymerror: {minus: -0.000102226, plus: 6.57718e-05}
-      label: systematic uncertainty
-    value: 0.00402768
-  - errors:
-    - asymerror: {minus: -8.71818e-05, plus: 6.7195e-05}
-      label: systematic uncertainty
-    value: 0.00341926
-  - errors:
-    - asymerror: {minus: -7.53593e-05, plus: 5.57137e-05}
-      label: systematic uncertainty
-    value: 0.00290031
-  - errors:
-    - asymerror: {minus: -6.68468e-05, plus: 4.51362e-05}
-      label: systematic uncertainty
-    value: 0.00247274
-  - errors:
-    - asymerror: {minus: -5.45131e-05, plus: 4.08951e-05}
-      label: systematic uncertainty
-    value: 0.00212562
-  - errors:
-    - asymerror: {minus: -4.50301e-05, plus: 3.57101e-05}
-      label: systematic uncertainty
-    value: 0.00182099
-  - errors:
-    - asymerror: {minus: -3.72217e-05, plus: 2.94437e-05}
-      label: systematic uncertainty
-    value: 0.00154111
-  - errors:
-    - asymerror: {minus: -3.52707e-05, plus: 2.44427e-05}
-      label: systematic uncertainty
-    value: 0.00131149
-  - errors:
-    - asymerror: {minus: -2.4515e-05, plus: 1.8892e-05}
-      label: systematic uncertainty
-    value: 0.0010889
-  - errors:
-    - asymerror: {minus: -2.36994e-05, plus: 1.56618e-05}
-      label: systematic uncertainty
-    value: 0.000923492
-  - errors:
-    - asymerror: {minus: -2.11701e-05, plus: 1.57592e-05}
-      label: systematic uncertainty
-    value: 0.000789281
-  - errors:
-    - asymerror: {minus: -1.62766e-05, plus: 1.12694e-05}
-      label: systematic uncertainty
-    value: 0.000628912
-  - errors:
-    - asymerror: {minus: -1.22076e-05, plus: 8.59844e-06}
-      label: systematic uncertainty
-    value: 0.000468642
-  - errors:
-    - asymerror: {minus: -8.41994e-06, plus: 5.78111e-06}
-      label: systematic uncertainty
-    value: 0.000315545
-  - errors:
-    - asymerror: {minus: -4.93492e-06, plus: 3.22534e-06}
-      label: systematic uncertainty
-    value: 0.000180595
-  - errors:
-    - asymerror: {minus: -2.82727e-06, plus: 1.83955e-06}
-      label: systematic uncertainty
-    value: 0.000101273
-  - errors:
-    - asymerror: {minus: -1.70885e-06, plus: 1.12646e-06}
-      label: systematic uncertainty
-    value: 5.96943e-05
-  - errors:
-    - asymerror: {minus: -9.51943e-07, plus: 5.02254e-07}
-      label: systematic uncertainty
-    value: 2.9846e-05
-  - errors:
-    - asymerror: {minus: -3.99519e-07, plus: 2.1409e-07}
-      label: systematic uncertainty
-    value: 1.2445e-05
-  - errors:
-    - asymerror: {minus: -2.01478e-07, plus: 1.03494e-07}
-      label: systematic uncertainty
-    value: 5.77334e-06
-  - errors:
-    - asymerror: {minus: -1.04598e-07, plus: 4.93272e-08}
-      label: systematic uncertainty
-    value: 2.88712e-06
-  - errors:
-    - asymerror: {minus: -5.01032e-08, plus: 2.2008e-08}
-      label: systematic uncertainty
-    value: 1.3699e-06
-  - errors:
-    - asymerror: {minus: -2.13344e-08, plus: 9.7127e-09}
-      label: systematic uncertainty
-    value: 5.7462e-07
-  - errors:
-    - asymerror: {minus: -9.69336e-09, plus: 4.25622e-09}
-      label: systematic uncertainty
-    value: 2.34077e-07
-  - errors:
-    - asymerror: {minus: -2.36051e-09, plus: 1.03647e-09}
-      label: systematic uncertainty
-    value: 5.70022e-08
-- header: {name: NNLOjet + NLO EWK}
-  values:
-  - errors:
-    - asymerror: {minus: -0.000927515, plus: 0.000758198}
-      label: systematic uncertainty
-    value: 0.0380757
-  - errors:
-    - asymerror: {minus: -0.000574398, plus: 0.000476905}
-      label: systematic uncertainty
-    value: 0.0315526
-  - errors:
-    - asymerror: {minus: -0.000464234, plus: 0.000315702}
-      label: systematic uncertainty
-    value: 0.0260123
-  - errors:
-    - asymerror: {minus: -0.000283101, plus: 0.000434549}
-      label: systematic uncertainty
-    value: 0.0220798
-  - errors:
-    - asymerror: {minus: -0.000257774, plus: 0.000225324}
-      label: systematic uncertainty
-    value: 0.018635
-  - errors:
-    - asymerror: {minus: -0.000244359, plus: 0.000187699}
-      label: systematic uncertainty
-    value: 0.0156702
-  - errors:
-    - asymerror: {minus: -0.000229836, plus: 0.000200311}
-      label: systematic uncertainty
-    value: 0.0131144
-  - errors:
-    - asymerror: {minus: -0.000196941, plus: 0.000216364}
-      label: systematic uncertainty
-    value: 0.0110463
-  - errors:
-    - asymerror: {minus: -0.000203708, plus: 0.000130397}
-      label: systematic uncertainty
-    value: 0.00943348
-  - errors:
-    - asymerror: {minus: -0.000174998, plus: 0.000134936}
-      label: systematic uncertainty
-    value: 0.00794599
-  - errors:
-    - asymerror: {minus: -0.000172872, plus: 0.000128288}
-      label: systematic uncertainty
-    value: 0.00671131
-  - errors:
-    - asymerror: {minus: -0.000134817, plus: 0.000101734}
-      label: systematic uncertainty
-    value: 0.0056173
-  - errors:
-    - asymerror: {minus: -0.000119637, plus: 8.14058e-05}
-      label: systematic uncertainty
-    value: 0.00476429
-  - errors:
-    - asymerror: {minus: -0.000102132, plus: 6.5865e-05}
-      label: systematic uncertainty
-    value: 0.0040298
-  - errors:
-    - asymerror: {minus: -8.71026e-05, plus: 6.72742e-05}
-      label: systematic uncertainty
-    value: 0.00342106
-  - errors:
-    - asymerror: {minus: -7.52922e-05, plus: 5.57809e-05}
-      label: systematic uncertainty
-    value: 0.00290184
-  - errors:
-    - asymerror: {minus: -6.67896e-05, plus: 4.51934e-05}
-      label: systematic uncertainty
-    value: 0.00247404
-  - errors:
-    - asymerror: {minus: -5.44639e-05, plus: 4.09444e-05}
-      label: systematic uncertainty
-    value: 0.00212673
-  - errors:
-    - asymerror: {minus: -4.49879e-05, plus: 3.57522e-05}
-      label: systematic uncertainty
-    value: 0.00182195
-  - errors:
-    - asymerror: {minus: -3.71861e-05, plus: 2.94794e-05}
-      label: systematic uncertainty
-    value: 0.00154192
-  - errors:
-    - asymerror: {minus: -3.52403e-05, plus: 2.44731e-05}
-      label: systematic uncertainty
-    value: 0.00131141
-  - errors:
-    - asymerror: {minus: -2.44898e-05, plus: 1.89173e-05}
-      label: systematic uncertainty
-    value: 0.0010881
-  - errors:
-    - asymerror: {minus: -2.3678e-05, plus: 1.56832e-05}
-      label: systematic uncertainty
-    value: 0.00092206
-  - errors:
-    - asymerror: {minus: -2.11518e-05, plus: 1.57775e-05}
-      label: systematic uncertainty
-    value: 0.00078722
-  - errors:
-    - asymerror: {minus: -1.6262e-05, plus: 1.12839e-05}
-      label: systematic uncertainty
-    value: 0.000626374
-  - errors:
-    - asymerror: {minus: -1.21967e-05, plus: 8.60929e-06}
-      label: systematic uncertainty
-    value: 0.000465713
-  - errors:
-    - asymerror: {minus: -8.41263e-06, plus: 5.78842e-06}
-      label: systematic uncertainty
-    value: 0.000312404
-  - errors:
-    - asymerror: {minus: -4.93073e-06, plus: 3.22952e-06}
-      label: systematic uncertainty
-    value: 0.000177558
-  - errors:
-    - asymerror: {minus: -2.82492e-06, plus: 1.8419e-06}
-      label: systematic uncertainty
-    value: 9.87101e-05
-  - errors:
-    - asymerror: {minus: -1.70747e-06, plus: 1.12785e-06}
-      label: systematic uncertainty
-    value: 5.7654e-05
-  - errors:
-    - asymerror: {minus: -9.51251e-07, plus: 5.02945e-07}
-      label: systematic uncertainty
-    value: 2.84579e-05
-  - errors:
-    - asymerror: {minus: -3.99231e-07, plus: 2.14378e-07}
-      label: systematic uncertainty
-    value: 1.16512e-05
-  - errors:
-    - asymerror: {minus: -2.01344e-07, plus: 1.03628e-07}
-      label: systematic uncertainty
-    value: 5.30888e-06
-  - errors:
-    - asymerror: {minus: -1.04531e-07, plus: 4.93941e-08}
-      label: systematic uncertainty
-    value: 2.60903e-06
-  - errors:
-    - asymerror: {minus: -5.00715e-08, plus: 2.20397e-08}
-      label: systematic uncertainty
-    value: 1.21529e-06
-  - errors:
-    - asymerror: {minus: -2.13211e-08, plus: 9.72601e-09}
-      label: systematic uncertainty
-    value: 4.98369e-07
-  - errors:
-    - asymerror: {minus: -9.68793e-09, plus: 4.26164e-09}
-      label: systematic uncertainty
-    value: 1.97998e-07
-  - errors:
-    - asymerror: {minus: -2.35919e-09, plus: 1.03779e-09}
-      label: systematic uncertainty
-    value: 4.6424e-08
-independent_variables:
-- header: {name: 'Bin $p_{T}^{ll}$', units: GEV}
-  values:
-  - {high: 12, low: 10}
-  - {high: 14, low: 12}
-  - {high: 16, low: 14}
-  - {high: 18, low: 16}
-  - {high: 20, low: 18}
-  - {high: 22.5, low: 20}
-  - {high: 25, low: 22.5}
-  - {high: 27.5, low: 25}
-  - {high: 30, low: 27.5}
-  - {high: 33, low: 30}
-  - {high: 36, low: 33}
-  - {high: 39, low: 36}
-  - {high: 42, low: 39}
-  - {high: 45, low: 42}
-  - {high: 48, low: 45}
-  - {high: 51, low: 48}
-  - {high: 54, low: 51}
-  - {high: 57, low: 54}
-  - {high: 61, low: 57}
-  - {high: 65, low: 61}
-  - {high: 70, low: 65}
-  - {high: 75, low: 70}
-  - {high: 80, low: 75}
-  - {high: 85, low: 80}
-  - {high: 95, low: 85}
-  - {high: 105, low: 95}
-  - {high: 125, low: 105}
-  - {high: 150, low: 125}
-  - {high: 175, low: 150}
-  - {high: 200, low: 175}
-  - {high: 250, low: 200}
-  - {high: 300, low: 250}
-  - {high: 350, low: 300}
-  - {high: 400, low: 350}
-  - {high: 470, low: 400}
-  - {high: 550, low: 470}
-  - {high: 650, low: 550}
-  - {high: 900, low: 650}
diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/uncertainties.yaml b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/uncertainties.yaml
index 3e4edc38ff..985bd423e7 100644
--- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/uncertainties.yaml
+++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0J_13TEV_PT/uncertainties.yaml
@@ -1,590 +1,92 @@
 definitions:
-  Stat (Data):
-    description: Stat (Data) from HEPDATA
-    treatment: ADD
-    type: UNCORR
-  Stat (MC):
-    description: Stat (MC) from HEPDATA
-    treatment: ADD
-    type: UNCORR
-  Efficiencies (Uncorellated):
-    description: Efficiencies (Uncorellated) from HEPDATA
-    treatment: ADD
-    type: UNCORR
-  Scale:
-    description: Scale from HEPDATA
-    treatment: ADD
-    type: CORR
-  Resolution:
-    description: Resolution from HEPDATA
-    treatment: ADD
-    type: CORR
-  Muon Saggita:
-    description: Muon Saggita from HEPDATA
-    treatment: ADD
-    type: CORR
-  Efficiencies (Corellated):
-    description: Efficiencies (Corellated) from HEPDATA
-    treatment: ADD
-    type: CORR
-  Isolation:
-    description: Isolation from HEPDATA
-    treatment: ADD
-    type: CORR
-  Trigger:
-    description: Trigger from HEPDATA
-    treatment: ADD
-    type: CORR
-  Muon (TTVA):
-    description: Muon (TTVA) from HEPDATA
-    treatment: ADD
-    type: CORR
-  Z-vertex reweighting:
-    description: Z-vertex reweighting from HEPDATA
+  correlated uncertainty:
+    description: correlated uncertainty
     treatment: ADD
     type: CORR
-  Pile-Up:
-    description: Pile-Up from HEPDATA
+  uncorrelated uncertainty:
+    description: uncorrelated uncertainty
     treatment: ADD
-    type: CORR
-  Model:
-    description: Model from HEPDATA
-    treatment: ADD
-    type: CORR
-  Background:
-    description: Background from HEPDATA
-    treatment: ADD
-    type: CORR
+    type: UNCORR
 bins:
-- Stat (Data): 7.33895e-05
-  Stat (MC): 5.61428e-05
-  Efficiencies (Uncorellated): 7.62052e-06
-  Scale: 3.77564e-05
-  Resolution: 1.97555e-05
-  Muon Saggita: 1.3535e-06
-  Efficiencies (Corellated): 2.53077e-07
-  Isolation: -3.21406e-07
-  Trigger: 2.10548e-07
-  Muon (TTVA): 6.50403e-08
-  Z-vertex reweighting: 6.92879e-08
-  Pile-Up: -1.71301e-06
-  Model: 1.17742e-05
-  Background: 2.6144e-06
-- Stat (Data): 7.17653e-05
-  Stat (MC): 5.474e-05
-  Efficiencies (Uncorellated): 7.12003e-06
-  Scale: 1.98692e-05
-  Resolution: 5.84463e-05
-  Muon Saggita: 4.87774e-06
-  Efficiencies (Corellated): 1.95681e-07
-  Isolation: -2.92554e-07
-  Trigger: 1.15319e-07
-  Muon (TTVA): 3.40175e-08
-  Z-vertex reweighting: 1.45025e-07
-  Pile-Up: 5.05812e-07
-  Model: -1.11864e-05
-  Background: 2.53068e-06
-- Stat (Data): 6.94675e-05
-  Stat (MC): 5.2111e-05
-  Efficiencies (Uncorellated): 6.10127e-06
-  Scale: 6.02976e-06
-  Resolution: 6.11683e-05
-  Muon Saggita: 3.25268e-06
-  Efficiencies (Corellated): 1.52499e-07
-  Isolation: -2.18755e-07
-  Trigger: 9.71047e-08
-  Muon (TTVA): 2.47162e-08
-  Z-vertex reweighting: -1.00394e-07
-  Pile-Up: -7.96941e-06
-  Model: -1.47197e-05
-  Background: 2.40286e-06
-- Stat (Data): 6.63969e-05
-  Stat (MC): 4.86351e-05
-  Efficiencies (Uncorellated): 4.94684e-06
-  Scale: -2.79757e-06
-  Resolution: 4.96738e-05
-  Muon Saggita: 9.75616e-07
-  Efficiencies (Corellated): 1.32704e-07
-  Isolation: -1.42078e-07
-  Trigger: 8.05904e-08
-  Muon (TTVA): 2.73643e-08
-  Z-vertex reweighting: -1.59619e-07
-  Pile-Up: -6.7597e-06
-  Model: -3.52029e-06
-  Background: 2.39151e-06
-- Stat (Data): 6.17612e-05
-  Stat (MC): 4.51803e-05
-  Efficiencies (Uncorellated): 3.89108e-06
-  Scale: -6.10522e-06
-  Resolution: 3.30354e-05
-  Muon Saggita: 2.83518e-06
-  Efficiencies (Corellated): 1.27998e-07
-  Isolation: -7.13211e-08
-  Trigger: 8.29725e-08
-  Muon (TTVA): 3.07492e-08
-  Z-vertex reweighting: 1.00215e-07
-  Pile-Up: -5.00779e-07
-  Model: 8.49558e-06
-  Background: 2.44995e-06
-- Stat (Data): 5.77664e-05
-  Stat (MC): 4.23546e-05
-  Efficiencies (Uncorellated): 2.98307e-06
-  Scale: -1.10568e-05
-  Resolution: 2.60181e-05
-  Muon Saggita: 1.95059e-06
-  Efficiencies (Corellated): 1.23313e-07
-  Isolation: -1.24541e-08
-  Trigger: 5.55809e-08
-  Muon (TTVA): 3.15496e-08
-  Z-vertex reweighting: 2.27018e-08
-  Pile-Up: 3.02638e-06
-  Model: -5.49603e-06
-  Background: 2.43522e-06
-- Stat (Data): 5.39635e-05
-  Stat (MC): 3.97985e-05
-  Efficiencies (Uncorellated): 2.29224e-06
-  Scale: -1.23219e-05
-  Resolution: 2.03084e-05
-  Muon Saggita: 1.12455e-06
-  Efficiencies (Corellated): 1.21131e-07
-  Isolation: 3.40861e-08
-  Trigger: 8.62634e-08
-  Muon (TTVA): 4.03474e-08
-  Z-vertex reweighting: -1.27428e-07
-  Pile-Up: -2.07097e-06
-  Model: 2.01242e-06
-  Background: 2.50026e-06
-- Stat (Data): 5.06942e-05
-  Stat (MC): 3.74849e-05
-  Efficiencies (Uncorellated): 1.84072e-06
-  Scale: -1.52471e-05
-  Resolution: 1.38317e-05
-  Muon Saggita: 1.54483e-06
-  Efficiencies (Corellated): 1.17825e-07
-  Isolation: 7.36893e-08
-  Trigger: 9.41138e-08
-  Muon (TTVA): 4.85094e-08
-  Z-vertex reweighting: -1.52972e-07
-  Pile-Up: 7.05864e-07
-  Model: -6.19182e-06
-  Background: 2.64906e-06
-- Stat (Data): 4.75316e-05
-  Stat (MC): 3.53303e-05
-  Efficiencies (Uncorellated): 1.47619e-06
-  Scale: -1.60245e-05
-  Resolution: 1.20235e-05
-  Muon Saggita: 1.77062e-06
-  Efficiencies (Corellated): 1.21933e-07
-  Isolation: 1.05107e-07
-  Trigger: 9.55364e-08
-  Muon (TTVA): 6.22857e-08
-  Z-vertex reweighting: -2.7066e-07
-  Pile-Up: -1.85933e-06
-  Model: 1.60522e-06
-  Background: 2.75984e-06
-- Stat (Data): 4.48241e-05
-  Stat (MC): 3.3345e-05
-  Efficiencies (Uncorellated): 1.19656e-06
-  Scale: -1.56591e-05
-  Resolution: 8.07986e-06
-  Muon Saggita: 1.6488e-06
-  Efficiencies (Corellated): 1.27991e-07
-  Isolation: 1.3236e-07
-  Trigger: 9.55465e-08
-  Muon (TTVA): 6.6568e-08
-  Z-vertex reweighting: -1.97182e-08
-  Pile-Up: -2.63947e-06
-  Model: -2.45685e-06
-  Background: 2.92749e-06
-- Stat (Data): 4.20221e-05
-  Stat (MC): 3.14638e-05
-  Efficiencies (Uncorellated): 1.05868e-06
-  Scale: -1.70632e-05
-  Resolution: 4.19756e-06
-  Muon Saggita: 3.16e-06
-  Efficiencies (Corellated): 1.24853e-07
-  Isolation: 1.53502e-07
-  Trigger: 9.70565e-08
-  Muon (TTVA): 6.23622e-08
-  Z-vertex reweighting: 8.22088e-08
-  Pile-Up: -6.2528e-06
-  Model: -4.081e-07
-  Background: 3.035e-06
-- Stat (Data): 4.00194e-05
-  Stat (MC): 2.96676e-05
-  Efficiencies (Uncorellated): 1.01334e-06
-  Scale: -1.85262e-05
-  Resolution: 1.49509e-06
-  Muon Saggita: 2.9723e-06
-  Efficiencies (Corellated): 1.15733e-07
-  Isolation: 1.65516e-07
-  Trigger: 1.00412e-07
-  Muon (TTVA): 6.4541e-08
-  Z-vertex reweighting: 8.99594e-08
-  Pile-Up: 2.01307e-06
-  Model: -3.29613e-06
-  Background: 3.12866e-06
-- Stat (Data): 3.7446e-05
-  Stat (MC): 2.75656e-05
-  Efficiencies (Uncorellated): 9.52163e-07
-  Scale: -1.85507e-05
-  Resolution: 7.40895e-07
-  Muon Saggita: 1.76665e-06
-  Efficiencies (Corellated): 1.13246e-07
-  Isolation: 1.67276e-07
-  Trigger: 1.12278e-07
-  Muon (TTVA): 6.18923e-08
-  Z-vertex reweighting: 3.73921e-08
-  Pile-Up: 3.8748e-06
-  Model: 2.62187e-06
-  Background: 3.22543e-06
-- Stat (Data): 3.4088e-05
-  Stat (MC): 2.56061e-05
-  Efficiencies (Uncorellated): 9.32742e-07
-  Scale: -1.98298e-05
-  Resolution: 2.58524e-06
-  Muon Saggita: 6.17704e-07
-  Efficiencies (Corellated): 1.05721e-07
-  Isolation: 1.6175e-07
-  Trigger: 8.81191e-08
-  Muon (TTVA): 5.92534e-08
-  Z-vertex reweighting: 1.61865e-07
-  Pile-Up: 4.30215e-06
-  Model: 2.60744e-08
-  Background: 3.35076e-06
-- Stat (Data): 3.18739e-05
-  Stat (MC): 2.40094e-05
-  Efficiencies (Uncorellated): 1.0063e-06
-  Scale: -1.78683e-05
-  Resolution: 4.52804e-06
-  Muon Saggita: 5.04182e-07
-  Efficiencies (Corellated): 9.42208e-08
-  Isolation: 1.46781e-07
-  Trigger: 8.81487e-08
-  Muon (TTVA): 5.41781e-08
-  Z-vertex reweighting: 2.84696e-07
-  Pile-Up: 5.96245e-06
-  Model: 1.08053e-06
-  Background: 3.3264e-06
-- Stat (Data): 3.01246e-05
-  Stat (MC): 2.25086e-05
-  Efficiencies (Uncorellated): 1.12277e-06
-  Scale: -1.78014e-05
-  Resolution: 2.34797e-06
-  Muon Saggita: -1.57807e-07
-  Efficiencies (Corellated): 7.8914e-08
-  Isolation: 1.28402e-07
-  Trigger: 9.25549e-08
-  Muon (TTVA): 4.11462e-08
-  Z-vertex reweighting: 3.49903e-07
-  Pile-Up: 3.93887e-06
-  Model: 2.94885e-06
-  Background: 3.3412e-06
-- Stat (Data): 2.84876e-05
-  Stat (MC): 2.1003e-05
-  Efficiencies (Uncorellated): 1.26063e-06
-  Scale: -1.74292e-05
-  Resolution: 1.90124e-06
-  Muon Saggita: 7.91841e-07
-  Efficiencies (Corellated): 7.02334e-08
-  Isolation: 1.06839e-07
-  Trigger: 1.04588e-07
-  Muon (TTVA): 3.44895e-08
-  Z-vertex reweighting: 6.95854e-08
-  Pile-Up: 1.66478e-06
-  Model: 2.81772e-06
-  Background: 3.53285e-06
-- Stat (Data): 2.70051e-05
-  Stat (MC): 1.96268e-05
-  Efficiencies (Uncorellated): 1.33511e-06
-  Scale: -1.61827e-05
-  Resolution: 1.68493e-06
-  Muon Saggita: -5.67574e-07
-  Efficiencies (Corellated): 6.0653e-08
-  Isolation: 8.23239e-08
-  Trigger: 9.02184e-08
-  Muon (TTVA): 2.86764e-08
-  Z-vertex reweighting: -4.72017e-08
-  Pile-Up: 1.86437e-06
-  Model: 4.04169e-06
-  Background: 3.6471e-06
-- Stat (Data): 2.53968e-05
-  Stat (MC): 1.8331e-05
-  Efficiencies (Uncorellated): 1.37111e-06
-  Scale: -1.48547e-05
-  Resolution: 8.46977e-07
-  Muon Saggita: -1.53013e-06
-  Efficiencies (Corellated): 5.48623e-08
-  Isolation: 5.7094e-08
-  Trigger: 8.77286e-08
-  Muon (TTVA): 2.41059e-08
-  Z-vertex reweighting: -6.21159e-08
-  Pile-Up: -1.53326e-06
-  Model: 4.70821e-06
-  Background: 3.85463e-06
-- Stat (Data): 2.38027e-05
-  Stat (MC): 1.71423e-05
-  Efficiencies (Uncorellated): 1.39809e-06
-  Scale: -1.26621e-05
-  Resolution: 1.00756e-06
-  Muon Saggita: -7.67405e-07
-  Efficiencies (Corellated): 4.72786e-08
-  Isolation: 3.51944e-08
-  Trigger: 7.78705e-08
-  Muon (TTVA): 2.10892e-08
-  Z-vertex reweighting: 5.48967e-08
-  Pile-Up: -2.54874e-06
-  Model: 4.38535e-06
-  Background: 4.07802e-06
-- Stat (Data): 2.30294e-05
-  Stat (MC): 1.64036e-05
-  Efficiencies (Uncorellated): 1.50361e-06
-  Scale: -1.08967e-05
-  Resolution: 9.59722e-07
-  Muon Saggita: -5.12532e-07
-  Efficiencies (Corellated): 4.34535e-08
-  Isolation: 1.79093e-08
-  Trigger: 6.66279e-08
-  Muon (TTVA): 1.48838e-08
-  Z-vertex reweighting: 6.94822e-08
-  Pile-Up: -4.28194e-06
-  Model: 5.17698e-06
-  Background: 4.19639e-06
-- Stat (Data): 2.23957e-05
-  Stat (MC): 1.56341e-05
-  Efficiencies (Uncorellated): 1.6905e-06
-  Scale: -9.89894e-06
-  Resolution: -6.45403e-08
-  Muon Saggita: -8.38272e-08
-  Efficiencies (Corellated): 4.19056e-08
-  Isolation: 4.49587e-09
-  Trigger: 5.70898e-08
-  Muon (TTVA): 1.43036e-08
-  Z-vertex reweighting: 7.28613e-08
-  Pile-Up: -6.36055e-06
-  Model: 6.56265e-06
-  Background: 4.29432e-06
-- Stat (Data): 2.19764e-05
-  Stat (MC): 1.51939e-05
-  Efficiencies (Uncorellated): 2.25177e-06
-  Scale: -9.34883e-06
-  Resolution: -1.17319e-07
-  Muon Saggita: 1.17481e-07
-  Efficiencies (Corellated): 4.39376e-08
-  Isolation: -1.10006e-08
-  Trigger: 6.6948e-08
-  Muon (TTVA): 1.85314e-08
-  Z-vertex reweighting: 2.04456e-08
-  Pile-Up: -4.71622e-06
-  Model: 5.13726e-06
-  Background: 5.11883e-06
-- Stat (Data): 2.13142e-05
-  Stat (MC): 1.46701e-05
-  Efficiencies (Uncorellated): 2.9503e-06
-  Scale: -8.15195e-06
-  Resolution: 1.33488e-06
-  Muon Saggita: -6.24295e-07
-  Efficiencies (Corellated): 4.28303e-08
-  Isolation: -2.44197e-08
-  Trigger: 5.68307e-08
-  Muon (TTVA): 1.78049e-08
-  Z-vertex reweighting: 3.99906e-08
-  Pile-Up: -3.52917e-06
-  Model: 7.06317e-06
-  Background: 5.61711e-06
-- Stat (Data): 2.07709e-05
-  Stat (MC): 1.40044e-05
-  Efficiencies (Uncorellated): 3.4922e-06
-  Scale: -6.65262e-06
-  Resolution: 1.17755e-06
-  Muon Saggita: -1.88947e-07
-  Efficiencies (Corellated): 4.68971e-08
-  Isolation: -3.42587e-08
-  Trigger: 4.72464e-08
-  Muon (TTVA): 1.88156e-08
-  Z-vertex reweighting: 1.90233e-07
-  Pile-Up: -2.83033e-06
-  Model: 6.57973e-06
-  Background: 6.48474e-06
-- Stat (Data): 1.94042e-05
-  Stat (MC): 1.30219e-05
-  Efficiencies (Uncorellated): 3.90433e-06
-  Scale: -6.49504e-06
-  Resolution: 4.24838e-07
-  Muon Saggita: -5.19957e-07
-  Efficiencies (Corellated): 5.24325e-08
-  Isolation: -3.45687e-08
-  Trigger: 3.84579e-08
-  Muon (TTVA): 1.87857e-08
-  Z-vertex reweighting: 1.9247e-07
-  Pile-Up: -1.92523e-06
-  Model: 7.42633e-06
-  Background: 6.60558e-06
-- Stat (Data): 1.84027e-05
-  Stat (MC): 1.21705e-05
-  Efficiencies (Uncorellated): 4.5605e-06
-  Scale: -5.68654e-06
-  Resolution: 5.09838e-07
-  Muon Saggita: -1.45038e-07
-  Efficiencies (Corellated): 5.77501e-08
-  Isolation: -2.76893e-08
-  Trigger: 2.90513e-08
-  Muon (TTVA): 1.83084e-08
-  Z-vertex reweighting: 2.09709e-07
-  Pile-Up: -2.24286e-06
-  Model: 6.24654e-06
-  Background: 6.3272e-06
-- Stat (Data): 1.68795e-05
-  Stat (MC): 1.10661e-05
-  Efficiencies (Uncorellated): 4.88845e-06
-  Scale: -5.25178e-06
-  Resolution: 2.18449e-08
-  Muon Saggita: 1.67385e-07
-  Efficiencies (Corellated): 5.8729e-08
-  Isolation: -1.45591e-08
-  Trigger: 2.99702e-08
-  Muon (TTVA): 1.78685e-08
-  Z-vertex reweighting: 1.87948e-07
-  Pile-Up: -1.31029e-06
-  Model: 6.94908e-06
-  Background: 5.94929e-06
-- Stat (Data): 1.51898e-05
-  Stat (MC): 9.98235e-06
-  Efficiencies (Uncorellated): 5.02588e-06
-  Scale: -4.52099e-06
-  Resolution: 3.78211e-07
-  Muon Saggita: 1.90734e-07
-  Efficiencies (Corellated): 6.20607e-08
-  Isolation: 5.49643e-09
-  Trigger: 2.97613e-08
-  Muon (TTVA): 1.60882e-08
-  Z-vertex reweighting: 1.36273e-07
-  Pile-Up: -1.44537e-06
-  Model: 5.20604e-06
-  Background: 5.65289e-06
-- Stat (Data): 1.35198e-05
-  Stat (MC): 8.93984e-06
-  Efficiencies (Uncorellated): 5.0556e-06
-  Scale: -3.3474e-06
-  Resolution: 1.48667e-06
-  Muon Saggita: -1.2971e-07
-  Efficiencies (Corellated): 6.06227e-08
-  Isolation: 2.20514e-08
-  Trigger: 1.31443e-08
-  Muon (TTVA): 1.0181e-08
-  Z-vertex reweighting: 1.56472e-07
-  Pile-Up: -3.4362e-07
-  Model: 5.02928e-06
-  Background: 4.50194e-06
-- Stat (Data): 1.20941e-05
-  Stat (MC): 7.9546e-06
-  Efficiencies (Uncorellated): 5.01282e-06
-  Scale: -2.65642e-06
-  Resolution: 3.6665e-07
-  Muon Saggita: 2.11125e-07
-  Efficiencies (Corellated): 5.81755e-08
-  Isolation: 3.55273e-08
-  Trigger: 5.87751e-09
-  Muon (TTVA): 7.66417e-09
-  Z-vertex reweighting: 1.86299e-07
-  Pile-Up: 1.57331e-07
-  Model: 3.53347e-06
-  Background: 3.39571e-06
-- Stat (Data): 1.02064e-05
-  Stat (MC): 6.66204e-06
-  Efficiencies (Uncorellated): 4.83028e-06
-  Scale: -1.86636e-06
-  Resolution: 1.29541e-07
-  Muon Saggita: -7.20025e-09
-  Efficiencies (Corellated): 5.07157e-08
-  Isolation: 5.03334e-08
-  Trigger: 4.42277e-09
-  Muon (TTVA): 5.04696e-09
-  Z-vertex reweighting: 1.21902e-07
-  Pile-Up: -1.60957e-06
-  Model: 2.413e-06
-  Background: 1.95583e-06
-- Stat (Data): 8.57885e-06
-  Stat (MC): 5.54456e-06
-  Efficiencies (Uncorellated): 4.5748e-06
-  Scale: -1.01055e-06
-  Resolution: 3.58043e-07
-  Muon Saggita: 5.50235e-07
-  Efficiencies (Corellated): 4.06072e-08
-  Isolation: 5.54564e-08
-  Trigger: 3.94941e-09
-  Muon (TTVA): 3.29871e-09
-  Z-vertex reweighting: 7.91474e-08
-  Pile-Up: -4.53731e-07
-  Model: 1.38539e-06
-  Background: 1.1472e-06
-- Stat (Data): 6.71408e-06
-  Stat (MC): 4.25548e-06
-  Efficiencies (Uncorellated): 3.9375e-06
-  Scale: -7.28519e-07
-  Resolution: 7.01139e-08
-  Muon Saggita: -7.57883e-08
-  Efficiencies (Corellated): 3.23173e-08
-  Isolation: 5.67922e-08
-  Trigger: 3.41196e-09
-  Muon (TTVA): 2.47786e-09
-  Z-vertex reweighting: 1.98127e-08
-  Pile-Up: -2.60461e-08
-  Model: 1.11055e-06
-  Background: 7.45763e-07
-- Stat (Data): 5.30023e-06
-  Stat (MC): 3.18385e-06
-  Efficiencies (Uncorellated): 3.44839e-06
-  Scale: -4.23367e-07
-  Resolution: 1.97343e-07
-  Muon Saggita: 2.2637e-08
-  Efficiencies (Corellated): 2.60259e-08
-  Isolation: 6.69081e-08
-  Trigger: 1.96811e-09
-  Muon (TTVA): 1.53263e-09
-  Z-vertex reweighting: 1.32503e-08
-  Pile-Up: 2.11241e-07
-  Model: 4.41613e-07
-  Background: 5.08448e-07
-- Stat (Data): 4.3265e-06
-  Stat (MC): 2.61206e-06
-  Efficiencies (Uncorellated): 3.04439e-06
-  Scale: -2.73916e-07
-  Resolution: 1.35954e-07
-  Muon Saggita: 4.65252e-08
-  Efficiencies (Corellated): 1.76095e-08
-  Isolation: 6.70416e-08
-  Trigger: 1.48804e-09
-  Muon (TTVA): 7.49586e-10
-  Z-vertex reweighting: 3.37543e-08
-  Pile-Up: -3.27592e-07
-  Model: 4.21401e-07
-  Background: 2.68876e-07
-- Stat (Data): 3.51926e-06
-  Stat (MC): 2.15748e-06
-  Efficiencies (Uncorellated): 2.66722e-06
-  Scale: -1.28097e-07
-  Resolution: -3.82766e-08
-  Muon Saggita: -6.08179e-08
-  Efficiencies (Corellated): 1.34607e-08
-  Isolation: 6.52608e-08
-  Trigger: 1.47186e-09
-  Muon (TTVA): 3.26564e-10
-  Z-vertex reweighting: 1.28093e-08
-  Pile-Up: -4.9854e-07
-  Model: -1.26955e-08
-  Background: 1.52496e-07
-- Stat (Data): 2.7789e-06
-  Stat (MC): 1.6112e-06
-  Efficiencies (Uncorellated): 1.80584e-06
-  Scale: -9.40508e-08
-  Resolution: 3.78e-08
-  Muon Saggita: -8.05586e-08
-  Efficiencies (Corellated): 1.04764e-08
-  Isolation: 6.94277e-08
-  Trigger: 1.43169e-09
-  Muon (TTVA): 3.50994e-10
-  Z-vertex reweighting: 5.65969e-09
-  Pile-Up: 2.46545e-07
-  Model: 1.62069e-07
-  Background: 1.01672e-07
+- correlated uncertainty: 2.1603653922e-05
+  uncorrelated uncertainty: 3.8007584704500004e-05
+- correlated uncertainty: 1.7372605932e-05
+  uncorrelated uncertainty: 3.6609857233199994e-05
+- correlated uncertainty: 2.0601670559499998e-05
+  uncorrelated uncertainty: 3.6921465515e-05
+- correlated uncertainty: 2.0620072338800002e-05
+  uncorrelated uncertainty: 3.6262646552e-05
+- correlated uncertainty: 1.5129091226100001e-05
+  uncorrelated uncertainty: 3.3877389534e-05
+- correlated uncertainty: 9.809163156e-06
+  uncorrelated uncertainty: 3.091792964e-05
+- correlated uncertainty: 6.34723025e-06
+  uncorrelated uncertainty: 2.86540695e-05
+- correlated uncertainty: 4.02096756e-06
+  uncorrelated uncertainty: 2.1331351499999998e-05
+- correlated uncertainty: 4.4792757200000005e-06
+  uncorrelated uncertainty: 2.0069054199999998e-05
+- correlated uncertainty: 4.6069287745e-06
+  uncorrelated uncertainty: 1.8890240369e-05
+- correlated uncertainty: 4.864113693959999e-06
+  uncorrelated uncertainty: 1.78113158824e-05
+- correlated uncertainty: 4.82010565968e-06
+  uncorrelated uncertainty: 1.3950468192899997e-05
+- correlated uncertainty: 5.29285026334e-06
+  uncorrelated uncertainty: 1.31870866812e-05
+- correlated uncertainty: 5.38821770052e-06
+  uncorrelated uncertainty: 1.2305142193199999e-05
+- correlated uncertainty: 5.6341875894e-06
+  uncorrelated uncertainty: 1.12859318748e-05
+- correlated uncertainty: 5.203129204e-06
+  uncorrelated uncertainty: 1.05976915408e-05
+- correlated uncertainty: 5.1048783201e-06
+  uncorrelated uncertainty: 9.9485106513e-06
+- correlated uncertainty: 4.978987899899999e-06
+  uncorrelated uncertainty: 9.355940634599999e-06
+- correlated uncertainty: 4.634405059399999e-06
+  uncorrelated uncertainty: 8.7977599695e-06
+- correlated uncertainty: 4.3590881454e-06
+  uncorrelated uncertainty: 8.2680680085e-06
+- correlated uncertainty: 2.8712621969999995e-06
+  uncorrelated uncertainty: 5.816234576699999e-06
+- correlated uncertainty: 2.644600476e-06
+  uncorrelated uncertainty: 5.5987437799999994e-06
+- correlated uncertainty: 2.1053065118e-06
+  uncorrelated uncertainty: 4.3334899413e-06
+- correlated uncertainty: 1.9652425259999997e-06
+  uncorrelated uncertainty: 4.232322262999999e-06
+- correlated uncertainty: 1.928359763e-06
+  uncorrelated uncertainty: 4.1147947825e-06
+- correlated uncertainty: 1.8108055460700002e-06
+  uncorrelated uncertainty: 3.98588136183e-06
+- correlated uncertainty: 9.158850667200001e-07
+  uncorrelated uncertainty: 1.8724771533e-06
+- correlated uncertainty: 8.5726465213e-07
+  uncorrelated uncertainty: 1.7732602749300002e-06
+- correlated uncertainty: 4.0479524969e-07
+  uncorrelated uncertainty: 8.149935168000001e-07
+- correlated uncertainty: 2.9294001792e-07
+  uncorrelated uncertainty: 5.9314334976e-07
+- correlated uncertainty: 2.490762556e-07
+  uncorrelated uncertainty: 5.3331214148e-07
+- correlated uncertainty: 1.8549090541799996e-07
+  uncorrelated uncertainty: 4.78661972516e-07
+- correlated uncertainty: 6.707285288e-08
+  uncorrelated uncertainty: 2.0152103439999997e-07
+- correlated uncertainty: 4.2076964861999995e-08
+  uncorrelated uncertainty: 1.6915459099e-07
+- correlated uncertainty: 3.31609163137e-08
+  uncorrelated uncertainty: 1.32835146572e-07
+- correlated uncertainty: 2.49122116053e-08
+  uncorrelated uncertainty: 1.04070881677e-07
+- correlated uncertainty: 1.0319312957399998e-08
+  uncorrelated uncertainty: 6.0984180034e-08
+- correlated uncertainty: 6.3786227849999995e-09
+  uncorrelated uncertainty: 4.3656196619000005e-08
+- correlated uncertainty: 3.1147652682e-09
+  uncorrelated uncertainty: 2.5936918396e-08
+- correlated uncertainty: 9.321435992799998e-10
+  uncorrelated uncertainty: 8.0466620482e-09
+- correlated uncertainty: 1.5879976934700002e-07
+  uncorrelated uncertainty: 1.51827082282e-06
diff --git a/validphys2/src/validphys/cuts/filters.yaml b/validphys2/src/validphys/cuts/filters.yaml
index 985c4ea345..ade7edcd07 100644
--- a/validphys2/src/validphys/cuts/filters.yaml
+++ b/validphys2/src/validphys/cuts/filters.yaml
@@ -262,8 +262,8 @@
   rule: "pT >= 30"
 
 - dataset: ATLAS_Z0J_13TEV_PT_LL
-  reason: Avoid the large pT region where the statistics are not very good.
-  rule: "pT <= 600"
+  reason: Avoid the large pT region where EWK corrections are important.
+  rule: "pT <= 150"
 
 - dataset: CMS_Z0J_8TEV_PT-Y
   reason: Avoid the region where resummation effects become important.