Repository: mlco2/codecarbon (language: python)

Issue:
Errors in data manipulation of the `carbonboard`
* CodeCarbon version: 2.2.4
* Python version: Python 3.10.12
* Operating System: MacOS 13.4.1 

### Description

I just discovered this very cool project, thank you for creating it! 🙂

I am currently testing `codecarbon` locally to see how it works, and I have noticed some possible bugs with the data manipulation in the local `carbonboard`.

### What I Did

- Created a very simple script that uses `EmissionsTracker` to track energy usage.
- Run `carbonboard --filepath="emissions.csv" --port=3333` to visualise the results

### Errors

These are some of the Exceptions that I saw in the Dash app logs:

```
  File "/[path]/miniconda3/envs/code-carbon-test/lib/python3.10/site-packages/codecarbon/core/emissions.py", line 228, in _global_energy_mix_to_emissions_rate
    energy_sum = energy_mix["total_TWh"]
KeyError: 'total_TWh'
```

```
  File "/[path]/miniconda3/envs/code-carbon-test/lib/python3.10/site-packages/codecarbon/viz/data.py", line 130, in get_global_emissions_choropleth_data
    global_energy_mix[country_iso_code]["fossil_TWh"], total
KeyError: 'fossil_TWh'
```

```
  File "/[path]/miniconda3/envs/code-carbon-test/lib/python3.10/site-packages/pandas/core/methods/to_dict.py", line 207, in to_dict
    raise ValueError(f"orient '{orient}' not understood")
ValueError: orient 'rows' not understood
```

### (Possible) Solutions

I have noticed that the keys/column names of the data used in the dashboard have changed in https://github.com/mlco2/codecarbon/pull/350/files#diff-729fd2eaf00d62e16106163521e91a169e8a24cf9d17250b5ff6bfc6cabafcda

The names affected should be updated and also the `orient="rows"` should be changed.

I will make a PR to solve this if you agree :)



Discussion / hints:

Fix patch:
diff --git a/.conda/meta.yaml b/.conda/meta.yaml
index 54df5f3e7..225dc76a5 100644
--- a/.conda/meta.yaml
+++ b/.conda/meta.yaml
@@ -1,4 +1,4 @@
-{% set version = "2.2.6" %}
+{% set version = "2.2.7" %}
 
 package:
   name: codecarbon
diff --git a/codecarbon/_version.py b/codecarbon/_version.py
index a7ecb802b..90a1f38f9 100644
--- a/codecarbon/_version.py
+++ b/codecarbon/_version.py
@@ -1,1 +1,1 @@
-__version__ = "2.2.6"
+__version__ = "2.2.7"
diff --git a/codecarbon/core/emissions.py b/codecarbon/core/emissions.py
index 42208ffa5..2b5b5f49b 100644
--- a/codecarbon/core/emissions.py
+++ b/codecarbon/core/emissions.py
@@ -195,7 +195,6 @@ def get_country_emissions(self, energy: Energy, geo: GeoMetadata) -> float:
             )  # kgs
 
         country_energy_mix: Dict = energy_mix[geo.country_iso_code]
-
         emissions_per_kWh = self._global_energy_mix_to_emissions_rate(
             country_energy_mix
         )
@@ -243,7 +242,7 @@ def _global_energy_mix_to_emissions_rate(energy_mix: Dict) -> EmissionsPerKWh:
         # Sanity check
         if energy_sum_computed != energy_sum:
             logger.error(
-                f"We find {energy_sum_computed} TWh instead of {energy_sum} TWh for {energy_mix.get('official_name_en')}, using world average."
+                f"We find {energy_sum_computed} TWh instead of {energy_sum} TWh for {energy_mix.get('country_name')}, using world average."
             )
             return EmissionsPerKWh.from_g_per_kWh(
                 carbon_intensity_per_source.get("world_average")
diff --git a/codecarbon/data/private_infra/2023-07-07-22-40-48.png b/codecarbon/data/private_infra/2023-07-07-22-40-48.png
new file mode 100644
index 000000000..62020d9f2
Binary files /dev/null and b/codecarbon/data/private_infra/2023-07-07-22-40-48.png differ
diff --git a/codecarbon/data/private_infra/global_energy_mix.json b/codecarbon/data/private_infra/global_energy_mix.json
index 70463d7fe..eaf876899 100644
--- a/codecarbon/data/private_infra/global_energy_mix.json
+++ b/codecarbon/data/private_infra/global_energy_mix.json
@@ -1,4265 +1,4307 @@
 {
     "ABW": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 591.398,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Aruba",
-        "fossil_Twh": 0.78,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 0.78,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "ABW",
-        "low_carbon_Twh": 0.15,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.78,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 8728.87,
-        "renewables_Twh": 0.15,
-        "solar_Twh": 0.01,
-        "total_Twh": 8730.880000000001,
-        "wind_Twh": 0.14,
+        "low_carbon_TWh": 0.15,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.78,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 8728.87,
+        "renewables_TWh": 0.15,
+        "solar_TWh": 0.01,
+        "total_TWh": 0.93,
+        "wind_TWh": 0.14,
         "year": 2021
     },
     "AFG": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 120.482,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Afghanistan",
-        "fossil_Twh": 0.13,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.62,
+        "fossil_TWh": 0.13,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.62,
         "iso_code": "AFG",
-        "low_carbon_Twh": 0.7,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.13,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 20.699,
-        "renewables_Twh": 0.7,
-        "solar_Twh": 0.08,
-        "total_Twh": 23.059,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.7,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.13,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 20.699,
+        "renewables_TWh": 0.7,
+        "solar_TWh": 0.08,
+        "total_TWh": 0.83,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "AGO": {
-        "biofuel_Twh": 0.28,
-        "carbon_intensity": 168.594,
-        "coal_Twh": 0.0,
+        "biofuel_TWh": 0.14,
+        "carbon_intensity": 195.983,
+        "coal_TWh": 0.0,
         "country_name": "Angola",
-        "fossil_Twh": 4.63,
-        "gaz_Twh": 3.89,
-        "hydroelectricity_Twh": 11.5,
+        "fossil_TWh": 4.77,
+        "gas_TWh": 2.01,
+        "hydroelectricity_TWh": 11.5,
         "iso_code": "AGO",
-        "low_carbon_Twh": 11.8,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.74,
-        "other_renewable_Twh": 0.28,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 476.18,
-        "renewables_Twh": 11.8,
-        "solar_Twh": 0.02,
-        "total_Twh": 521.1199999999999,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 11.66,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 2.76,
+        "other_renewable_TWh": 0.14,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 476.18,
+        "renewables_TWh": 11.66,
+        "solar_TWh": 0.02,
+        "total_TWh": 16.43,
+        "wind_TWh": 0.0,
+        "year": 2021
+    },
+    "ALB": {
+        "biofuel_TWh": 0.0,
+        "carbon_intensity": 23.437,
+        "coal_TWh": 0.0,
+        "country_name": "Albania",
+        "fossil_TWh": 0.0,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 8.89,
+        "iso_code": "ALB",
+        "low_carbon_TWh": 8.96,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.0,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 3138.673,
+        "renewables_TWh": 8.96,
+        "solar_TWh": 0.07,
+        "total_TWh": 8.96,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "ARE": {
-        "biofuel_Twh": 0.01,
+        "biofuel_TWh": 0.01,
         "carbon_intensity": 461.845,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "United Arab Emirates",
-        "fossil_Twh": 127.14,
-        "gaz_Twh": 127.14,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 127.14,
+        "gas_TWh": 127.14,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "ARE",
-        "low_carbon_Twh": 8.49,
-        "nuclear_Twh": 1.79,
-        "oil_Twh": 0.0,
-        "other_renewable_Twh": 0.01,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 14482.418,
-        "renewables_Twh": 6.7,
-        "solar_Twh": 6.69,
-        "total_Twh": 14758.598,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 8.49,
+        "nuclear_TWh": 1.79,
+        "oil_TWh": 0.0,
+        "other_renewable_TWh": 0.01,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 14482.418,
+        "renewables_TWh": 6.7,
+        "solar_TWh": 6.69,
+        "total_TWh": 135.63,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "ARG": {
-        "biofuel_Twh": 2.01,
+        "biofuel_TWh": 2.01,
         "carbon_intensity": 357.786,
-        "coal_Twh": 2.78,
+        "coal_TWh": 2.78,
         "country_name": "Argentina",
-        "fossil_Twh": 99.33,
-        "gaz_Twh": 88.99,
-        "hydroelectricity_Twh": 20.19,
+        "fossil_TWh": 99.33,
+        "gas_TWh": 88.99,
+        "hydroelectricity_TWh": 20.19,
         "iso_code": "ARG",
-        "low_carbon_Twh": 47.35,
-        "nuclear_Twh": 10.17,
-        "oil_Twh": 7.56,
-        "other_renewable_Twh": 2.01,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 3239.629,
-        "renewables_Twh": 37.18,
-        "solar_Twh": 2.17,
-        "total_Twh": 3562.0090000000005,
-        "wind_Twh": 12.81,
+        "low_carbon_TWh": 47.35,
+        "nuclear_TWh": 10.17,
+        "oil_TWh": 7.56,
+        "other_renewable_TWh": 2.01,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 3239.629,
+        "renewables_TWh": 37.18,
+        "solar_TWh": 2.17,
+        "total_TWh": 146.67999999999998,
+        "wind_TWh": 12.81,
         "year": 2021
     },
     "ARM": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 222.678,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Armenia",
-        "fossil_Twh": 3.18,
-        "gaz_Twh": 3.18,
-        "hydroelectricity_Twh": 2.2,
+        "fossil_TWh": 3.18,
+        "gas_TWh": 3.18,
+        "hydroelectricity_TWh": 2.2,
         "iso_code": "ARM",
-        "low_carbon_Twh": 4.14,
-        "nuclear_Twh": 1.85,
-        "oil_Twh": 0.0,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 2622.743,
-        "renewables_Twh": 2.29,
-        "solar_Twh": 0.09,
-        "total_Twh": 2637.8229999999994,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 4.14,
+        "nuclear_TWh": 1.85,
+        "oil_TWh": 0.0,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 2622.743,
+        "renewables_TWh": 2.29,
+        "solar_TWh": 0.09,
+        "total_TWh": 7.32,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "ASM": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 687.5,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "American Samoa",
-        "fossil_Twh": 0.16,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 0.16,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "ASM",
-        "low_carbon_Twh": 0.0,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.16,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 3551.136,
-        "renewables_Twh": 0.0,
-        "solar_Twh": 0.0,
-        "total_Twh": 3551.4559999999997,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.0,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.16,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 3551.136,
+        "renewables_TWh": 0.0,
+        "solar_TWh": 0.0,
+        "total_TWh": 0.16,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "ATG": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 657.143,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Antigua and Barbuda",
-        "fossil_Twh": 0.33,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 0.33,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "ATG",
-        "low_carbon_Twh": 0.02,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.33,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 3754.197,
-        "renewables_Twh": 0.02,
-        "solar_Twh": 0.02,
-        "total_Twh": 3754.917,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.02,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.33,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 3754.197,
+        "renewables_TWh": 0.02,
+        "solar_TWh": 0.02,
+        "total_TWh": 0.35000000000000003,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "AUS": {
-        "biofuel_Twh": 3.09,
+        "biofuel_TWh": 3.09,
         "carbon_intensity": 531.247,
-        "coal_Twh": 126.79,
+        "coal_TWh": 126.79,
         "country_name": "Australia",
-        "fossil_Twh": 175.08,
-        "gaz_Twh": 43.95,
-        "hydroelectricity_Twh": 14.76,
+        "fossil_TWh": 175.08,
+        "gas_TWh": 43.95,
+        "hydroelectricity_TWh": 14.76,
         "iso_code": "AUS",
-        "low_carbon_Twh": 71.98,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 4.34,
-        "other_renewable_Twh": 3.09,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 9531.233,
-        "renewables_Twh": 71.98,
-        "solar_Twh": 28.04,
-        "total_Twh": 10100.423,
-        "wind_Twh": 26.09,
+        "low_carbon_TWh": 71.98,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 4.34,
+        "other_renewable_TWh": 3.09,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 9531.233,
+        "renewables_TWh": 71.98,
+        "solar_TWh": 28.04,
+        "total_TWh": 247.06,
+        "wind_TWh": 26.09,
         "year": 2021
     },
     "AUT": {
-        "biofuel_Twh": 4.03,
-        "carbon_intensity": 91.006,
-        "coal_Twh": 0.24,
+        "biofuel_TWh": 4.48,
+        "carbon_intensity": 147.573,
+        "coal_TWh": 0.14,
         "country_name": "Austria",
-        "fossil_Twh": 14.48,
-        "gaz_Twh": 10.84,
-        "hydroelectricity_Twh": 39.69,
+        "fossil_TWh": 14.2,
+        "gas_TWh": 10.62,
+        "hydroelectricity_TWh": 38.75,
         "iso_code": "AUT",
-        "low_carbon_Twh": 51.45,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 3.4,
-        "other_renewable_Twh": 4.03,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 7389.527,
-        "renewables_Twh": 51.45,
-        "solar_Twh": 1.25,
-        "total_Twh": 7576.866999999999,
-        "wind_Twh": 6.48,
+        "low_carbon_TWh": 52.75,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 3.44,
+        "other_renewable_TWh": 4.48,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 7503.85,
+        "renewables_TWh": 52.75,
+        "solar_TWh": 2.78,
+        "total_TWh": 66.95,
+        "wind_TWh": 6.74,
         "year": 2021
     },
     "AZE": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 532.902,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Azerbaijan",
-        "fossil_Twh": 24.87,
-        "gaz_Twh": 16.36,
-        "hydroelectricity_Twh": 1.28,
+        "fossil_TWh": 24.87,
+        "gas_TWh": 16.36,
+        "hydroelectricity_TWh": 1.28,
         "iso_code": "AZE",
-        "low_carbon_Twh": 1.42,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 8.51,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 2549.212,
-        "renewables_Twh": 1.42,
-        "solar_Twh": 0.05,
-        "total_Twh": 2603.2120000000004,
-        "wind_Twh": 0.09,
+        "low_carbon_TWh": 1.42,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 8.51,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 2549.212,
+        "renewables_TWh": 1.42,
+        "solar_TWh": 0.05,
+        "total_TWh": 26.29,
+        "wind_TWh": 0.09,
         "year": 2021
     },
     "BDI": {
-        "biofuel_Twh": 0.01,
+        "biofuel_TWh": 0.01,
         "carbon_intensity": 250.0,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Burundi",
-        "fossil_Twh": 0.12,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.22,
+        "fossil_TWh": 0.12,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.22,
         "iso_code": "BDI",
-        "low_carbon_Twh": 0.24,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.12,
-        "other_renewable_Twh": 0.01,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 28.682,
-        "renewables_Twh": 0.24,
-        "solar_Twh": 0.01,
-        "total_Twh": 29.651999999999997,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.24,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.12,
+        "other_renewable_TWh": 0.01,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 28.682,
+        "renewables_TWh": 0.24,
+        "solar_TWh": 0.01,
+        "total_TWh": 0.36,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "BEL": {
-        "biofuel_Twh": 5.05,
-        "carbon_intensity": 142.697,
-        "coal_Twh": 0.09,
+        "biofuel_TWh": 4.69,
+        "carbon_intensity": 156.922,
+        "coal_TWh": 0.04,
         "country_name": "Belgium",
-        "fossil_Twh": 24.85,
-        "gaz_Twh": 21.14,
-        "hydroelectricity_Twh": 0.37,
+        "fossil_TWh": 25.97,
+        "gas_TWh": 22.52,
+        "hydroelectricity_TWh": 0.42,
         "iso_code": "BEL",
-        "low_carbon_Twh": 73.26,
-        "nuclear_Twh": 50.03,
-        "oil_Twh": 3.62,
-        "other_renewable_Twh": 5.05,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 8449.443,
-        "renewables_Twh": 23.23,
-        "solar_Twh": 5.41,
-        "total_Twh": 8623.912999999999,
-        "wind_Twh": 12.4,
+        "low_carbon_TWh": 73.06,
+        "nuclear_TWh": 50.33,
+        "oil_TWh": 3.41,
+        "other_renewable_TWh": 4.69,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 8528.676,
+        "renewables_TWh": 22.73,
+        "solar_TWh": 5.62,
+        "total_TWh": 99.03,
+        "wind_TWh": 12.0,
         "year": 2021
     },
     "BEN": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 666.667,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Benin",
-        "fossil_Twh": 0.23,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 0.23,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "BEN",
-        "low_carbon_Twh": 0.01,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.23,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 18.466,
-        "renewables_Twh": 0.01,
-        "solar_Twh": 0.01,
-        "total_Twh": 18.956,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.01,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.23,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 18.466,
+        "renewables_TWh": 0.01,
+        "solar_TWh": 0.01,
+        "total_TWh": 0.24000000000000002,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "BFA": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 611.429,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Burkina Faso",
-        "fossil_Twh": 1.52,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.11,
+        "fossil_TWh": 1.52,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.11,
         "iso_code": "BFA",
-        "low_carbon_Twh": 0.23,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 1.52,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 79.183,
-        "renewables_Twh": 0.23,
-        "solar_Twh": 0.12,
-        "total_Twh": 82.91300000000001,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.23,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 1.52,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 79.183,
+        "renewables_TWh": 0.23,
+        "solar_TWh": 0.12,
+        "total_TWh": 1.75,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "BGD": {
-        "biofuel_Twh": 0.03,
-        "carbon_intensity": 560.506,
-        "coal_Twh": 10.16,
+        "biofuel_TWh": 0.03,
+        "carbon_intensity": 555.914,
+        "coal_TWh": 9.56,
         "country_name": "Bangladesh",
-        "fossil_Twh": 79.18,
-        "gaz_Twh": 54.93,
-        "hydroelectricity_Twh": 0.88,
+        "fossil_TWh": 79.18,
+        "gas_TWh": 56.35,
+        "hydroelectricity_TWh": 0.88,
         "iso_code": "BGD",
-        "low_carbon_Twh": 1.39,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 14.09,
-        "other_renewable_Twh": 0.03,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 475.743,
-        "renewables_Twh": 1.39,
-        "solar_Twh": 0.47,
-        "total_Twh": 638.303,
-        "wind_Twh": 0.01,
+        "low_carbon_TWh": 1.39,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 13.27,
+        "other_renewable_TWh": 0.03,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 475.743,
+        "renewables_TWh": 1.39,
+        "solar_TWh": 0.47,
+        "total_TWh": 80.57000000000001,
+        "wind_TWh": 0.01,
         "year": 2021
     },
     "BGR": {
-        "biofuel_Twh": 1.82,
-        "carbon_intensity": 424.809,
-        "coal_Twh": 17.73,
+        "biofuel_TWh": 2.59,
+        "carbon_intensity": 354.334,
+        "coal_TWh": 17.09,
         "country_name": "Bulgaria",
-        "fossil_Twh": 20.87,
-        "gaz_Twh": 2.74,
-        "hydroelectricity_Twh": 4.92,
+        "fossil_TWh": 20.5,
+        "gas_TWh": 3.05,
+        "hydroelectricity_TWh": 4.82,
         "iso_code": "BGR",
-        "low_carbon_Twh": 26.21,
-        "nuclear_Twh": 16.49,
-        "oil_Twh": 0.4,
-        "other_renewable_Twh": 1.82,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 6837.196,
-        "renewables_Twh": 9.72,
-        "solar_Twh": 1.55,
-        "total_Twh": 6926.405999999999,
-        "wind_Twh": 1.43,
+        "low_carbon_TWh": 26.8,
+        "nuclear_TWh": 16.49,
+        "oil_TWh": 0.36,
+        "other_renewable_TWh": 2.59,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 6869.145,
+        "renewables_TWh": 10.31,
+        "solar_TWh": 1.47,
+        "total_TWh": 47.3,
+        "wind_TWh": 1.43,
         "year": 2021
     },
     "BHR": {
-        "biofuel_Twh": 0.0,
-        "carbon_intensity": 489.924,
-        "coal_Twh": 0.0,
+        "biofuel_TWh": 0.0,
+        "carbon_intensity": 489.77,
+        "coal_TWh": 0.0,
         "country_name": "Bahrain",
-        "fossil_Twh": 31.75,
-        "gaz_Twh": 31.72,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 31.76,
+        "gas_TWh": 31.76,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "BHR",
-        "low_carbon_Twh": 0.01,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.03,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 21704.871,
-        "renewables_Twh": 0.01,
-        "solar_Twh": 0.01,
-        "total_Twh": 21768.400999999994,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.01,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.0,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 21711.707,
+        "renewables_TWh": 0.01,
+        "solar_TWh": 0.01,
+        "total_TWh": 31.770000000000003,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "BHS": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 698.113,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Bahamas",
-        "fossil_Twh": 2.12,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 2.12,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "BHS",
-        "low_carbon_Twh": 0.0,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 2.12,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 5197.097,
-        "renewables_Twh": 0.0,
-        "solar_Twh": 0.0,
-        "total_Twh": 5201.3369999999995,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.0,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 2.12,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 5197.097,
+        "renewables_TWh": 0.0,
+        "solar_TWh": 0.0,
+        "total_TWh": 2.12,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "BIH": {
-        "biofuel_Twh": 0.01,
-        "carbon_intensity": 481.859,
-        "coal_Twh": 10.99,
+        "biofuel_TWh": 0.01,
+        "carbon_intensity": 489.643,
+        "coal_TWh": 10.1,
         "country_name": "Bosnia and Herzegovina",
-        "fossil_Twh": 11.06,
-        "gaz_Twh": 0.02,
-        "hydroelectricity_Twh": 6.18,
+        "fossil_TWh": 10.2,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 6.72,
         "iso_code": "BIH",
-        "low_carbon_Twh": 6.58,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.05,
-        "other_renewable_Twh": 0.01,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 5392.932,
-        "renewables_Twh": 6.58,
-        "solar_Twh": 0.03,
-        "total_Twh": 5434.802000000001,
-        "wind_Twh": 0.36,
+        "low_carbon_TWh": 7.18,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.1,
+        "other_renewable_TWh": 0.01,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 5313.444,
+        "renewables_TWh": 7.18,
+        "solar_TWh": 0.07,
+        "total_TWh": 17.38,
+        "wind_TWh": 0.38,
         "year": 2021
     },
     "BLR": {
-        "biofuel_Twh": 0.55,
-        "carbon_intensity": 415.774,
-        "coal_Twh": 0.0,
+        "biofuel_TWh": 0.54,
+        "carbon_intensity": 415.641,
+        "coal_TWh": 0.0,
         "country_name": "Belarus",
-        "fossil_Twh": 36.78,
-        "gaz_Twh": 36.78,
-        "hydroelectricity_Twh": 0.39,
+        "fossil_TWh": 36.78,
+        "gas_TWh": 36.78,
+        "hydroelectricity_TWh": 0.39,
         "iso_code": "BLR",
-        "low_carbon_Twh": 7.09,
-        "nuclear_Twh": 5.78,
-        "oil_Twh": 0.0,
-        "other_renewable_Twh": 0.55,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 4580.206,
-        "renewables_Twh": 1.31,
-        "solar_Twh": 0.18,
-        "total_Twh": 4664.026000000001,
-        "wind_Twh": 0.19,
+        "low_carbon_TWh": 7.08,
+        "nuclear_TWh": 5.78,
+        "oil_TWh": 0.0,
+        "other_renewable_TWh": 0.54,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 4579.162,
+        "renewables_TWh": 1.3,
+        "solar_TWh": 0.18,
+        "total_TWh": 43.86,
+        "wind_TWh": 0.19,
         "year": 2021
     },
     "BLZ": {
-        "biofuel_Twh": 0.17,
+        "biofuel_TWh": 0.15,
         "carbon_intensity": 484.375,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Belize",
-        "fossil_Twh": 0.38,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.08,
+        "fossil_TWh": 0.4,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.08,
         "iso_code": "BLZ",
-        "low_carbon_Twh": 0.26,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.38,
-        "other_renewable_Twh": 0.17,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 1599.852,
-        "renewables_Twh": 0.26,
-        "solar_Twh": 0.01,
-        "total_Twh": 1601.5620000000004,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.24,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.4,
+        "other_renewable_TWh": 0.15,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 1599.852,
+        "renewables_TWh": 0.24,
+        "solar_TWh": 0.01,
+        "total_TWh": 0.64,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "BOL": {
-        "biofuel_Twh": 0.58,
-        "carbon_intensity": 306.893,
-        "coal_Twh": 0.0,
+        "biofuel_TWh": 0.63,
+        "carbon_intensity": 312.559,
+        "coal_TWh": 0.0,
         "country_name": "Bolivia",
-        "fossil_Twh": 6.17,
-        "gaz_Twh": 6.17,
-        "hydroelectricity_Twh": 3.24,
+        "fossil_TWh": 6.12,
+        "gas_TWh": 5.81,
+        "hydroelectricity_TWh": 3.24,
         "iso_code": "BOL",
-        "low_carbon_Twh": 4.42,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.0,
-        "other_renewable_Twh": 0.58,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 876.694,
-        "renewables_Twh": 4.42,
-        "solar_Twh": 0.47,
-        "total_Twh": 902.874,
-        "wind_Twh": 0.13,
+        "low_carbon_TWh": 4.47,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.31,
+        "other_renewable_TWh": 0.63,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 876.694,
+        "renewables_TWh": 4.47,
+        "solar_TWh": 0.47,
+        "total_TWh": 10.59,
+        "wind_TWh": 0.13,
         "year": 2021
     },
     "BRA": {
-        "biofuel_Twh": 57.6,
+        "biofuel_TWh": 57.6,
         "carbon_intensity": 158.592,
-        "coal_Twh": 25.22,
+        "coal_TWh": 25.22,
         "country_name": "Brazil",
-        "fossil_Twh": 139.21,
-        "gaz_Twh": 91.03,
-        "hydroelectricity_Twh": 362.82,
+        "fossil_TWh": 139.21,
+        "gas_TWh": 91.03,
+        "hydroelectricity_TWh": 362.82,
         "iso_code": "BRA",
-        "low_carbon_Twh": 523.37,
-        "nuclear_Twh": 14.7,
-        "oil_Twh": 22.96,
-        "other_renewable_Twh": 57.6,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 3091.456,
-        "renewables_Twh": 508.67,
-        "solar_Twh": 16.75,
-        "total_Twh": 4968.186000000001,
-        "wind_Twh": 71.5,
+        "low_carbon_TWh": 523.37,
+        "nuclear_TWh": 14.7,
+        "oil_TWh": 22.96,
+        "other_renewable_TWh": 57.6,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 3091.456,
+        "renewables_TWh": 508.67,
+        "solar_TWh": 16.75,
+        "total_TWh": 662.58,
+        "wind_TWh": 71.5,
         "year": 2021
     },
     "BRB": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 644.86,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Barbados",
-        "fossil_Twh": 0.99,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 0.99,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "BRB",
-        "low_carbon_Twh": 0.08,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.99,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 3805.067,
-        "renewables_Twh": 0.08,
-        "solar_Twh": 0.08,
-        "total_Twh": 3807.2870000000003,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.08,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.99,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 3805.067,
+        "renewables_TWh": 0.08,
+        "solar_TWh": 0.08,
+        "total_TWh": 1.07,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "BRN": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 658.849,
-        "coal_Twh": 2.32,
+        "coal_TWh": 2.32,
         "country_name": "Brunei",
-        "fossil_Twh": 4.69,
-        "gaz_Twh": 2.24,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 4.69,
+        "gas_TWh": 2.24,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "BRN",
-        "low_carbon_Twh": 0.0,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.13,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 10530.286,
-        "renewables_Twh": 0.0,
-        "solar_Twh": 0.0,
-        "total_Twh": 10539.666000000001,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.0,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.13,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 10530.286,
+        "renewables_TWh": 0.0,
+        "solar_TWh": 0.0,
+        "total_TWh": 4.69,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "BTN": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 24.444,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Bhutan",
-        "fossil_Twh": 0.0,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 9.0,
+        "fossil_TWh": 0.0,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 9.0,
         "iso_code": "BTN",
-        "low_carbon_Twh": 9.0,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.0,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 11575.562,
-        "renewables_Twh": 9.0,
-        "solar_Twh": 0.0,
-        "total_Twh": 11602.562,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 9.0,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.0,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 11575.562,
+        "renewables_TWh": 9.0,
+        "solar_TWh": 0.0,
+        "total_TWh": 9.0,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "BWA": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 794.521,
-        "coal_Twh": 1.79,
+        "coal_TWh": 1.79,
         "country_name": "Botswana",
-        "fossil_Twh": 2.18,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 2.18,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "BWA",
-        "low_carbon_Twh": 0.01,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.39,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 846.075,
-        "renewables_Twh": 0.01,
-        "solar_Twh": 0.01,
-        "total_Twh": 850.465,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.01,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.39,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 846.075,
+        "renewables_TWh": 0.01,
+        "solar_TWh": 0.01,
+        "total_TWh": 2.19,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "CAF": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 0.0,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Central African Republic",
-        "fossil_Twh": 0.0,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.15,
+        "fossil_TWh": 0.0,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.15,
         "iso_code": "CAF",
-        "low_carbon_Twh": 0.15,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.0,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 27.487,
-        "renewables_Twh": 0.15,
-        "solar_Twh": 0.0,
-        "total_Twh": 27.936999999999994,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.15,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.0,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 27.487,
+        "renewables_TWh": 0.15,
+        "solar_TWh": 0.0,
+        "total_TWh": 0.15,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "CAN": {
-        "biofuel_Twh": 9.23,
+        "biofuel_TWh": 9.23,
         "carbon_intensity": 128.461,
-        "coal_Twh": 36.81,
+        "coal_TWh": 36.81,
         "country_name": "Canada",
-        "fossil_Twh": 111.88,
-        "gaz_Twh": 72.29,
-        "hydroelectricity_Twh": 377.16,
+        "fossil_TWh": 111.88,
+        "gas_TWh": 72.29,
+        "hydroelectricity_TWh": 377.16,
         "iso_code": "CAN",
-        "low_carbon_Twh": 514.07,
-        "nuclear_Twh": 87.36,
-        "oil_Twh": 2.78,
-        "other_renewable_Twh": 9.23,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 16405.445,
-        "renewables_Twh": 426.71,
-        "solar_Twh": 5.11,
-        "total_Twh": 18005.925,
-        "wind_Twh": 35.21,
+        "low_carbon_TWh": 514.07,
+        "nuclear_TWh": 87.36,
+        "oil_TWh": 2.78,
+        "other_renewable_TWh": 9.23,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 16405.445,
+        "renewables_TWh": 426.71,
+        "solar_TWh": 5.11,
+        "total_TWh": 625.9499999999999,
+        "wind_TWh": 35.21,
         "year": 2021
     },
     "CHE": {
-        "biofuel_Twh": 0.11,
+        "biofuel_TWh": 0.11,
         "carbon_intensity": 47.101,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Switzerland",
-        "fossil_Twh": 2.26,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 36.96,
+        "fossil_TWh": 2.26,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 36.96,
         "iso_code": "CHE",
-        "low_carbon_Twh": 58.46,
-        "nuclear_Twh": 18.35,
-        "oil_Twh": 2.26,
-        "other_renewable_Twh": 0.11,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 6986.209,
-        "renewables_Twh": 40.11,
-        "solar_Twh": 2.89,
-        "total_Twh": 7129.518999999999,
-        "wind_Twh": 0.15,
+        "low_carbon_TWh": 58.46,
+        "nuclear_TWh": 18.35,
+        "oil_TWh": 2.26,
+        "other_renewable_TWh": 0.11,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 6986.209,
+        "renewables_TWh": 40.11,
+        "solar_TWh": 2.89,
+        "total_TWh": 60.72,
+        "wind_TWh": 0.15,
         "year": 2021
     },
     "CHL": {
-        "biofuel_Twh": NaN,
+        "biofuel_TWh": NaN,
         "carbon_intensity": 416.881,
-        "coal_Twh": 27.67,
+        "coal_TWh": 27.67,
         "country_name": "Chile",
-        "fossil_Twh": 46.7,
-        "gaz_Twh": 14.49,
-        "hydroelectricity_Twh": 16.48,
+        "fossil_TWh": 46.7,
+        "gas_TWh": 14.49,
+        "hydroelectricity_TWh": 16.48,
         "iso_code": "CHL",
-        "low_carbon_Twh": 34.81,
-        "nuclear_Twh": NaN,
-        "oil_Twh": 4.54,
-        "other_renewable_Twh": 8.454,
-        "other_renewable_exc_biofuel_Twh": 0.33,
-        "per_capita_Twh": 4181.461,
-        "renewables_Twh": 34.81,
-        "solar_Twh": 10.79,
-        "total_Twh": 4387.415,
-        "wind_Twh": 7.21,
+        "low_carbon_TWh": 34.81,
+        "nuclear_TWh": NaN,
+        "oil_TWh": 4.54,
+        "other_renewable_TWh": 6.574,
+        "other_renewable_exc_biofuel_TWh": 0.33,
+        "per_capita_Wh": 4181.461,
+        "renewables_TWh": 34.81,
+        "solar_TWh": 10.79,
+        "total_TWh": 81.51,
+        "wind_TWh": 7.21,
         "year": 2021
     },
     "CHN": {
-        "biofuel_Twh": 169.93,
+        "biofuel_TWh": 169.93,
         "carbon_intensity": 544.355,
-        "coal_Twh": 5339.14,
+        "coal_TWh": 5339.14,
         "country_name": "China",
-        "fossil_Twh": 5623.99,
-        "gaz_Twh": 272.6,
-        "hydroelectricity_Twh": 1300.0,
+        "fossil_TWh": 5623.99,
+        "gas_TWh": 272.6,
+        "hydroelectricity_TWh": 1300.0,
         "iso_code": "CHN",
-        "low_carbon_Twh": 2860.03,
-        "nuclear_Twh": 407.5,
-        "oil_Twh": 12.25,
-        "other_renewable_Twh": 169.932,
-        "other_renewable_exc_biofuel_Twh": NaN,
-        "per_capita_Twh": 5949.967,
-        "renewables_Twh": 2452.53,
-        "solar_Twh": 327.0,
-        "total_Twh": 25132.969,
-        "wind_Twh": 655.6,
+        "low_carbon_TWh": 2860.03,
+        "nuclear_TWh": 407.5,
+        "oil_TWh": 12.25,
+        "other_renewable_TWh": 165.926,
+        "other_renewable_exc_biofuel_TWh": NaN,
+        "per_capita_Wh": 5949.967,
+        "renewables_TWh": 2452.53,
+        "solar_TWh": 327.0,
+        "total_TWh": 8484.02,
+        "wind_TWh": 655.6,
         "year": 2021
     },
     "CIV": {
-        "biofuel_Twh": 0.0,
-        "carbon_intensity": 390.71,
-        "coal_Twh": 0.0,
+        "biofuel_TWh": 0.0,
+        "carbon_intensity": 410.747,
+        "coal_TWh": 0.0,
         "country_name": "Cote d'Ivoire",
-        "fossil_Twh": 7.67,
-        "gaz_Twh": 5.51,
-        "hydroelectricity_Twh": 3.3,
+        "fossil_TWh": 7.67,
+        "gas_TWh": 4.49,
+        "hydroelectricity_TWh": 3.3,
         "iso_code": "CIV",
-        "low_carbon_Twh": 3.31,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 2.16,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 399.589,
-        "renewables_Twh": 3.31,
-        "solar_Twh": 0.01,
-        "total_Twh": 424.85900000000004,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 3.31,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 3.18,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 399.589,
+        "renewables_TWh": 3.31,
+        "solar_TWh": 0.01,
+        "total_TWh": 10.98,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "CMR": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 278.261,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Cameroon",
-        "fossil_Twh": 3.03,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 5.0,
+        "fossil_TWh": 3.03,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 5.0,
         "iso_code": "CMR",
-        "low_carbon_Twh": 5.02,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 3.03,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 295.971,
-        "renewables_Twh": 5.02,
-        "solar_Twh": 0.02,
-        "total_Twh": 317.091,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 5.02,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 3.03,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 295.971,
+        "renewables_TWh": 5.02,
+        "solar_TWh": 0.02,
+        "total_TWh": 8.049999999999999,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "COD": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 25.362,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Democratic Republic of Congo",
-        "fossil_Twh": 0.03,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 11.0,
+        "fossil_TWh": 0.03,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 11.0,
         "iso_code": "COD",
-        "low_carbon_Twh": 11.01,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.03,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 115.127,
-        "renewables_Twh": 11.01,
-        "solar_Twh": 0.01,
-        "total_Twh": 148.21699999999998,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 11.01,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.03,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 115.127,
+        "renewables_TWh": 11.01,
+        "solar_TWh": 0.01,
+        "total_TWh": 11.04,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "COG": {
-        "biofuel_Twh": 0.07,
-        "carbon_intensity": 398.01,
-        "coal_Twh": 0.0,
+        "biofuel_TWh": 0.06,
+        "carbon_intensity": 395.522,
+        "coal_TWh": 0.0,
         "country_name": "Congo",
-        "fossil_Twh": 3.05,
-        "gaz_Twh": 2.7,
-        "hydroelectricity_Twh": 0.9,
+        "fossil_TWh": 3.06,
+        "gas_TWh": 2.74,
+        "hydroelectricity_TWh": 0.9,
         "iso_code": "COG",
-        "low_carbon_Twh": 0.97,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.35,
-        "other_renewable_Twh": 0.07,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 688.85,
-        "renewables_Twh": 0.97,
-        "solar_Twh": 0.0,
-        "total_Twh": 697.9300000000001,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.96,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.32,
+        "other_renewable_TWh": 0.06,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 688.85,
+        "renewables_TWh": 0.96,
+        "solar_TWh": 0.0,
+        "total_TWh": 4.02,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "COK": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 400.0,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Cook Islands",
-        "fossil_Twh": 0.03,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 0.03,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "COK",
-        "low_carbon_Twh": 0.02,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.03,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 2936.34,
-        "renewables_Twh": 0.02,
-        "solar_Twh": 0.02,
-        "total_Twh": 2936.4600000000005,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.02,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.03,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 2936.34,
+        "renewables_TWh": 0.02,
+        "solar_TWh": 0.02,
+        "total_TWh": 0.05,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "COL": {
-        "biofuel_Twh": 1.02,
-        "carbon_intensity": 181.683,
-        "coal_Twh": 5.12,
+        "biofuel_TWh": 1.24,
+        "carbon_intensity": 181.065,
+        "coal_TWh": 5.14,
         "country_name": "Colombia",
-        "fossil_Twh": 21.32,
-        "gaz_Twh": 11.86,
-        "hydroelectricity_Twh": 58.19,
+        "fossil_TWh": 21.1,
+        "gas_TWh": 11.61,
+        "hydroelectricity_TWh": 58.19,
         "iso_code": "COL",
-        "low_carbon_Twh": 59.59,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 4.34,
-        "other_renewable_Twh": 1.02,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 1570.563,
-        "renewables_Twh": 59.59,
-        "solar_Twh": 0.32,
-        "total_Twh": 1792.993,
-        "wind_Twh": 0.06,
+        "low_carbon_TWh": 59.81,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 4.35,
+        "other_renewable_TWh": 1.24,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 1570.563,
+        "renewables_TWh": 59.81,
+        "solar_TWh": 0.32,
+        "total_TWh": 80.91,
+        "wind_TWh": 0.06,
         "year": 2021
     },
     "COM": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 714.286,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Comoros",
-        "fossil_Twh": 0.14,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 0.14,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "COM",
-        "low_carbon_Twh": 0.0,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.14,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 170.393,
-        "renewables_Twh": 0.0,
-        "solar_Twh": 0.0,
-        "total_Twh": 170.67299999999997,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.0,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.14,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 170.393,
+        "renewables_TWh": 0.0,
+        "solar_TWh": 0.0,
+        "total_TWh": 0.14,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "CPV": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 600.0,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Cape Verde",
-        "fossil_Twh": 0.38,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 0.38,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "CPV",
-        "low_carbon_Twh": 0.07,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.38,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 765.389,
-        "renewables_Twh": 0.07,
-        "solar_Twh": 0.01,
-        "total_Twh": 766.3590000000002,
-        "wind_Twh": 0.06,
+        "low_carbon_TWh": 0.07,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.38,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 765.389,
+        "renewables_TWh": 0.07,
+        "solar_TWh": 0.01,
+        "total_TWh": 0.45,
+        "wind_TWh": 0.06,
         "year": 2021
     },
     "CRI": {
-        "biofuel_Twh": 0.03,
+        "biofuel_TWh": 0.03,
         "carbon_intensity": 33.045,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Costa Rica",
-        "fossil_Twh": 0.16,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 9.29,
+        "fossil_TWh": 0.16,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 9.29,
         "iso_code": "CRI",
-        "low_carbon_Twh": 12.55,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.16,
-        "other_renewable_Twh": 1.63,
-        "other_renewable_exc_biofuel_Twh": 1.6,
-        "per_capita_Twh": 2466.065,
-        "renewables_Twh": 12.55,
-        "solar_Twh": 0.06,
-        "total_Twh": 2504.0650000000005,
-        "wind_Twh": 1.57,
+        "low_carbon_TWh": 12.55,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.16,
+        "other_renewable_TWh": 1.63,
+        "other_renewable_exc_biofuel_TWh": 1.6,
+        "per_capita_Wh": 2466.065,
+        "renewables_TWh": 12.55,
+        "solar_TWh": 0.06,
+        "total_TWh": 12.71,
+        "wind_TWh": 1.57,
         "year": 2021
     },
     "CUB": {
-        "biofuel_Twh": 3.83,
-        "carbon_intensity": 574.684,
-        "coal_Twh": 0.0,
+        "biofuel_TWh": 2.89,
+        "carbon_intensity": 602.025,
+        "coal_TWh": 0.0,
         "country_name": "Cuba",
-        "fossil_Twh": 15.53,
-        "gaz_Twh": 1.96,
-        "hydroelectricity_Twh": 0.11,
+        "fossil_TWh": 16.47,
+        "gas_TWh": 1.48,
+        "hydroelectricity_TWh": 0.11,
         "iso_code": "CUB",
-        "low_carbon_Twh": 4.22,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 13.57,
-        "other_renewable_Twh": 3.83,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 1754.562,
-        "renewables_Twh": 4.22,
-        "solar_Twh": 0.26,
-        "total_Twh": 1802.1119999999996,
-        "wind_Twh": 0.02,
+        "low_carbon_TWh": 3.28,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 14.99,
+        "other_renewable_TWh": 2.89,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 1754.562,
+        "renewables_TWh": 3.28,
+        "solar_TWh": 0.26,
+        "total_TWh": 19.75,
+        "wind_TWh": 0.02,
         "year": 2021
     },
     "CYM": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 684.932,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Cayman Islands",
-        "fossil_Twh": 0.71,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 0.71,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "CYM",
-        "low_carbon_Twh": 0.02,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.71,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 10710.565,
-        "renewables_Twh": 0.02,
-        "solar_Twh": 0.02,
-        "total_Twh": 10712.045,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.02,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.71,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 10710.565,
+        "renewables_TWh": 0.02,
+        "solar_TWh": 0.02,
+        "total_TWh": 0.73,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "CYP": {
-        "biofuel_Twh": 0.06,
-        "carbon_intensity": 584.795,
-        "coal_Twh": 0.0,
+        "biofuel_TWh": 0.06,
+        "carbon_intensity": 599.609,
+        "coal_TWh": 0.0,
         "country_name": "Cyprus",
-        "fossil_Twh": 4.31,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 4.34,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "CYP",
-        "low_carbon_Twh": 0.82,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 4.31,
-        "other_renewable_Twh": 0.06,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 4123.154,
-        "renewables_Twh": 0.82,
-        "solar_Twh": 0.5,
-        "total_Twh": 4134.294000000001,
-        "wind_Twh": 0.26,
+        "low_carbon_TWh": 0.78,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 4.34,
+        "other_renewable_TWh": 0.06,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 4115.117,
+        "renewables_TWh": 0.78,
+        "solar_TWh": 0.47,
+        "total_TWh": 5.12,
+        "wind_TWh": 0.25,
         "year": 2021
     },
     "CZE": {
-        "biofuel_Twh": 5.58,
-        "carbon_intensity": 415.036,
-        "coal_Twh": 34.01,
+        "biofuel_TWh": 5.38,
+        "carbon_intensity": 405.589,
+        "coal_TWh": 34.18,
         "country_name": "Czechia",
-        "fossil_Twh": 42.6,
-        "gaz_Twh": 6.56,
-        "hydroelectricity_Twh": 2.55,
+        "fossil_TWh": 42.29,
+        "gas_TWh": 7.31,
+        "hydroelectricity_TWh": 2.41,
         "iso_code": "CZE",
-        "low_carbon_Twh": 41.73,
-        "nuclear_Twh": 30.74,
-        "oil_Twh": 2.03,
-        "other_renewable_Twh": 5.59,
-        "other_renewable_exc_biofuel_Twh": 0.01,
-        "per_capita_Twh": 8023.216,
-        "renewables_Twh": 10.99,
-        "solar_Twh": 2.24,
-        "total_Twh": 8177.706,
-        "wind_Twh": 0.61,
+        "low_carbon_TWh": 41.44,
+        "nuclear_TWh": 30.73,
+        "oil_TWh": 0.8,
+        "other_renewable_TWh": 5.38,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 7966.132,
+        "renewables_TWh": 10.71,
+        "solar_TWh": 2.32,
+        "total_TWh": 83.73,
+        "wind_TWh": 0.6,
         "year": 2021
     },
     "DEU": {
-        "biofuel_Twh": 48.99,
-        "carbon_intensity": 354.317,
-        "coal_Twh": 170.95,
+        "biofuel_TWh": 46.91,
+        "carbon_intensity": 365.477,
+        "coal_TWh": 164.5,
         "country_name": "Germany",
-        "fossil_Twh": 277.51,
-        "gaz_Twh": 85.78,
-        "hydroelectricity_Twh": 18.37,
+        "fossil_TWh": 281.42,
+        "gas_TWh": 95.22,
+        "hydroelectricity_TWh": 19.66,
         "iso_code": "DEU",
-        "low_carbon_Twh": 303.89,
-        "nuclear_Twh": 69.47,
-        "oil_Twh": 20.78,
-        "other_renewable_Twh": 49.26,
-        "other_renewable_exc_biofuel_Twh": 0.27,
-        "per_capita_Twh": 6970.508,
-        "renewables_Twh": 234.42,
-        "solar_Twh": 51.09,
-        "total_Twh": 8347.248,
-        "wind_Twh": 115.7,
+        "low_carbon_TWh": 299.93,
+        "nuclear_TWh": 69.13,
+        "oil_TWh": 21.7,
+        "other_renewable_TWh": 47.15,
+        "other_renewable_exc_biofuel_TWh": 0.24,
+        "per_capita_Wh": 6969.908,
+        "renewables_TWh": 230.8,
+        "solar_TWh": 49.34,
+        "total_TWh": 581.35,
+        "wind_TWh": 114.65,
         "year": 2021
     },
     "DJI": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 666.667,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Djibouti",
-        "fossil_Twh": 0.06,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 0.06,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "DJI",
-        "low_carbon_Twh": 0.0,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.06,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 54.271,
-        "renewables_Twh": 0.0,
-        "solar_Twh": 0.0,
-        "total_Twh": 54.391000000000005,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.0,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.06,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 54.271,
+        "renewables_TWh": 0.0,
+        "solar_TWh": 0.0,
+        "total_TWh": 0.06,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "DMA": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 529.412,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Dominica",
-        "fossil_Twh": 0.13,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.04,
+        "fossil_TWh": 0.13,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.04,
         "iso_code": "DMA",
-        "low_carbon_Twh": 0.04,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.13,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 2346.932,
-        "renewables_Twh": 0.04,
-        "solar_Twh": 0.0,
-        "total_Twh": 2347.312,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.04,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.13,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 2346.932,
+        "renewables_TWh": 0.04,
+        "solar_TWh": 0.0,
+        "total_TWh": 0.17,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "DNK": {
-        "biofuel_Twh": 7.12,
-        "carbon_intensity": 149.12,
-        "coal_Twh": 5.34,
+        "biofuel_TWh": 8.72,
+        "carbon_intensity": 221.416,
+        "coal_TWh": 4.37,
         "country_name": "Denmark",
-        "fossil_Twh": 8.7,
-        "gaz_Twh": 2.12,
-        "hydroelectricity_Twh": 0.02,
+        "fossil_TWh": 6.96,
+        "gas_TWh": 1.54,
+        "hydroelectricity_TWh": 0.02,
         "iso_code": "DNK",
-        "low_carbon_Twh": 24.83,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 1.24,
-        "other_renewable_Twh": 7.12,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 5727.467,
-        "renewables_Twh": 24.83,
-        "solar_Twh": 1.4,
-        "total_Twh": 5826.477,
-        "wind_Twh": 16.29,
+        "low_carbon_TWh": 26.1,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 1.05,
+        "other_renewable_TWh": 8.72,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 5647.184,
+        "renewables_TWh": 26.1,
+        "solar_TWh": 1.31,
+        "total_TWh": 33.06,
+        "wind_TWh": 16.05,
         "year": 2021
     },
     "DOM": {
-        "biofuel_Twh": 0.2,
-        "carbon_intensity": 540.387,
-        "coal_Twh": 4.55,
+        "biofuel_TWh": 0.16,
+        "carbon_intensity": 550.881,
+        "coal_TWh": 3.5,
         "country_name": "Dominican Republic",
-        "fossil_Twh": 14.56,
-        "gaz_Twh": 6.41,
-        "hydroelectricity_Twh": 1.0,
+        "fossil_TWh": 14.61,
+        "gas_TWh": 5.04,
+        "hydroelectricity_TWh": 1.0,
         "iso_code": "DOM",
-        "low_carbon_Twh": 3.02,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 3.6,
-        "other_renewable_Twh": 0.2,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 1581.238,
-        "renewables_Twh": 3.02,
-        "solar_Twh": 0.53,
-        "total_Twh": 1619.618,
-        "wind_Twh": 1.29,
+        "low_carbon_TWh": 2.98,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 6.07,
+        "other_renewable_TWh": 0.16,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 1582.137,
+        "renewables_TWh": 2.98,
+        "solar_TWh": 0.53,
+        "total_TWh": 17.59,
+        "wind_TWh": 1.29,
         "year": 2021
     },
     "DZA": {
-        "biofuel_Twh": 0.0,
-        "carbon_intensity": 488.393,
-        "coal_Twh": 0.0,
+        "biofuel_TWh": 0.0,
+        "carbon_intensity": 498.904,
+        "coal_TWh": 0.0,
         "country_name": "Algeria",
-        "fossil_Twh": 76.63,
-        "gaz_Twh": 75.3,
-        "hydroelectricity_Twh": 0.09,
+        "fossil_TWh": 76.62,
+        "gas_TWh": 71.4,
+        "hydroelectricity_TWh": 0.09,
         "iso_code": "DZA",
-        "low_carbon_Twh": 0.91,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 1.33,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 1755.174,
-        "renewables_Twh": 0.91,
-        "solar_Twh": 0.81,
-        "total_Twh": 1911.164,
-        "wind_Twh": 0.01,
+        "low_carbon_TWh": 0.91,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 5.22,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 1754.947,
+        "renewables_TWh": 0.91,
+        "solar_TWh": 0.81,
+        "total_TWh": 77.53,
+        "wind_TWh": 0.01,
         "year": 2021
     },
     "ECU": {
-        "biofuel_Twh": 1.35,
-        "carbon_intensity": 136.054,
-        "coal_Twh": 0.0,
+        "biofuel_TWh": 0.37,
+        "carbon_intensity": 155.844,
+        "coal_TWh": 0.0,
         "country_name": "Ecuador",
-        "fossil_Twh": 5.32,
-        "gaz_Twh": 1.16,
-        "hydroelectricity_Twh": 25.57,
+        "fossil_TWh": 6.3,
+        "gas_TWh": 0.31,
+        "hydroelectricity_TWh": 25.57,
         "iso_code": "ECU",
-        "low_carbon_Twh": 27.02,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 4.16,
-        "other_renewable_Twh": 1.35,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 1817.085,
-        "renewables_Twh": 27.02,
-        "solar_Twh": 0.04,
-        "total_Twh": 1910.1349999999998,
-        "wind_Twh": 0.06,
+        "low_carbon_TWh": 26.04,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 5.99,
+        "other_renewable_TWh": 0.37,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 1817.085,
+        "renewables_TWh": 26.04,
+        "solar_TWh": 0.04,
+        "total_TWh": 32.339999999999996,
+        "wind_TWh": 0.06,
         "year": 2021
     },
     "EGY": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 464.425,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Egypt",
-        "fossil_Twh": 179.22,
-        "gaz_Twh": 153.08,
-        "hydroelectricity_Twh": 14.0,
+        "fossil_TWh": 179.22,
+        "gas_TWh": 153.08,
+        "hydroelectricity_TWh": 14.0,
         "iso_code": "EGY",
-        "low_carbon_Twh": 23.03,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 26.14,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 1851.052,
-        "renewables_Twh": 23.03,
-        "solar_Twh": 4.8,
-        "total_Twh": 2278.582,
-        "wind_Twh": 4.23,
+        "low_carbon_TWh": 23.03,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 26.14,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 1851.052,
+        "renewables_TWh": 23.03,
+        "solar_TWh": 4.8,
+        "total_TWh": 202.25,
+        "wind_TWh": 4.23,
         "year": 2021
     },
     "ERI": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 688.889,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Eritrea",
-        "fossil_Twh": 0.44,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 0.44,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "ERI",
-        "low_carbon_Twh": 0.01,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.44,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 124.298,
-        "renewables_Twh": 0.01,
-        "solar_Twh": 0.01,
-        "total_Twh": 125.20800000000001,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.01,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.44,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 124.298,
+        "renewables_TWh": 0.01,
+        "solar_TWh": 0.01,
+        "total_TWh": 0.45,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "ESP": {
-        "biofuel_Twh": 6.8,
-        "carbon_intensity": 168.95,
-        "coal_Twh": 7.45,
+        "biofuel_TWh": 6.94,
+        "carbon_intensity": 193.863,
+        "coal_TWh": 4.86,
         "country_name": "Spain",
-        "fossil_Twh": 89.92,
-        "gaz_Twh": 68.29,
-        "hydroelectricity_Twh": 30.64,
+        "fossil_TWh": 88.5,
+        "gas_TWh": 71.5,
+        "hydroelectricity_TWh": 29.63,
         "iso_code": "ESP",
-        "low_carbon_Twh": 182.35,
-        "nuclear_Twh": 56.61,
-        "oil_Twh": 14.18,
-        "other_renewable_Twh": 6.82,
-        "other_renewable_exc_biofuel_Twh": 0.02,
-        "per_capita_Twh": 5733.577,
-        "renewables_Twh": 125.74,
-        "solar_Twh": 26.02,
-        "total_Twh": 6354.0470000000005,
-        "wind_Twh": 62.26,
+        "low_carbon_TWh": 182.31,
+        "nuclear_TWh": 56.56,
+        "oil_TWh": 12.14,
+        "other_renewable_TWh": 6.96,
+        "other_renewable_exc_biofuel_TWh": 0.02,
+        "per_capita_Wh": 5702.832,
+        "renewables_TWh": 125.75,
+        "solar_TWh": 27.1,
+        "total_TWh": 270.81,
+        "wind_TWh": 62.06,
         "year": 2021
     },
     "EST": {
-        "biofuel_Twh": 1.25,
-        "carbon_intensity": 664.894,
-        "coal_Twh": 0.0,
+        "biofuel_TWh": 1.77,
+        "carbon_intensity": 481.224,
+        "coal_TWh": 0.0,
         "country_name": "Estonia",
-        "fossil_Twh": 5.11,
-        "gaz_Twh": 0.04,
-        "hydroelectricity_Twh": 0.02,
+        "fossil_TWh": 4.32,
+        "gas_TWh": 0.04,
+        "hydroelectricity_TWh": 0.02,
         "iso_code": "EST",
-        "low_carbon_Twh": 2.41,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 5.07,
-        "other_renewable_Twh": 1.25,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 5659.65,
-        "renewables_Twh": 2.41,
-        "solar_Twh": 0.38,
-        "total_Twh": 5678.35,
-        "wind_Twh": 0.76,
+        "low_carbon_TWh": 2.87,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 4.28,
+        "other_renewable_TWh": 1.77,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 5411.288,
+        "renewables_TWh": 2.87,
+        "solar_TWh": 0.35,
+        "total_TWh": 7.19,
+        "wind_TWh": 0.73,
         "year": 2021
     },
     "ETH": {
-        "biofuel_Twh": 0.03,
+        "biofuel_TWh": 0.03,
         "carbon_intensity": 25.187,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Ethiopia",
-        "fossil_Twh": 0.01,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 14.0,
+        "fossil_TWh": 0.01,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 14.0,
         "iso_code": "ETH",
-        "low_carbon_Twh": 14.68,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.01,
-        "other_renewable_Twh": 0.03,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 122.129,
-        "renewables_Twh": 14.68,
-        "solar_Twh": 0.04,
-        "total_Twh": 166.21900000000002,
-        "wind_Twh": 0.61,
+        "low_carbon_TWh": 14.68,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.01,
+        "other_renewable_TWh": 0.03,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 122.129,
+        "renewables_TWh": 14.68,
+        "solar_TWh": 0.04,
+        "total_TWh": 14.69,
+        "wind_TWh": 0.61,
         "year": 2021
     },
     "FIN": {
-        "biofuel_Twh": 12.28,
-        "carbon_intensity": 71.154,
-        "coal_Twh": 3.19,
+        "biofuel_TWh": 13.58,
+        "carbon_intensity": 145.541,
+        "coal_TWh": 2.67,
         "country_name": "Finland",
-        "fossil_Twh": 10.7,
-        "gaz_Twh": 3.46,
-        "hydroelectricity_Twh": 15.54,
+        "fossil_TWh": 10.09,
+        "gas_TWh": 3.83,
+        "hydroelectricity_TWh": 15.79,
         "iso_code": "FIN",
-        "low_carbon_Twh": 59.57,
-        "nuclear_Twh": 23.6,
-        "oil_Twh": 4.05,
-        "other_renewable_Twh": 12.28,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 12693.32,
-        "renewables_Twh": 35.97,
-        "solar_Twh": 0.35,
-        "total_Twh": 12858.510000000002,
-        "wind_Twh": 7.8,
+        "low_carbon_TWh": 61.78,
+        "nuclear_TWh": 23.6,
+        "oil_TWh": 3.59,
+        "other_renewable_TWh": 13.58,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 12982.341,
+        "renewables_TWh": 38.18,
+        "solar_TWh": 0.3,
+        "total_TWh": 71.87,
+        "wind_TWh": 8.51,
         "year": 2021
     },
     "FJI": {
-        "biofuel_Twh": 0.13,
-        "carbon_intensity": 292.035,
-        "coal_Twh": 0.0,
+        "biofuel_TWh": 0.15,
+        "carbon_intensity": 289.474,
+        "coal_TWh": 0.0,
         "country_name": "Fiji",
-        "fossil_Twh": 0.42,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.57,
+        "fossil_TWh": 0.41,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.57,
         "iso_code": "FJI",
-        "low_carbon_Twh": 0.71,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.42,
-        "other_renewable_Twh": 0.13,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 1222.13,
-        "renewables_Twh": 0.71,
-        "solar_Twh": 0.01,
-        "total_Twh": 1225.2300000000005,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.73,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.41,
+        "other_renewable_TWh": 0.15,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 1232.946,
+        "renewables_TWh": 0.73,
+        "solar_TWh": 0.01,
+        "total_TWh": 1.14,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "FLK": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 500.0,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Falkland Islands",
-        "fossil_Twh": 0.01,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 0.01,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "FLK",
-        "low_carbon_Twh": 0.01,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.01,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 5282.62,
-        "renewables_Twh": 0.01,
-        "solar_Twh": 0.0,
-        "total_Twh": 5282.670000000001,
-        "wind_Twh": 0.01,
+        "low_carbon_TWh": 0.01,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.01,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 5282.62,
+        "renewables_TWh": 0.01,
+        "solar_TWh": 0.0,
+        "total_TWh": 0.02,
+        "wind_TWh": 0.01,
         "year": 2021
     },
     "FRA": {
-        "biofuel_Twh": 8.67,
-        "carbon_intensity": 58.034,
-        "coal_Twh": 6.1,
+        "biofuel_TWh": 9.6,
+        "carbon_intensity": 67.39,
+        "coal_TWh": 5.44,
         "country_name": "France",
-        "fossil_Twh": 50.62,
-        "gaz_Twh": 33.92,
-        "hydroelectricity_Twh": 59.12,
+        "fossil_TWh": 48.66,
+        "gas_TWh": 33.36,
+        "hydroelectricity_TWh": 59.62,
         "iso_code": "FRA",
-        "low_carbon_Twh": 500.78,
-        "nuclear_Twh": 380.68,
-        "oil_Twh": 10.6,
-        "other_renewable_Twh": 9.28,
-        "other_renewable_exc_biofuel_Twh": 0.61,
-        "per_capita_Twh": 8544.672,
-        "renewables_Twh": 120.1,
-        "solar_Twh": 14.52,
-        "total_Twh": 9395.562000000002,
-        "wind_Twh": 37.18,
+        "low_carbon_TWh": 501.72,
+        "nuclear_TWh": 379.36,
+        "oil_TWh": 9.86,
+        "other_renewable_TWh": 10.18,
+        "other_renewable_exc_biofuel_TWh": 0.58,
+        "per_capita_Wh": 8528.864,
+        "renewables_TWh": 122.36,
+        "solar_TWh": 15.73,
+        "total_TWh": 550.38,
+        "wind_TWh": 36.83,
         "year": 2021
     },
     "FRO": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 428.571,
-        "coal_Twh": 0.0,
-        "country_name": "Faeroe Islands",
-        "fossil_Twh": 0.26,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.11,
+        "coal_TWh": 0.0,
+        "country_name": "Faroe Islands",
+        "fossil_TWh": 0.26,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.11,
         "iso_code": "FRO",
-        "low_carbon_Twh": 0.16,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.26,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 7937.258,
-        "renewables_Twh": 0.16,
-        "solar_Twh": 0.0,
-        "total_Twh": 7938.258,
-        "wind_Twh": 0.05,
+        "low_carbon_TWh": 0.16,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.26,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 7937.258,
+        "renewables_TWh": 0.16,
+        "solar_TWh": 0.0,
+        "total_TWh": 0.42000000000000004,
+        "wind_TWh": 0.05,
         "year": 2021
     },
     "GAB": {
-        "biofuel_Twh": 0.02,
+        "biofuel_TWh": 0.02,
         "carbon_intensity": 397.38,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Gabon",
-        "fossil_Twh": 1.27,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 1.0,
+        "fossil_TWh": 1.27,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 1.0,
         "iso_code": "GAB",
-        "low_carbon_Twh": 1.02,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 1.27,
-        "other_renewable_Twh": 0.02,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 978.137,
-        "renewables_Twh": 1.02,
-        "solar_Twh": 0.0,
-        "total_Twh": 983.7569999999998,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 1.02,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 1.27,
+        "other_renewable_TWh": 0.02,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 978.137,
+        "renewables_TWh": 1.02,
+        "solar_TWh": 0.0,
+        "total_TWh": 2.29,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "GBR": {
-        "biofuel_Twh": 39.1,
-        "carbon_intensity": 269.787,
-        "coal_Twh": 5.98,
+        "biofuel_TWh": 39.11,
+        "carbon_intensity": 268.329,
+        "coal_TWh": 5.92,
         "country_name": "United Kingdom",
-        "fossil_Twh": 137.12,
-        "gaz_Twh": 122.56,
-        "hydroelectricity_Twh": 5.59,
+        "fossil_TWh": 138.08,
+        "gas_TWh": 123.58,
+        "hydroelectricity_TWh": 5.59,
         "iso_code": "GBR",
-        "low_carbon_Twh": 168.38,
-        "nuclear_Twh": 46.86,
-        "oil_Twh": 8.58,
-        "other_renewable_Twh": 39.11,
-        "other_renewable_exc_biofuel_Twh": 0.01,
-        "per_capita_Twh": 4540.655,
-        "renewables_Twh": 121.52,
-        "solar_Twh": 12.47,
-        "total_Twh": 5265.425,
-        "wind_Twh": 64.36,
+        "low_carbon_TWh": 169.08,
+        "nuclear_TWh": 46.88,
+        "oil_TWh": 8.58,
+        "other_renewable_TWh": 39.882,
+        "other_renewable_exc_biofuel_TWh": NaN,
+        "per_capita_Wh": 4565.328,
+        "renewables_TWh": 122.2,
+        "solar_TWh": 12.48,
+        "total_TWh": 307.16,
+        "wind_TWh": 65.02,
         "year": 2021
     },
     "GEO": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 111.551,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Georgia",
-        "fossil_Twh": 2.38,
-        "gaz_Twh": 2.38,
-        "hydroelectricity_Twh": 10.18,
+        "fossil_TWh": 2.38,
+        "gas_TWh": 2.38,
+        "hydroelectricity_TWh": 10.18,
         "iso_code": "GEO",
-        "low_carbon_Twh": 10.26,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.0,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 3363.506,
-        "renewables_Twh": 10.26,
-        "solar_Twh": 0.0,
-        "total_Twh": 3399.046,
-        "wind_Twh": 0.08,
+        "low_carbon_TWh": 10.26,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.0,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 3363.506,
+        "renewables_TWh": 10.26,
+        "solar_TWh": 0.0,
+        "total_TWh": 12.64,
+        "wind_TWh": 0.08,
         "year": 2021
     },
     "GHA": {
-        "biofuel_Twh": 0.03,
-        "carbon_intensity": 362.942,
-        "coal_Twh": 0.0,
+        "biofuel_TWh": 0.03,
+        "carbon_intensity": 361.204,
+        "coal_TWh": 0.0,
         "country_name": "Ghana",
-        "fossil_Twh": 13.64,
-        "gaz_Twh": 10.13,
-        "hydroelectricity_Twh": 7.21,
+        "fossil_TWh": 13.63,
+        "gas_TWh": 10.29,
+        "hydroelectricity_TWh": 7.21,
         "iso_code": "GHA",
-        "low_carbon_Twh": 7.3,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 3.51,
-        "other_renewable_Twh": 0.03,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 637.772,
-        "renewables_Twh": 7.3,
-        "solar_Twh": 0.06,
-        "total_Twh": 686.9820000000001,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 7.3,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 3.34,
+        "other_renewable_TWh": 0.03,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 637.468,
+        "renewables_TWh": 7.3,
+        "solar_TWh": 0.06,
+        "total_TWh": 20.93,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "GIN": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 208.633,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Guinea",
-        "fossil_Twh": 0.76,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 2.0,
+        "fossil_TWh": 0.76,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 2.0,
         "iso_code": "GIN",
-        "low_carbon_Twh": 2.02,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.76,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 205.44,
-        "renewables_Twh": 2.02,
-        "solar_Twh": 0.02,
-        "total_Twh": 213.02,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 2.02,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.76,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 205.44,
+        "renewables_TWh": 2.02,
+        "solar_TWh": 0.02,
+        "total_TWh": 2.7800000000000002,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "GMB": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 700.0,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Gambia",
-        "fossil_Twh": 0.3,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 0.3,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "GMB",
-        "low_carbon_Twh": 0.0,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.3,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 113.64,
-        "renewables_Twh": 0.0,
-        "solar_Twh": 0.0,
-        "total_Twh": 114.24,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.0,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.3,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 113.64,
+        "renewables_TWh": 0.0,
+        "solar_TWh": 0.0,
+        "total_TWh": 0.3,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "GNB": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 750.0,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Guinea-Bissau",
-        "fossil_Twh": 0.08,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 0.08,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "GNB",
-        "low_carbon_Twh": 0.0,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.08,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 38.821,
-        "renewables_Twh": 0.0,
-        "solar_Twh": 0.0,
-        "total_Twh": 38.980999999999995,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.0,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.08,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 38.821,
+        "renewables_TWh": 0.0,
+        "solar_TWh": 0.0,
+        "total_TWh": 0.08,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "GNQ": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 492.958,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Equatorial Guinea",
-        "fossil_Twh": 0.98,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.44,
+        "fossil_TWh": 0.98,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.44,
         "iso_code": "GNQ",
-        "low_carbon_Twh": 0.44,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.98,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 868.782,
-        "renewables_Twh": 0.44,
-        "solar_Twh": 0.0,
-        "total_Twh": 872.0620000000001,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.44,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.98,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 868.782,
+        "renewables_TWh": 0.44,
+        "solar_TWh": 0.0,
+        "total_TWh": 1.42,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "GRC": {
-        "biofuel_Twh": 0.4,
-        "carbon_intensity": 447.594,
-        "coal_Twh": 6.9,
+        "biofuel_TWh": 0.5,
+        "carbon_intensity": 353.339,
+        "coal_TWh": 5.32,
         "country_name": "Greece",
-        "fossil_Twh": 31.93,
-        "gaz_Twh": 19.17,
-        "hydroelectricity_Twh": 5.6,
+        "fossil_TWh": 32.52,
+        "gas_TWh": 22.49,
+        "hydroelectricity_TWh": 5.9,
         "iso_code": "GRC",
-        "low_carbon_Twh": 21.69,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 5.86,
-        "other_renewable_Twh": 0.4,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 5133.376,
-        "renewables_Twh": 21.69,
-        "solar_Twh": 5.22,
-        "total_Twh": 5262.705999999999,
-        "wind_Twh": 10.47,
+        "low_carbon_TWh": 22.13,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 4.71,
+        "other_renewable_TWh": 0.5,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 5231.984,
+        "renewables_TWh": 22.13,
+        "solar_TWh": 5.25,
+        "total_TWh": 54.650000000000006,
+        "wind_TWh": 10.48,
         "year": 2021
     },
     "GRD": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 714.286,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Grenada",
-        "fossil_Twh": 0.21,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 0.21,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "GRD",
-        "low_carbon_Twh": 0.0,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.21,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 1685.069,
-        "renewables_Twh": 0.0,
-        "solar_Twh": 0.0,
-        "total_Twh": 1685.489,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.0,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.21,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 1685.069,
+        "renewables_TWh": 0.0,
+        "solar_TWh": 0.0,
+        "total_TWh": 0.21,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "GRL": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 133.333,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Greenland",
-        "fossil_Twh": 0.1,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.5,
+        "fossil_TWh": 0.1,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.5,
         "iso_code": "GRL",
-        "low_carbon_Twh": 0.5,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.1,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 10663.634,
-        "renewables_Twh": 0.5,
-        "solar_Twh": 0.0,
-        "total_Twh": 10665.334,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.5,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.1,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 10663.634,
+        "renewables_TWh": 0.5,
+        "solar_TWh": 0.0,
+        "total_TWh": 0.6,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "GTM": {
-        "biofuel_Twh": 2.83,
-        "carbon_intensity": 313.019,
-        "coal_Twh": 2.76,
+        "biofuel_TWh": 2.68,
+        "carbon_intensity": 320.637,
+        "coal_TWh": 3.03,
         "country_name": "Guatemala",
-        "fossil_Twh": 4.83,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 5.92,
+        "fossil_TWh": 4.98,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 5.92,
         "iso_code": "GTM",
-        "low_carbon_Twh": 9.61,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 2.07,
-        "other_renewable_Twh": 3.14,
-        "other_renewable_exc_biofuel_Twh": 0.31,
-        "per_capita_Twh": 820.059,
-        "renewables_Twh": 9.61,
-        "solar_Twh": 0.23,
-        "total_Twh": 861.379,
-        "wind_Twh": 0.32,
+        "low_carbon_TWh": 9.46,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 1.95,
+        "other_renewable_TWh": 2.99,
+        "other_renewable_exc_biofuel_TWh": 0.31,
+        "per_capita_Wh": 820.059,
+        "renewables_TWh": 9.46,
+        "solar_TWh": 0.23,
+        "total_TWh": 14.440000000000001,
+        "wind_TWh": 0.32,
         "year": 2021
     },
     "GUM": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 670.33,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Guam",
-        "fossil_Twh": 1.74,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 1.74,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "GUM",
-        "low_carbon_Twh": 0.08,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 1.74,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 10671.607,
-        "renewables_Twh": 0.08,
-        "solar_Twh": 0.08,
-        "total_Twh": 10675.327,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.08,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 1.74,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 10671.607,
+        "renewables_TWh": 0.08,
+        "solar_TWh": 0.08,
+        "total_TWh": 1.82,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "GUY": {
-        "biofuel_Twh": 0.15,
-        "carbon_intensity": 634.146,
-        "coal_Twh": 0.0,
+        "biofuel_TWh": 0.13,
+        "carbon_intensity": 642.276,
+        "coal_TWh": 0.0,
         "country_name": "Guyana",
-        "fossil_Twh": 1.07,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 1.09,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "GUY",
-        "low_carbon_Twh": 0.16,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 1.07,
-        "other_renewable_Twh": 0.15,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 1528.765,
-        "renewables_Twh": 0.16,
-        "solar_Twh": 0.01,
-        "total_Twh": 1531.5350000000003,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.14,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 1.09,
+        "other_renewable_TWh": 0.13,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 1528.765,
+        "renewables_TWh": 0.14,
+        "solar_TWh": 0.01,
+        "total_TWh": 1.23,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "HKG": {
-        "biofuel_Twh": 0.0,
-        "carbon_intensity": 684.823,
-        "coal_Twh": 20.83,
+        "biofuel_TWh": 0.16,
+        "carbon_intensity": 683.972,
+        "coal_TWh": 19.16,
         "country_name": "Hong Kong",
-        "fossil_Twh": 35.23,
-        "gaz_Twh": 14.4,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 35.07,
+        "gas_TWh": 13.24,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "HKG",
-        "low_carbon_Twh": 0.02,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.0,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 4703.399,
-        "renewables_Twh": 0.02,
-        "solar_Twh": 0.02,
-        "total_Twh": 4773.919000000001,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.18,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 2.67,
+        "other_renewable_TWh": 0.16,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 4703.399,
+        "renewables_TWh": 0.18,
+        "solar_TWh": 0.02,
+        "total_TWh": 35.25,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "HND": {
-        "biofuel_Twh": 1.14,
-        "carbon_intensity": 374.269,
-        "coal_Twh": 0.54,
+        "biofuel_TWh": 1.13,
+        "carbon_intensity": 375.104,
+        "coal_TWh": 0.54,
         "country_name": "Honduras",
-        "fossil_Twh": 5.74,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 2.7,
+        "fossil_TWh": 5.75,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 2.7,
         "iso_code": "HND",
-        "low_carbon_Twh": 6.23,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 5.2,
-        "other_renewable_Twh": 1.45,
-        "other_renewable_exc_biofuel_Twh": 0.31,
-        "per_capita_Twh": 1164.584,
-        "renewables_Twh": 6.23,
-        "solar_Twh": 1.28,
-        "total_Twh": 1195.8940000000002,
-        "wind_Twh": 0.8,
+        "low_carbon_TWh": 6.22,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 5.21,
+        "other_renewable_TWh": 1.44,
+        "other_renewable_exc_biofuel_TWh": 0.31,
+        "per_capita_Wh": 1164.584,
+        "renewables_TWh": 6.22,
+        "solar_TWh": 1.28,
+        "total_TWh": 11.969999999999999,
+        "wind_TWh": 0.8,
         "year": 2021
     },
     "HRV": {
-        "biofuel_Twh": 1.04,
-        "carbon_intensity": 135.41,
-        "coal_Twh": 1.48,
+        "biofuel_TWh": 1.1,
+        "carbon_intensity": 210.979,
+        "coal_TWh": 1.46,
         "country_name": "Croatia",
-        "fossil_Twh": 4.64,
-        "gaz_Twh": 3.13,
-        "hydroelectricity_Twh": 6.81,
+        "fossil_TWh": 4.59,
+        "gas_TWh": 3.1,
+        "hydroelectricity_TWh": 7.13,
         "iso_code": "HRV",
-        "low_carbon_Twh": 10.13,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.03,
-        "other_renewable_Twh": 1.15,
-        "other_renewable_exc_biofuel_Twh": 0.11,
-        "per_capita_Twh": 3637.807,
-        "renewables_Twh": 10.13,
-        "solar_Twh": 0.08,
-        "total_Twh": 3678.517,
-        "wind_Twh": 2.09,
+        "low_carbon_TWh": 10.53,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.03,
+        "other_renewable_TWh": 1.19,
+        "other_renewable_exc_biofuel_TWh": 0.09,
+        "per_capita_Wh": 3724.01,
+        "renewables_TWh": 10.53,
+        "solar_TWh": 0.15,
+        "total_TWh": 15.12,
+        "wind_TWh": 2.06,
         "year": 2021
     },
     "HTI": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 606.061,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Haiti",
-        "fossil_Twh": 0.86,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.13,
+        "fossil_TWh": 0.86,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.13,
         "iso_code": "HTI",
-        "low_carbon_Twh": 0.13,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.86,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 86.481,
-        "renewables_Twh": 0.13,
-        "solar_Twh": 0.0,
-        "total_Twh": 88.59099999999998,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.13,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.86,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 86.481,
+        "renewables_TWh": 0.13,
+        "solar_TWh": 0.0,
+        "total_TWh": 0.99,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "HUN": {
-        "biofuel_Twh": 2.37,
-        "carbon_intensity": 201.092,
-        "coal_Twh": 3.03,
+        "biofuel_TWh": 2.23,
+        "carbon_intensity": 233.037,
+        "coal_TWh": 3.01,
         "country_name": "Hungary",
-        "fossil_Twh": 13.02,
-        "gaz_Twh": 9.63,
-        "hydroelectricity_Twh": 0.2,
+        "fossil_TWh": 13.06,
+        "gas_TWh": 9.65,
+        "hydroelectricity_TWh": 0.21,
         "iso_code": "HUN",
-        "low_carbon_Twh": 21.79,
-        "nuclear_Twh": 16.01,
-        "oil_Twh": 0.36,
-        "other_renewable_Twh": 2.39,
-        "other_renewable_exc_biofuel_Twh": 0.02,
-        "per_capita_Twh": 3585.044,
-        "renewables_Twh": 5.78,
-        "solar_Twh": 2.51,
-        "total_Twh": 3646.8039999999996,
-        "wind_Twh": 0.68,
+        "low_carbon_TWh": 22.9,
+        "nuclear_TWh": 15.99,
+        "oil_TWh": 0.4,
+        "other_renewable_TWh": 2.24,
+        "other_renewable_exc_biofuel_TWh": 0.01,
+        "per_capita_Wh": 3703.481,
+        "renewables_TWh": 6.91,
+        "solar_TWh": 3.8,
+        "total_TWh": 35.96,
+        "wind_TWh": 0.66,
         "year": 2021
     },
     "IDN": {
-        "biofuel_Twh": 14.98,
-        "carbon_intensity": 623.281,
-        "coal_Twh": 189.96,
+        "biofuel_TWh": 14.98,
+        "carbon_intensity": 623.157,
+        "coal_TWh": 189.96,
         "country_name": "Indonesia",
-        "fossil_Twh": 252.87,
-        "gaz_Twh": 56.26,
-        "hydroelectricity_Twh": 24.7,
+        "fossil_TWh": 253.14,
+        "gas_TWh": 56.53,
+        "hydroelectricity_TWh": 24.7,
         "iso_code": "IDN",
-        "low_carbon_Twh": 56.22,
-        "nuclear_Twh": NaN,
-        "oil_Twh": 6.65,
-        "other_renewable_Twh": 30.89,
-        "other_renewable_exc_biofuel_Twh": 15.91,
-        "per_capita_Twh": 1129.083,
-        "renewables_Twh": 56.22,
-        "solar_Twh": 0.19,
-        "total_Twh": 1818.4630000000004,
-        "wind_Twh": 0.44,
+        "low_carbon_TWh": 56.22,
+        "nuclear_TWh": NaN,
+        "oil_TWh": 6.65,
+        "other_renewable_TWh": 30.89,
+        "other_renewable_exc_biofuel_TWh": 15.91,
+        "per_capita_Wh": 1130.069,
+        "renewables_TWh": 56.22,
+        "solar_TWh": 0.19,
+        "total_TWh": 309.36,
+        "wind_TWh": 0.44,
         "year": 2021
     },
     "IND": {
-        "biofuel_Twh": 35.47,
+        "biofuel_TWh": 35.47,
         "carbon_intensity": 637.182,
-        "coal_Twh": 1271.14,
+        "coal_TWh": 1271.14,
         "country_name": "India",
-        "fossil_Twh": 1337.63,
-        "gaz_Twh": 64.18,
-        "hydroelectricity_Twh": 160.33,
+        "fossil_TWh": 1337.63,
+        "gas_TWh": 64.18,
+        "hydroelectricity_TWh": 160.33,
         "iso_code": "IND",
-        "low_carbon_Twh": 376.12,
-        "nuclear_Twh": 43.92,
-        "oil_Twh": 2.31,
-        "other_renewable_Twh": 35.474,
-        "other_renewable_exc_biofuel_Twh": NaN,
-        "per_capita_Twh": 1217.529,
-        "renewables_Twh": 332.2,
-        "solar_Twh": 68.31,
-        "total_Twh": 4968.783,
-        "wind_Twh": 68.09,
+        "low_carbon_TWh": 376.12,
+        "nuclear_TWh": 43.92,
+        "oil_TWh": 2.31,
+        "other_renewable_TWh": 36.76,
+        "other_renewable_exc_biofuel_TWh": NaN,
+        "per_capita_Wh": 1217.529,
+        "renewables_TWh": 332.2,
+        "solar_TWh": 68.31,
+        "total_TWh": 1713.7500000000002,
+        "wind_TWh": 68.09,
         "year": 2021
     },
     "IRL": {
-        "biofuel_Twh": 0.85,
-        "carbon_intensity": 401.606,
-        "coal_Twh": 4.15,
+        "biofuel_TWh": 1.0,
+        "carbon_intensity": 363.608,
+        "coal_TWh": 2.72,
         "country_name": "Ireland",
-        "fossil_Twh": 18.87,
-        "gaz_Twh": 12.43,
-        "hydroelectricity_Twh": 0.7,
+        "fossil_TWh": 19.98,
+        "gas_TWh": 15.16,
+        "hydroelectricity_TWh": 0.75,
         "iso_code": "IRL",
-        "low_carbon_Twh": 11.01,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 2.29,
-        "other_renewable_Twh": 0.85,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 5992.148,
-        "renewables_Twh": 11.01,
-        "solar_Twh": 0.02,
-        "total_Twh": 6063.768000000001,
-        "wind_Twh": 9.44,
+        "low_carbon_TWh": 11.62,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 2.1,
+        "other_renewable_TWh": 1.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 6337.079,
+        "renewables_TWh": 11.62,
+        "solar_TWh": 0.09,
+        "total_TWh": 31.6,
+        "wind_TWh": 9.78,
         "year": 2021
     },
     "IRN": {
-        "biofuel_Twh": 0.01,
-        "carbon_intensity": 492.461,
-        "coal_Twh": 0.62,
+        "biofuel_TWh": 0.01,
+        "carbon_intensity": 492.678,
+        "coal_TWh": 0.66,
         "country_name": "Iran",
-        "fossil_Twh": 321.41,
-        "gaz_Twh": 274.46,
-        "hydroelectricity_Twh": 15.0,
+        "fossil_TWh": 337.61,
+        "gas_TWh": 288.29,
+        "hydroelectricity_TWh": 14.88,
         "iso_code": "IRN",
-        "low_carbon_Twh": 19.47,
-        "nuclear_Twh": 3.24,
-        "oil_Twh": 46.33,
-        "other_renewable_Twh": 0.01,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 3877.01,
-        "renewables_Twh": 16.23,
-        "solar_Twh": 0.62,
-        "total_Twh": 4571.770000000001,
-        "wind_Twh": 0.6,
+        "low_carbon_TWh": 20.23,
+        "nuclear_TWh": 3.54,
+        "oil_TWh": 48.66,
+        "other_renewable_TWh": 0.022,
+        "other_renewable_exc_biofuel_TWh": NaN,
+        "per_capita_Wh": 4069.905,
+        "renewables_TWh": 16.69,
+        "solar_TWh": 0.67,
+        "total_TWh": 357.84000000000003,
+        "wind_TWh": 1.13,
         "year": 2021
     },
     "IRQ": {
-        "biofuel_Twh": 0.0,
-        "carbon_intensity": 500.206,
-        "coal_Twh": 0.0,
+        "biofuel_TWh": 0.0,
+        "carbon_intensity": 498.869,
+        "coal_TWh": 0.0,
         "country_name": "Iraq",
-        "fossil_Twh": 91.98,
-        "gaz_Twh": 75.56,
-        "hydroelectricity_Twh": 4.9,
+        "fossil_TWh": 91.98,
+        "gas_TWh": 76.22,
+        "hydroelectricity_TWh": 4.9,
         "iso_code": "IRQ",
-        "low_carbon_Twh": 5.28,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 16.42,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 2234.137,
-        "renewables_Twh": 5.28,
-        "solar_Twh": 0.38,
-        "total_Twh": 2433.937000000001,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 5.28,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 15.76,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 2234.137,
+        "renewables_TWh": 5.28,
+        "solar_TWh": 0.38,
+        "total_TWh": 97.26,
+        "wind_TWh": 0.0,
+        "year": 2021
+    },
+    "ISL": {
+        "biofuel_TWh": 0.0,
+        "carbon_intensity": 28.557,
+        "coal_TWh": 0.0,
+        "country_name": "Iceland",
+        "fossil_TWh": 0.0,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 13.57,
+        "iso_code": "ISL",
+        "low_carbon_TWh": 19.26,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.0,
+        "other_renewable_TWh": 5.68,
+        "other_renewable_exc_biofuel_TWh": 5.68,
+        "per_capita_Wh": 52006.547,
+        "renewables_TWh": 19.26,
+        "solar_TWh": 0.0,
+        "total_TWh": 19.26,
+        "wind_TWh": 0.01,
         "year": 2021
     },
     "ISR": {
-        "biofuel_Twh": 0.11,
-        "carbon_intensity": 550.493,
-        "coal_Twh": 20.01,
+        "biofuel_TWh": 0.1,
+        "carbon_intensity": 548.03,
+        "coal_TWh": 19.49,
         "country_name": "Israel",
-        "fossil_Twh": 68.12,
-        "gaz_Twh": 48.11,
-        "hydroelectricity_Twh": 0.02,
+        "fossil_TWh": 68.13,
+        "gas_TWh": 48.64,
+        "hydroelectricity_TWh": 0.02,
         "iso_code": "ISR",
-        "low_carbon_Twh": 4.96,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.0,
-        "other_renewable_Twh": 0.11,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 8211.184,
-        "renewables_Twh": 4.96,
-        "solar_Twh": 4.64,
-        "total_Twh": 8362.414,
-        "wind_Twh": 0.19,
+        "low_carbon_TWh": 4.95,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.0,
+        "other_renewable_TWh": 0.1,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 8211.184,
+        "renewables_TWh": 4.95,
+        "solar_TWh": 4.64,
+        "total_TWh": 73.08,
+        "wind_TWh": 0.19,
         "year": 2021
     },
     "ITA": {
-        "biofuel_Twh": 19.83,
-        "carbon_intensity": 226.196,
-        "coal_Twh": 14.93,
+        "biofuel_TWh": 19.06,
+        "carbon_intensity": 340.794,
+        "coal_TWh": 14.02,
         "country_name": "Italy",
-        "fossil_Twh": 166.12,
-        "gaz_Twh": 137.11,
-        "hydroelectricity_Twh": 44.62,
+        "fossil_TWh": 170.06,
+        "gas_TWh": 144.01,
+        "hydroelectricity_TWh": 45.39,
         "iso_code": "ITA",
-        "low_carbon_Twh": 116.82,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 14.08,
-        "other_renewable_Twh": 25.73,
-        "other_renewable_exc_biofuel_Twh": 5.9,
-        "per_capita_Twh": 4776.138,
-        "renewables_Twh": 116.82,
-        "solar_Twh": 25.41,
-        "total_Twh": 5478.667999999999,
-        "wind_Twh": 21.06,
+        "low_carbon_TWh": 116.33,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 12.03,
+        "other_renewable_TWh": 24.97,
+        "other_renewable_exc_biofuel_TWh": 5.91,
+        "per_capita_Wh": 4834.375,
+        "renewables_TWh": 116.33,
+        "solar_TWh": 25.04,
+        "total_TWh": 286.39,
+        "wind_TWh": 20.93,
         "year": 2021
     },
     "JAM": {
-        "biofuel_Twh": 0.12,
-        "carbon_intensity": 524.138,
-        "coal_Twh": 0.0,
+        "biofuel_TWh": 0.11,
+        "carbon_intensity": 519.54,
+        "coal_TWh": 0.0,
         "country_name": "Jamaica",
-        "fossil_Twh": 3.64,
-        "gaz_Twh": 1.49,
-        "hydroelectricity_Twh": 0.14,
+        "fossil_TWh": 3.65,
+        "gas_TWh": 1.59,
+        "hydroelectricity_TWh": 0.14,
         "iso_code": "JAM",
-        "low_carbon_Twh": 0.71,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 2.15,
-        "other_renewable_Twh": 0.12,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 1538.352,
-        "renewables_Twh": 0.71,
-        "solar_Twh": 0.15,
-        "total_Twh": 1547.8819999999998,
-        "wind_Twh": 0.3,
+        "low_carbon_TWh": 0.7,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 2.06,
+        "other_renewable_TWh": 0.11,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 1538.352,
+        "renewables_TWh": 0.7,
+        "solar_TWh": 0.15,
+        "total_TWh": 4.35,
+        "wind_TWh": 0.3,
         "year": 2021
     },
     "JOR": {
-        "biofuel_Twh": 0.06,
+        "biofuel_TWh": 0.06,
         "carbon_intensity": 399.909,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Jordan",
-        "fossil_Twh": 16.73,
-        "gaz_Twh": 15.06,
-        "hydroelectricity_Twh": 0.02,
+        "fossil_TWh": 16.73,
+        "gas_TWh": 15.06,
+        "hydroelectricity_TWh": 0.02,
         "iso_code": "JOR",
-        "low_carbon_Twh": 5.15,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 1.67,
-        "other_renewable_Twh": 0.06,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 1962.633,
-        "renewables_Twh": 5.15,
-        "solar_Twh": 3.5,
-        "total_Twh": 2011.603,
-        "wind_Twh": 1.57,
+        "low_carbon_TWh": 5.15,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 1.67,
+        "other_renewable_TWh": 0.06,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 1962.633,
+        "renewables_TWh": 5.15,
+        "solar_TWh": 3.5,
+        "total_TWh": 21.880000000000003,
+        "wind_TWh": 1.57,
         "year": 2021
     },
     "JPN": {
-        "biofuel_Twh": 36.91,
+        "biofuel_TWh": 36.91,
         "carbon_intensity": 478.545,
-        "coal_Twh": 311.62,
+        "coal_TWh": 311.62,
         "country_name": "Japan",
-        "fossil_Twh": 680.58,
-        "gaz_Twh": 336.63,
-        "hydroelectricity_Twh": 79.14,
+        "fossil_TWh": 680.58,
+        "gas_TWh": 336.63,
+        "hydroelectricity_TWh": 79.14,
         "iso_code": "JPN",
-        "low_carbon_Twh": 277.95,
-        "nuclear_Twh": 61.22,
-        "oil_Twh": 32.33,
-        "other_renewable_Twh": 39.93,
-        "other_renewable_exc_biofuel_Twh": 3.02,
-        "per_capita_Twh": 7692.084,
-        "renewables_Twh": 216.73,
-        "solar_Twh": 88.7,
-        "total_Twh": 9801.564,
-        "wind_Twh": 8.96,
+        "low_carbon_TWh": 277.95,
+        "nuclear_TWh": 61.22,
+        "oil_TWh": 32.33,
+        "other_renewable_TWh": 39.93,
+        "other_renewable_exc_biofuel_TWh": 3.02,
+        "per_capita_Wh": 7692.084,
+        "renewables_TWh": 216.73,
+        "solar_TWh": 88.7,
+        "total_TWh": 958.5300000000001,
+        "wind_TWh": 8.96,
         "year": 2021
     },
     "KAZ": {
-        "biofuel_Twh": 0.0,
-        "carbon_intensity": 656.097,
-        "coal_Twh": 77.35,
+        "biofuel_TWh": 0.0,
+        "carbon_intensity": 641.102,
+        "coal_TWh": 69.29,
         "country_name": "Kazakhstan",
-        "fossil_Twh": 99.96,
-        "gaz_Twh": 22.61,
-        "hydroelectricity_Twh": 9.44,
+        "fossil_TWh": 102.3,
+        "gas_TWh": 32.92,
+        "hydroelectricity_TWh": 9.09,
         "iso_code": "KAZ",
-        "low_carbon_Twh": 14.2,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.0,
-        "other_renewable_Twh": 0.005,
-        "other_renewable_exc_biofuel_Twh": NaN,
-        "per_capita_Twh": 5946.927,
-        "renewables_Twh": 14.2,
-        "solar_Twh": 2.96,
-        "total_Twh": 6189.451999999999,
-        "wind_Twh": 1.8,
+        "low_carbon_TWh": 12.05,
+        "nuclear_TWh": NaN,
+        "oil_TWh": 0.09,
+        "other_renewable_TWh": 0.003,
+        "other_renewable_exc_biofuel_TWh": NaN,
+        "per_capita_Wh": 5956.825,
+        "renewables_TWh": 12.05,
+        "solar_TWh": 1.29,
+        "total_TWh": 114.35,
+        "wind_TWh": 1.67,
         "year": 2021
     },
     "KEN": {
-        "biofuel_Twh": 0.12,
-        "carbon_intensity": 87.067,
-        "coal_Twh": 0.0,
+        "biofuel_TWh": 0.13,
+        "carbon_intensity": 86.221,
+        "coal_TWh": 0.0,
         "country_name": "Kenya",
-        "fossil_Twh": 0.98,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 4.0,
+        "fossil_TWh": 0.97,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 4.0,
         "iso_code": "KEN",
-        "low_carbon_Twh": 10.85,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.98,
-        "other_renewable_Twh": 5.24,
-        "other_renewable_exc_biofuel_Twh": 5.12,
-        "per_capita_Twh": 223.184,
-        "renewables_Twh": 10.85,
-        "solar_Twh": 0.1,
-        "total_Twh": 257.814,
-        "wind_Twh": 1.51,
+        "low_carbon_TWh": 10.86,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.97,
+        "other_renewable_TWh": 5.25,
+        "other_renewable_exc_biofuel_TWh": 5.12,
+        "per_capita_Wh": 223.184,
+        "renewables_TWh": 10.86,
+        "solar_TWh": 0.1,
+        "total_TWh": 11.83,
+        "wind_TWh": 1.51,
         "year": 2021
     },
     "KGZ": {
-        "biofuel_Twh": 0.0,
-        "carbon_intensity": 104.354,
-        "coal_Twh": 1.39,
+        "biofuel_TWh": 0.0,
+        "carbon_intensity": 104.426,
+        "coal_TWh": 1.46,
         "country_name": "Kyrgyzstan",
-        "fossil_Twh": 1.47,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 13.0,
+        "fossil_TWh": 1.46,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 13.0,
         "iso_code": "KGZ",
-        "low_carbon_Twh": 13.0,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.08,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 2216.693,
-        "renewables_Twh": 13.0,
-        "solar_Twh": 0.0,
-        "total_Twh": 2258.633,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 13.0,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.0,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 2215.161,
+        "renewables_TWh": 13.0,
+        "solar_TWh": 0.0,
+        "total_TWh": 14.46,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "KHM": {
-        "biofuel_Twh": 0.23,
-        "carbon_intensity": 399.31,
-        "coal_Twh": 3.65,
+        "biofuel_TWh": 0.23,
+        "carbon_intensity": 400.46,
+        "coal_TWh": 3.68,
         "country_name": "Cambodia",
-        "fossil_Twh": 4.09,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 4.0,
+        "fossil_TWh": 4.09,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 4.0,
         "iso_code": "KHM",
-        "low_carbon_Twh": 4.6,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.44,
-        "other_renewable_Twh": 0.23,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 523.84,
-        "renewables_Twh": 4.6,
-        "solar_Twh": 0.37,
-        "total_Twh": 546.0500000000001,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 4.6,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.41,
+        "other_renewable_TWh": 0.23,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 523.84,
+        "renewables_TWh": 4.6,
+        "solar_TWh": 0.37,
+        "total_TWh": 8.69,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "KIR": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 666.667,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Kiribati",
-        "fossil_Twh": 0.03,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 0.03,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "KIR",
-        "low_carbon_Twh": 0.0,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.03,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 232.769,
-        "renewables_Twh": 0.0,
-        "solar_Twh": 0.0,
-        "total_Twh": 232.829,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.0,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.03,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 232.769,
+        "renewables_TWh": 0.0,
+        "solar_TWh": 0.0,
+        "total_TWh": 0.03,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "KNA": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 681.818,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Saint Kitts and Nevis",
-        "fossil_Twh": 0.21,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 0.21,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "KNA",
-        "low_carbon_Twh": 0.01,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.21,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 4618.841,
-        "renewables_Twh": 0.01,
-        "solar_Twh": 0.0,
-        "total_Twh": 4619.291000000001,
-        "wind_Twh": 0.01,
+        "low_carbon_TWh": 0.01,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.21,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 4618.841,
+        "renewables_TWh": 0.01,
+        "solar_TWh": 0.0,
+        "total_TWh": 0.22,
+        "wind_TWh": 0.01,
         "year": 2021
     },
     "KOR": {
-        "biofuel_Twh": 15.11,
+        "biofuel_TWh": 15.11,
         "carbon_intensity": 458.081,
-        "coal_Twh": 210.19,
+        "coal_TWh": 210.19,
         "country_name": "South Korea",
-        "fossil_Twh": 392.25,
-        "gaz_Twh": 175.12,
-        "hydroelectricity_Twh": 3.05,
+        "fossil_TWh": 392.25,
+        "gas_TWh": 175.12,
+        "hydroelectricity_TWh": 3.05,
         "iso_code": "KOR",
-        "low_carbon_Twh": 196.27,
-        "nuclear_Twh": 150.52,
-        "oil_Twh": 6.94,
-        "other_renewable_Twh": 15.57,
-        "other_renewable_exc_biofuel_Twh": 0.46,
-        "per_capita_Twh": 11354.784,
-        "renewables_Twh": 45.75,
-        "solar_Twh": 23.95,
-        "total_Twh": 12442.164,
-        "wind_Twh": 3.18,
+        "low_carbon_TWh": 196.27,
+        "nuclear_TWh": 150.52,
+        "oil_TWh": 6.94,
+        "other_renewable_TWh": 15.57,
+        "other_renewable_exc_biofuel_TWh": 0.46,
+        "per_capita_Wh": 11354.784,
+        "renewables_TWh": 45.75,
+        "solar_TWh": 23.95,
+        "total_TWh": 588.52,
+        "wind_TWh": 3.18,
         "year": 2021
     },
     "KWT": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 489.61,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Kuwait",
-        "fossil_Twh": 71.17,
-        "gaz_Twh": 71.17,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 71.17,
+        "gas_TWh": 71.17,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "KWT",
-        "low_carbon_Twh": 0.05,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.0,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 16757.211,
-        "renewables_Twh": 0.05,
-        "solar_Twh": 0.02,
-        "total_Twh": 16899.701,
-        "wind_Twh": 0.03,
+        "low_carbon_TWh": 0.05,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.0,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 16757.211,
+        "renewables_TWh": 0.05,
+        "solar_TWh": 0.02,
+        "total_TWh": 71.22,
+        "wind_TWh": 0.03,
         "year": 2021
     },
     "LAO": {
-        "biofuel_Twh": 0.61,
+        "biofuel_TWh": 0.61,
         "carbon_intensity": 242.182,
-        "coal_Twh": 10.81,
+        "coal_TWh": 10.81,
         "country_name": "Laos",
-        "fossil_Twh": 10.81,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 28.51,
+        "fossil_TWh": 10.81,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 28.51,
         "iso_code": "LAO",
-        "low_carbon_Twh": 29.16,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.0,
-        "other_renewable_Twh": 0.61,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 5383.125,
-        "renewables_Twh": 29.16,
-        "solar_Twh": 0.04,
-        "total_Twh": 5492.835,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 29.16,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.0,
+        "other_renewable_TWh": 0.61,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 5383.125,
+        "renewables_TWh": 29.16,
+        "solar_TWh": 0.04,
+        "total_TWh": 39.97,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "LBN": {
-        "biofuel_Twh": 0.06,
-        "carbon_intensity": 545.941,
-        "coal_Twh": 0.0,
+        "biofuel_TWh": 0.03,
+        "carbon_intensity": 594.752,
+        "coal_TWh": 0.0,
         "country_name": "Lebanon",
-        "fossil_Twh": 19.41,
-        "gaz_Twh": 11.39,
-        "hydroelectricity_Twh": 0.97,
+        "fossil_TWh": 19.45,
+        "gas_TWh": 6.73,
+        "hydroelectricity_TWh": 0.97,
         "iso_code": "LBN",
-        "low_carbon_Twh": 1.16,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 8.02,
-        "other_renewable_Twh": 0.06,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 3678.057,
-        "renewables_Twh": 1.16,
-        "solar_Twh": 0.12,
-        "total_Twh": 3720.4169999999995,
-        "wind_Twh": 0.01,
+        "low_carbon_TWh": 1.13,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 12.72,
+        "other_renewable_TWh": 0.03,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 3679.845,
+        "renewables_TWh": 1.13,
+        "solar_TWh": 0.12,
+        "total_TWh": 20.58,
+        "wind_TWh": 0.01,
         "year": 2021
     },
     "LBR": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 304.348,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Liberia",
-        "fossil_Twh": 0.39,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.53,
+        "fossil_TWh": 0.39,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.53,
         "iso_code": "LBR",
-        "low_carbon_Twh": 0.53,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.39,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 177.147,
-        "renewables_Twh": 0.53,
-        "solar_Twh": 0.0,
-        "total_Twh": 179.51699999999997,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.53,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.39,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 177.147,
+        "renewables_TWh": 0.53,
+        "solar_TWh": 0.0,
+        "total_TWh": 0.92,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "LBY": {
-        "biofuel_Twh": 0.0,
-        "carbon_intensity": 496.565,
-        "coal_Twh": 0.0,
+        "biofuel_TWh": 0.0,
+        "carbon_intensity": 550.422,
+        "coal_TWh": 0.0,
         "country_name": "Libya",
-        "fossil_Twh": 32.01,
-        "gaz_Twh": 31.0,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 32.02,
+        "gas_TWh": 22.76,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "LBY",
-        "low_carbon_Twh": 0.01,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 1.01,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 4754.071,
-        "renewables_Twh": 0.01,
-        "solar_Twh": 0.01,
-        "total_Twh": 4818.121000000001,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.01,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 9.26,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 4755.556,
+        "renewables_TWh": 0.01,
+        "solar_TWh": 0.01,
+        "total_TWh": 32.03,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "LCA": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 685.714,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Saint Lucia",
-        "fossil_Twh": 0.35,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 0.35,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "LCA",
-        "low_carbon_Twh": 0.0,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.35,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 1948.092,
-        "renewables_Twh": 0.0,
-        "solar_Twh": 0.0,
-        "total_Twh": 1948.792,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.0,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.35,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 1948.092,
+        "renewables_TWh": 0.0,
+        "solar_TWh": 0.0,
+        "total_TWh": 0.35,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "LKA": {
-        "biofuel_Twh": 0.26,
-        "carbon_intensity": 479.829,
-        "coal_Twh": 4.23,
+        "biofuel_TWh": 0.18,
+        "carbon_intensity": 462.997,
+        "coal_TWh": 4.03,
         "country_name": "Sri Lanka",
-        "fossil_Twh": 10.19,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 5.0,
+        "fossil_TWh": 10.26,
+        "gas_TWh": 1.34,
+        "hydroelectricity_TWh": 5.0,
         "iso_code": "LKA",
-        "low_carbon_Twh": 6.17,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 5.96,
-        "other_renewable_Twh": 0.26,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 751.374,
-        "renewables_Twh": 6.17,
-        "solar_Twh": 0.54,
-        "total_Twh": 790.524,
-        "wind_Twh": 0.37,
+        "low_carbon_TWh": 6.09,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 4.89,
+        "other_renewable_TWh": 0.18,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 750.915,
+        "renewables_TWh": 6.09,
+        "solar_TWh": 0.54,
+        "total_TWh": 16.35,
+        "wind_TWh": 0.37,
         "year": 2021
     },
     "LSO": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 20.0,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Lesotho",
-        "fossil_Twh": 0.0,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.5,
+        "fossil_TWh": 0.0,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.5,
         "iso_code": "LSO",
-        "low_carbon_Twh": 0.5,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.0,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 219.158,
-        "renewables_Twh": 0.5,
-        "solar_Twh": 0.0,
-        "total_Twh": 220.658,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.5,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.0,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 219.158,
+        "renewables_TWh": 0.5,
+        "solar_TWh": 0.0,
+        "total_TWh": 0.5,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "LTU": {
-        "biofuel_Twh": 0.51,
-        "carbon_intensity": 274.725,
-        "coal_Twh": 0.0,
+        "biofuel_TWh": 0.69,
+        "carbon_intensity": 244.604,
+        "coal_TWh": 0.0,
         "country_name": "Lithuania",
-        "fossil_Twh": 1.36,
-        "gaz_Twh": 1.24,
-        "hydroelectricity_Twh": 0.32,
+        "fossil_TWh": 1.55,
+        "gas_TWh": 1.22,
+        "hydroelectricity_TWh": 0.38,
         "iso_code": "LTU",
-        "low_carbon_Twh": 2.28,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.12,
-        "other_renewable_Twh": 0.51,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 1306.227,
-        "renewables_Twh": 2.28,
-        "solar_Twh": 0.13,
-        "total_Twh": 1316.297,
-        "wind_Twh": 1.32,
+        "low_carbon_TWh": 2.62,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.33,
+        "other_renewable_TWh": 0.69,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 1496.419,
+        "renewables_TWh": 2.62,
+        "solar_TWh": 0.19,
+        "total_TWh": 4.17,
+        "wind_TWh": 1.36,
         "year": 2021
     },
     "LUX": {
-        "biofuel_Twh": 0.38,
-        "carbon_intensity": 0.0,
-        "coal_Twh": 0.0,
+        "biofuel_TWh": 0.39,
+        "carbon_intensity": 186.992,
+        "coal_TWh": 0.0,
         "country_name": "Luxembourg",
-        "fossil_Twh": 0.27,
-        "gaz_Twh": 0.19,
-        "hydroelectricity_Twh": 0.15,
+        "fossil_TWh": 0.24,
+        "gas_TWh": 0.17,
+        "hydroelectricity_TWh": 0.11,
         "iso_code": "LUX",
-        "low_carbon_Twh": 1.12,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.08,
-        "other_renewable_Twh": 0.38,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 2174.151,
-        "renewables_Twh": 1.12,
-        "solar_Twh": 0.25,
-        "total_Twh": 2178.431,
-        "wind_Twh": 0.34,
+        "low_carbon_TWh": 0.99,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.07,
+        "other_renewable_TWh": 0.39,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 1923.889,
+        "renewables_TWh": 0.99,
+        "solar_TWh": 0.18,
+        "total_TWh": 1.23,
+        "wind_TWh": 0.31,
         "year": 2021
     },
     "LVA": {
-        "biofuel_Twh": 0.86,
-        "carbon_intensity": 167.504,
-        "coal_Twh": 0.0,
+        "biofuel_TWh": 0.86,
+        "carbon_intensity": 223.932,
+        "coal_TWh": 0.0,
         "country_name": "Latvia",
-        "fossil_Twh": 2.29,
-        "gaz_Twh": 2.29,
-        "hydroelectricity_Twh": 2.69,
+        "fossil_TWh": 2.13,
+        "gas_TWh": 2.13,
+        "hydroelectricity_TWh": 2.71,
         "iso_code": "LVA",
-        "low_carbon_Twh": 3.68,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.0,
-        "other_renewable_Twh": 0.86,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 3185.825,
-        "renewables_Twh": 3.68,
-        "solar_Twh": 0.0,
-        "total_Twh": 3202.305,
-        "wind_Twh": 0.13,
+        "low_carbon_TWh": 3.72,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.0,
+        "other_renewable_TWh": 0.86,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 3121.788,
+        "renewables_TWh": 3.72,
+        "solar_TWh": 0.01,
+        "total_TWh": 5.85,
+        "wind_TWh": 0.14,
         "year": 2021
     },
     "MAC": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 491.525,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Macao",
-        "fossil_Twh": 0.59,
-        "gaz_Twh": 0.59,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 0.59,
+        "gas_TWh": 0.59,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "MAC",
-        "low_carbon_Twh": 0.0,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.0,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 859.287,
-        "renewables_Twh": 0.0,
-        "solar_Twh": 0.0,
-        "total_Twh": 860.4670000000001,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.0,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.0,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 859.287,
+        "renewables_TWh": 0.0,
+        "solar_TWh": 0.0,
+        "total_TWh": 0.59,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "MAR": {
-        "biofuel_Twh": 0.04,
+        "biofuel_TWh": 0.04,
         "carbon_intensity": 610.412,
-        "coal_Twh": 23.88,
+        "coal_TWh": 23.88,
         "country_name": "Morocco",
-        "fossil_Twh": 33.12,
-        "gaz_Twh": 4.88,
-        "hydroelectricity_Twh": 1.21,
+        "fossil_TWh": 33.12,
+        "gas_TWh": 4.88,
+        "hydroelectricity_TWh": 1.21,
         "iso_code": "MAR",
-        "low_carbon_Twh": 8.18,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 4.36,
-        "other_renewable_Twh": 0.04,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 1113.911,
-        "renewables_Twh": 8.18,
-        "solar_Twh": 1.82,
-        "total_Twh": 1204.7310000000002,
-        "wind_Twh": 5.11,
+        "low_carbon_TWh": 8.18,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 4.36,
+        "other_renewable_TWh": 0.04,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 1113.911,
+        "renewables_TWh": 8.18,
+        "solar_TWh": 1.82,
+        "total_TWh": 41.3,
+        "wind_TWh": 5.11,
         "year": 2021
     },
     "MDA": {
-        "biofuel_Twh": 0.02,
-        "carbon_intensity": 645.646,
-        "coal_Twh": 3.73,
+        "biofuel_TWh": 0.01,
+        "carbon_intensity": 638.138,
+        "coal_TWh": 3.6,
         "country_name": "Moldova",
-        "fossil_Twh": 6.23,
-        "gaz_Twh": 2.5,
-        "hydroelectricity_Twh": 0.32,
+        "fossil_TWh": 6.24,
+        "gas_TWh": 2.64,
+        "hydroelectricity_TWh": 0.32,
         "iso_code": "MDA",
-        "low_carbon_Twh": 0.43,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.0,
-        "other_renewable_Twh": 0.02,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 2175.398,
-        "renewables_Twh": 0.43,
-        "solar_Twh": 0.01,
-        "total_Twh": 2189.168,
-        "wind_Twh": 0.08,
+        "low_carbon_TWh": 0.42,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.0,
+        "other_renewable_TWh": 0.01,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 2175.398,
+        "renewables_TWh": 0.42,
+        "solar_TWh": 0.01,
+        "total_TWh": 6.66,
+        "wind_TWh": 0.08,
         "year": 2021
     },
     "MDG": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 483.254,
-        "coal_Twh": 0.26,
+        "coal_TWh": 0.26,
         "country_name": "Madagascar",
-        "fossil_Twh": 1.37,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.7,
+        "fossil_TWh": 1.37,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.7,
         "iso_code": "MDG",
-        "low_carbon_Twh": 0.72,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 1.11,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 72.279,
-        "renewables_Twh": 0.72,
-        "solar_Twh": 0.02,
-        "total_Twh": 77.179,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.72,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 1.11,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 72.279,
+        "renewables_TWh": 0.72,
+        "solar_TWh": 0.02,
+        "total_TWh": 2.09,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "MDV": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 651.515,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Maldives",
-        "fossil_Twh": 0.61,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 0.61,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "MDV",
-        "low_carbon_Twh": 0.05,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.61,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 1265.655,
-        "renewables_Twh": 0.05,
-        "solar_Twh": 0.05,
-        "total_Twh": 1267.025,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.05,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.61,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 1265.655,
+        "renewables_TWh": 0.05,
+        "solar_TWh": 0.05,
+        "total_TWh": 0.66,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "MEX": {
-        "biofuel_Twh": 6.77,
+        "biofuel_TWh": 6.77,
         "carbon_intensity": 399.852,
-        "coal_Twh": 13.29,
+        "coal_TWh": 13.29,
         "country_name": "Mexico",
-        "fossil_Twh": 244.87,
-        "gaz_Twh": 199.41,
-        "hydroelectricity_Twh": 34.47,
+        "fossil_TWh": 244.87,
+        "gas_TWh": 199.41,
+        "hydroelectricity_TWh": 34.47,
         "iso_code": "MEX",
-        "low_carbon_Twh": 92.08,
-        "nuclear_Twh": 11.43,
-        "oil_Twh": 32.17,
-        "other_renewable_Twh": 11.05,
-        "other_renewable_exc_biofuel_Twh": 4.28,
-        "per_capita_Twh": 2659.324,
-        "renewables_Twh": 80.65,
-        "solar_Twh": 14.16,
-        "total_Twh": 3409.214,
-        "wind_Twh": 20.97,
+        "low_carbon_TWh": 92.08,
+        "nuclear_TWh": 11.43,
+        "oil_TWh": 32.17,
+        "other_renewable_TWh": 11.05,
+        "other_renewable_exc_biofuel_TWh": 4.28,
+        "per_capita_Wh": 2659.324,
+        "renewables_TWh": 80.65,
+        "solar_TWh": 14.16,
+        "total_TWh": 336.95,
+        "wind_TWh": 20.97,
         "year": 2021
     },
     "MKD": {
-        "biofuel_Twh": 0.06,
-        "carbon_intensity": 373.308,
-        "coal_Twh": 1.8,
+        "biofuel_TWh": 0.05,
+        "carbon_intensity": 490.018,
+        "coal_TWh": 2.19,
         "country_name": "North Macedonia",
-        "fossil_Twh": 2.82,
-        "gaz_Twh": 0.96,
-        "hydroelectricity_Twh": 2.21,
+        "fossil_TWh": 3.88,
+        "gas_TWh": 1.55,
+        "hydroelectricity_TWh": 1.45,
         "iso_code": "MKD",
-        "low_carbon_Twh": 2.35,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.06,
-        "other_renewable_Twh": 0.06,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 2458.008,
-        "renewables_Twh": 2.35,
-        "solar_Twh": 0.02,
-        "total_Twh": 2470.758,
-        "wind_Twh": 0.06,
+        "low_carbon_TWh": 1.63,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.14,
+        "other_renewable_TWh": 0.05,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 2619.657,
+        "renewables_TWh": 1.63,
+        "solar_TWh": 0.03,
+        "total_TWh": 5.51,
+        "wind_TWh": 0.1,
         "year": 2021
     },
     "MLI": {
-        "biofuel_Twh": 0.19,
+        "biofuel_TWh": 0.19,
         "carbon_intensity": 466.077,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Mali",
-        "fossil_Twh": 2.17,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 1.0,
+        "fossil_TWh": 2.17,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 1.0,
         "iso_code": "MLI",
-        "low_carbon_Twh": 1.22,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 2.17,
-        "other_renewable_Twh": 0.19,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 154.759,
-        "renewables_Twh": 1.22,
-        "solar_Twh": 0.03,
-        "total_Twh": 162.94899999999996,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 1.22,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 2.17,
+        "other_renewable_TWh": 0.19,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 154.759,
+        "renewables_TWh": 1.22,
+        "solar_TWh": 0.03,
+        "total_TWh": 3.3899999999999997,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "MLT": {
-        "biofuel_Twh": 0.01,
-        "carbon_intensity": 406.504,
-        "coal_Twh": 0.0,
+        "biofuel_TWh": 0.01,
+        "carbon_intensity": 441.441,
+        "coal_TWh": 0.0,
         "country_name": "Malta",
-        "fossil_Twh": 2.24,
-        "gaz_Twh": 1.94,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 1.95,
+        "gas_TWh": 1.91,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "MLT",
-        "low_carbon_Twh": 0.22,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.3,
-        "other_renewable_Twh": 0.01,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 4670.138,
-        "renewables_Twh": 0.22,
-        "solar_Twh": 0.21,
-        "total_Twh": 4675.2880000000005,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.27,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.04,
+        "other_renewable_TWh": 0.01,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 4214.515,
+        "renewables_TWh": 0.27,
+        "solar_TWh": 0.26,
+        "total_TWh": 2.2199999999999998,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "MMR": {
-        "biofuel_Twh": 0.27,
-        "carbon_intensity": 348.837,
-        "coal_Twh": 0.89,
+        "biofuel_TWh": 0.25,
+        "carbon_intensity": 344.365,
+        "coal_TWh": 0.8,
         "country_name": "Myanmar",
-        "fossil_Twh": 12.99,
-        "gaz_Twh": 8.02,
-        "hydroelectricity_Twh": 9.0,
+        "fossil_TWh": 13.01,
+        "gas_TWh": 8.53,
+        "hydroelectricity_TWh": 9.0,
         "iso_code": "MMR",
-        "low_carbon_Twh": 9.37,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 4.08,
-        "other_renewable_Twh": 0.27,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 415.628,
-        "renewables_Twh": 9.37,
-        "solar_Twh": 0.1,
-        "total_Twh": 469.98799999999994,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 9.35,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 3.68,
+        "other_renewable_TWh": 0.25,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 415.628,
+        "renewables_TWh": 9.35,
+        "solar_TWh": 0.1,
+        "total_TWh": 22.36,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "MNE": {
-        "biofuel_Twh": 0.0,
-        "carbon_intensity": 350.685,
-        "coal_Twh": 1.47,
+        "biofuel_TWh": 0.0,
+        "carbon_intensity": 326.26,
+        "coal_TWh": 1.44,
         "country_name": "Montenegro",
-        "fossil_Twh": 1.47,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 1.87,
+        "fossil_TWh": 1.44,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 2.01,
         "iso_code": "MNE",
-        "low_carbon_Twh": 2.18,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.0,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 5813.435,
-        "renewables_Twh": 2.18,
-        "solar_Twh": 0.0,
-        "total_Twh": 5822.915000000001,
-        "wind_Twh": 0.31,
+        "low_carbon_TWh": 2.33,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.0,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 6004.562,
+        "renewables_TWh": 2.33,
+        "solar_TWh": 0.0,
+        "total_TWh": 3.77,
+        "wind_TWh": 0.32,
         "year": 2021
     },
     "MNG": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 741.573,
-        "coal_Twh": 6.42,
+        "coal_TWh": 6.42,
         "country_name": "Mongolia",
-        "fossil_Twh": 6.42,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.08,
+        "fossil_TWh": 6.42,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.08,
         "iso_code": "MNG",
-        "low_carbon_Twh": 0.7,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.0,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 2126.781,
-        "renewables_Twh": 0.7,
-        "solar_Twh": 0.14,
-        "total_Twh": 2141.7209999999995,
-        "wind_Twh": 0.48,
+        "low_carbon_TWh": 0.7,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.0,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 2126.781,
+        "renewables_TWh": 0.7,
+        "solar_TWh": 0.14,
+        "total_TWh": 7.12,
+        "wind_TWh": 0.48,
         "year": 2021
     },
     "MOZ": {
-        "biofuel_Twh": 0.14,
-        "carbon_intensity": 125.063,
-        "coal_Twh": 0.0,
+        "biofuel_TWh": 0.13,
+        "carbon_intensity": 126.633,
+        "coal_TWh": 0.0,
         "country_name": "Mozambique",
-        "fossil_Twh": 3.7,
-        "gaz_Twh": 2.46,
-        "hydroelectricity_Twh": 16.0,
+        "fossil_TWh": 3.7,
+        "gas_TWh": 2.29,
+        "hydroelectricity_TWh": 16.0,
         "iso_code": "MOZ",
-        "low_carbon_Twh": 16.21,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 1.24,
-        "other_renewable_Twh": 0.14,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 620.693,
-        "renewables_Twh": 16.21,
-        "solar_Twh": 0.07,
-        "total_Twh": 676.8629999999999,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 16.2,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 1.41,
+        "other_renewable_TWh": 0.13,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 620.381,
+        "renewables_TWh": 16.2,
+        "solar_TWh": 0.07,
+        "total_TWh": 19.9,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "MRT": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 526.596,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Mauritania",
-        "fossil_Twh": 1.38,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.21,
+        "fossil_TWh": 1.38,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.21,
         "iso_code": "MRT",
-        "low_carbon_Twh": 0.5,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 1.38,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 407.369,
-        "renewables_Twh": 0.5,
-        "solar_Twh": 0.14,
-        "total_Twh": 411.629,
-        "wind_Twh": 0.15,
+        "low_carbon_TWh": 0.5,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 1.38,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 407.369,
+        "renewables_TWh": 0.5,
+        "solar_TWh": 0.14,
+        "total_TWh": 1.88,
+        "wind_TWh": 0.15,
         "year": 2021
     },
     "MSR": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 1000.0,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Montserrat",
-        "fossil_Twh": 0.01,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 0.01,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "MSR",
-        "low_carbon_Twh": 0.0,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.01,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 2253.267,
-        "renewables_Twh": 0.0,
-        "solar_Twh": 0.0,
-        "total_Twh": 2253.2870000000003,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.0,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.01,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 2253.267,
+        "renewables_TWh": 0.0,
+        "solar_TWh": 0.0,
+        "total_TWh": 0.01,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "MUS": {
-        "biofuel_Twh": 0.33,
+        "biofuel_TWh": 0.32,
         "carbon_intensity": 611.111,
-        "coal_Twh": 0.71,
+        "coal_TWh": 0.68,
         "country_name": "Mauritius",
-        "fossil_Twh": 2.27,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.1,
+        "fossil_TWh": 2.28,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.1,
         "iso_code": "MUS",
-        "low_carbon_Twh": 0.61,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 1.56,
-        "other_renewable_Twh": 0.33,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 2217.223,
-        "renewables_Twh": 0.61,
-        "solar_Twh": 0.16,
-        "total_Twh": 2223.923,
-        "wind_Twh": 0.02,
+        "low_carbon_TWh": 0.6,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 1.6,
+        "other_renewable_TWh": 0.32,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 2217.223,
+        "renewables_TWh": 0.6,
+        "solar_TWh": 0.16,
+        "total_TWh": 2.88,
+        "wind_TWh": 0.02,
         "year": 2021
     },
     "MWI": {
-        "biofuel_Twh": 0.02,
+        "biofuel_TWh": 0.03,
         "carbon_intensity": 133.803,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Malawi",
-        "fossil_Twh": 0.23,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 1.0,
+        "fossil_TWh": 0.22,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 1.0,
         "iso_code": "MWI",
-        "low_carbon_Twh": 1.19,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.23,
-        "other_renewable_Twh": 0.02,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 71.394,
-        "renewables_Twh": 1.19,
-        "solar_Twh": 0.17,
-        "total_Twh": 75.444,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 1.2,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.22,
+        "other_renewable_TWh": 0.03,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 71.394,
+        "renewables_TWh": 1.2,
+        "solar_TWh": 0.17,
+        "total_TWh": 1.42,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "MYS": {
-        "biofuel_Twh": 1.64,
-        "carbon_intensity": 553.328,
-        "coal_Twh": 77.28,
+        "biofuel_TWh": 1.64,
+        "carbon_intensity": 548.611,
+        "coal_TWh": 77.28,
         "country_name": "Malaysia",
-        "fossil_Twh": 141.75,
-        "gaz_Twh": 63.35,
-        "hydroelectricity_Twh": 29.22,
+        "fossil_TWh": 141.75,
+        "gas_TWh": 63.35,
+        "hydroelectricity_TWh": 30.79,
         "iso_code": "MYS",
-        "low_carbon_Twh": 32.36,
-        "nuclear_Twh": NaN,
-        "oil_Twh": 1.12,
-        "other_renewable_Twh": 1.638,
-        "other_renewable_exc_biofuel_Twh": NaN,
-        "per_capita_Twh": 5185.878,
-        "renewables_Twh": 32.36,
-        "solar_Twh": 1.5,
-        "total_Twh": 5568.096,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 33.93,
+        "nuclear_TWh": NaN,
+        "oil_TWh": 1.12,
+        "other_renewable_TWh": 1.153,
+        "other_renewable_exc_biofuel_TWh": NaN,
+        "per_capita_Wh": 5232.64,
+        "renewables_TWh": 33.93,
+        "solar_TWh": 1.5,
+        "total_TWh": 175.68,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "NAM": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 63.694,
-        "coal_Twh": 0.05,
+        "coal_TWh": 0.05,
         "country_name": "Namibia",
-        "fossil_Twh": 0.07,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 1.1,
+        "fossil_TWh": 0.07,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 1.1,
         "iso_code": "NAM",
-        "low_carbon_Twh": 1.5,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.02,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 620.517,
-        "renewables_Twh": 1.5,
-        "solar_Twh": 0.38,
-        "total_Twh": 625.157,
-        "wind_Twh": 0.02,
+        "low_carbon_TWh": 1.5,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.02,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 620.517,
+        "renewables_TWh": 1.5,
+        "solar_TWh": 0.38,
+        "total_TWh": 1.57,
+        "wind_TWh": 0.02,
         "year": 2021
     },
     "NCL": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 610.119,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "New Caledonia",
-        "fossil_Twh": 2.9,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.22,
+        "fossil_TWh": 2.9,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.22,
         "iso_code": "NCL",
-        "low_carbon_Twh": 0.46,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 2.9,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 11674.409,
-        "renewables_Twh": 0.46,
-        "solar_Twh": 0.18,
-        "total_Twh": 11681.588999999998,
-        "wind_Twh": 0.06,
+        "low_carbon_TWh": 0.46,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 2.9,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 11674.409,
+        "renewables_TWh": 0.46,
+        "solar_TWh": 0.18,
+        "total_TWh": 3.36,
+        "wind_TWh": 0.06,
         "year": 2021
     },
     "NER": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 622.222,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Niger",
-        "fossil_Twh": 0.4,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 0.4,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "NER",
-        "low_carbon_Twh": 0.05,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.4,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 17.82,
-        "renewables_Twh": 0.05,
-        "solar_Twh": 0.05,
-        "total_Twh": 18.77,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.05,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.4,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 17.82,
+        "renewables_TWh": 0.05,
+        "solar_TWh": 0.05,
+        "total_TWh": 0.45,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "NGA": {
-        "biofuel_Twh": 0.02,
-        "carbon_intensity": 377.185,
-        "coal_Twh": 0.61,
+        "biofuel_TWh": 0.02,
+        "carbon_intensity": 376.987,
+        "coal_TWh": 0.57,
         "country_name": "Nigeria",
-        "fossil_Twh": 23.4,
-        "gaz_Twh": 22.74,
-        "hydroelectricity_Twh": 8.0,
+        "fossil_TWh": 23.39,
+        "gas_TWh": 22.75,
+        "hydroelectricity_TWh": 8.0,
         "iso_code": "NGA",
-        "low_carbon_Twh": 8.07,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.05,
-        "other_renewable_Twh": 0.02,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 147.469,
-        "renewables_Twh": 8.07,
-        "solar_Twh": 0.05,
-        "total_Twh": 218.49900000000002,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 8.07,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.07,
+        "other_renewable_TWh": 0.02,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 147.422,
+        "renewables_TWh": 8.07,
+        "solar_TWh": 0.05,
+        "total_TWh": 31.46,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "NIC": {
-        "biofuel_Twh": 0.52,
+        "biofuel_TWh": 0.52,
         "carbon_intensity": 354.212,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Nicaragua",
-        "fossil_Twh": 2.1,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.57,
+        "fossil_TWh": 2.1,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.57,
         "iso_code": "NIC",
-        "low_carbon_Twh": 2.53,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 2.1,
-        "other_renewable_Twh": 1.3,
-        "other_renewable_exc_biofuel_Twh": 0.78,
-        "per_capita_Twh": 675.859,
-        "renewables_Twh": 2.53,
-        "solar_Twh": 0.03,
-        "total_Twh": 688.169,
-        "wind_Twh": 0.63,
+        "low_carbon_TWh": 2.53,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 2.1,
+        "other_renewable_TWh": 1.3,
+        "other_renewable_exc_biofuel_TWh": 0.78,
+        "per_capita_Wh": 675.859,
+        "renewables_TWh": 2.53,
+        "solar_TWh": 0.03,
+        "total_TWh": 4.63,
+        "wind_TWh": 0.63,
         "year": 2021
     },
     "NLD": {
-        "biofuel_Twh": 11.65,
-        "carbon_intensity": 331.153,
-        "coal_Twh": 16.18,
+        "biofuel_TWh": 10.88,
+        "carbon_intensity": 388.702,
+        "coal_TWh": 14.59,
         "country_name": "Netherlands",
-        "fossil_Twh": 75.61,
-        "gaz_Twh": 53.86,
-        "hydroelectricity_Twh": 0.1,
+        "fossil_TWh": 77.31,
+        "gas_TWh": 56.63,
+        "hydroelectricity_TWh": 0.09,
         "iso_code": "NLD",
-        "low_carbon_Twh": 45.18,
-        "nuclear_Twh": 3.76,
-        "oil_Twh": 5.57,
-        "other_renewable_Twh": 11.65,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 6901.617,
-        "renewables_Twh": 41.42,
-        "solar_Twh": 11.5,
-        "total_Twh": 7192.5070000000005,
-        "wind_Twh": 18.17,
+        "low_carbon_TWh": 44.3,
+        "nuclear_TWh": 3.83,
+        "oil_TWh": 6.09,
+        "other_renewable_TWh": 10.88,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 6948.47,
+        "renewables_TWh": 40.47,
+        "solar_TWh": 11.5,
+        "total_TWh": 121.61,
+        "wind_TWh": 18.0,
         "year": 2021
     },
     "NOR": {
-        "biofuel_Twh": 0.25,
-        "carbon_intensity": 26.489,
-        "coal_Twh": 0.04,
+        "biofuel_TWh": 0.22,
+        "carbon_intensity": 27.55,
+        "coal_TWh": 0.04,
         "country_name": "Norway",
-        "fossil_Twh": 0.75,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 136.4,
+        "fossil_TWh": 1.08,
+        "gas_TWh": 0.31,
+        "hydroelectricity_TWh": 143.93,
         "iso_code": "NOR",
-        "low_carbon_Twh": 147.99,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.71,
-        "other_renewable_Twh": 0.58,
-        "other_renewable_exc_biofuel_Twh": 0.33,
-        "per_capita_Twh": 27529.043,
-        "renewables_Twh": 147.99,
-        "solar_Twh": 0.01,
-        "total_Twh": 27974.76300000001,
-        "wind_Twh": 11.0,
+        "low_carbon_TWh": 156.09,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.73,
+        "other_renewable_TWh": 0.22,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 29089.279,
+        "renewables_TWh": 156.09,
+        "solar_TWh": 0.17,
+        "total_TWh": 157.17000000000002,
+        "wind_TWh": 11.77,
         "year": 2021
     },
     "NPL": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 24.51,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Nepal",
-        "fossil_Twh": 0.0,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 6.0,
+        "fossil_TWh": 0.0,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 6.0,
         "iso_code": "NPL",
-        "low_carbon_Twh": 6.12,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.0,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 203.762,
-        "renewables_Twh": 6.12,
-        "solar_Twh": 0.11,
-        "total_Twh": 222.122,
-        "wind_Twh": 0.01,
+        "low_carbon_TWh": 6.12,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.0,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 203.762,
+        "renewables_TWh": 6.12,
+        "solar_TWh": 0.11,
+        "total_TWh": 6.12,
+        "wind_TWh": 0.01,
         "year": 2021
     },
     "NRU": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 750.0,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Nauru",
-        "fossil_Twh": 0.04,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 0.04,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "NRU",
-        "low_carbon_Twh": 0.0,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.04,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 3191.574,
-        "renewables_Twh": 0.0,
-        "solar_Twh": 0.0,
-        "total_Twh": 3191.654,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.0,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.04,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 3191.574,
+        "renewables_TWh": 0.0,
+        "solar_TWh": 0.0,
+        "total_TWh": 0.04,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "NZL": {
-        "biofuel_Twh": 0.43,
-        "carbon_intensity": 133.349,
-        "coal_Twh": 1.7,
+        "biofuel_TWh": 0.47,
+        "carbon_intensity": 132.427,
+        "coal_TWh": 1.62,
         "country_name": "New Zealand",
-        "fossil_Twh": 8.37,
-        "gaz_Twh": 6.14,
-        "hydroelectricity_Twh": 23.98,
+        "fossil_TWh": 8.33,
+        "gas_TWh": 6.21,
+        "hydroelectricity_TWh": 23.98,
         "iso_code": "NZL",
-        "low_carbon_Twh": 35.05,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.53,
-        "other_renewable_Twh": 8.25,
-        "other_renewable_exc_biofuel_Twh": 7.82,
-        "per_capita_Twh": 8464.383,
-        "renewables_Twh": 35.05,
-        "solar_Twh": 0.2,
-        "total_Twh": 8586.703,
-        "wind_Twh": 2.62,
+        "low_carbon_TWh": 35.09,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.5,
+        "other_renewable_TWh": 8.29,
+        "other_renewable_exc_biofuel_TWh": 7.82,
+        "per_capita_Wh": 8464.383,
+        "renewables_TWh": 35.09,
+        "solar_TWh": 0.2,
+        "total_TWh": 43.42,
+        "wind_TWh": 2.62,
         "year": 2021
     },
     "OMN": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 488.238,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Oman",
-        "fossil_Twh": 36.4,
-        "gaz_Twh": 36.4,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 36.4,
+        "gas_TWh": 36.4,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "OMN",
-        "low_carbon_Twh": 0.16,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.0,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 8087.648,
-        "renewables_Twh": 0.16,
-        "solar_Twh": 0.16,
-        "total_Twh": 8160.928000000001,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.16,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.0,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 8087.648,
+        "renewables_TWh": 0.16,
+        "solar_TWh": 0.16,
+        "total_TWh": 36.559999999999995,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "PAK": {
-        "biofuel_Twh": 1.52,
-        "carbon_intensity": 365.186,
-        "coal_Twh": 17.31,
+        "biofuel_TWh": 1.5,
+        "carbon_intensity": 366.052,
+        "coal_TWh": 17.8,
         "country_name": "Pakistan",
-        "fossil_Twh": 89.77,
-        "gaz_Twh": 55.45,
-        "hydroelectricity_Twh": 39.0,
+        "fossil_TWh": 89.79,
+        "gas_TWh": 55.21,
+        "hydroelectricity_TWh": 39.0,
         "iso_code": "PAK",
-        "low_carbon_Twh": 60.4,
-        "nuclear_Twh": 15.74,
-        "oil_Twh": 17.01,
-        "other_renewable_Twh": 1.52,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 648.957,
-        "renewables_Twh": 44.66,
-        "solar_Twh": 1.26,
-        "total_Twh": 979.7369999999999,
-        "wind_Twh": 2.88,
+        "low_carbon_TWh": 60.38,
+        "nuclear_TWh": 15.74,
+        "oil_TWh": 16.78,
+        "other_renewable_TWh": 1.5,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 648.957,
+        "renewables_TWh": 44.64,
+        "solar_TWh": 1.26,
+        "total_TWh": 150.17000000000002,
+        "wind_TWh": 2.88,
         "year": 2021
     },
     "PAN": {
-        "biofuel_Twh": 0.05,
-        "carbon_intensity": 193.923,
-        "coal_Twh": 0.69,
+        "biofuel_TWh": 0.06,
+        "carbon_intensity": 192.136,
+        "coal_TWh": 0.84,
         "country_name": "Panama",
-        "fossil_Twh": 2.86,
-        "gaz_Twh": 0.62,
-        "hydroelectricity_Twh": 7.2,
+        "fossil_TWh": 2.85,
+        "gas_TWh": 0.75,
+        "hydroelectricity_TWh": 7.2,
         "iso_code": "PAN",
-        "low_carbon_Twh": 8.33,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 1.55,
-        "other_renewable_Twh": 0.05,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 2571.667,
-        "renewables_Twh": 8.33,
-        "solar_Twh": 0.42,
-        "total_Twh": 2602.427,
-        "wind_Twh": 0.66,
+        "low_carbon_TWh": 8.34,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 1.26,
+        "other_renewable_TWh": 0.06,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 2571.667,
+        "renewables_TWh": 8.34,
+        "solar_TWh": 0.42,
+        "total_TWh": 11.19,
+        "wind_TWh": 0.66,
         "year": 2021
     },
     "PER": {
-        "biofuel_Twh": 0.72,
-        "carbon_intensity": 228.586,
-        "coal_Twh": 0.5,
+        "biofuel_TWh": 0.69,
+        "carbon_intensity": 230.65,
+        "coal_TWh": 0.5,
         "country_name": "Peru",
-        "fossil_Twh": 22.9,
-        "gaz_Twh": 18.09,
-        "hydroelectricity_Twh": 31.89,
+        "fossil_TWh": 22.93,
+        "gas_TWh": 17.54,
+        "hydroelectricity_TWh": 31.89,
         "iso_code": "PER",
-        "low_carbon_Twh": 35.24,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 4.31,
-        "other_renewable_Twh": 0.72,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 1724.431,
-        "renewables_Twh": 35.24,
-        "solar_Twh": 0.82,
-        "total_Twh": 1876.6710000000003,
-        "wind_Twh": 1.81,
+        "low_carbon_TWh": 35.21,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 4.89,
+        "other_renewable_TWh": 0.69,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 1724.431,
+        "renewables_TWh": 35.21,
+        "solar_TWh": 0.82,
+        "total_TWh": 58.14,
+        "wind_TWh": 1.81,
         "year": 2021
     },
     "PHL": {
-        "biofuel_Twh": 2.38,
-        "carbon_intensity": 581.146,
-        "coal_Twh": 49.22,
+        "biofuel_TWh": 2.39,
+        "carbon_intensity": 580.908,
+        "coal_TWh": 48.74,
         "country_name": "Philippines",
-        "fossil_Twh": 84.26,
-        "gaz_Twh": 15.39,
-        "hydroelectricity_Twh": 8.0,
+        "fossil_TWh": 84.26,
+        "gas_TWh": 15.23,
+        "hydroelectricity_TWh": 8.0,
         "iso_code": "PHL",
-        "low_carbon_Twh": 23.94,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 19.65,
-        "other_renewable_Twh": 13.27,
-        "other_renewable_exc_biofuel_Twh": 10.89,
-        "per_capita_Twh": 950.12,
-        "renewables_Twh": 23.94,
-        "solar_Twh": 1.5,
-        "total_Twh": 1192.8400000000001,
-        "wind_Twh": 1.17,
+        "low_carbon_TWh": 23.95,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 20.29,
+        "other_renewable_TWh": 13.28,
+        "other_renewable_exc_biofuel_TWh": 10.89,
+        "per_capita_Wh": 950.208,
+        "renewables_TWh": 23.95,
+        "solar_TWh": 1.5,
+        "total_TWh": 108.21000000000001,
+        "wind_TWh": 1.17,
         "year": 2021
     },
     "PNG": {
-        "biofuel_Twh": 0.09,
+        "biofuel_TWh": 0.09,
         "carbon_intensity": 526.749,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Papua New Guinea",
-        "fossil_Twh": 3.57,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.8,
+        "fossil_TWh": 3.57,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.8,
         "iso_code": "PNG",
-        "low_carbon_Twh": 1.29,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 3.57,
-        "other_renewable_Twh": 0.49,
-        "other_renewable_exc_biofuel_Twh": 0.4,
-        "per_capita_Twh": 488.47,
-        "renewables_Twh": 1.29,
-        "solar_Twh": 0.0,
-        "total_Twh": 499.57000000000005,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 1.29,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 3.57,
+        "other_renewable_TWh": 0.49,
+        "other_renewable_exc_biofuel_TWh": 0.4,
+        "per_capita_Wh": 488.47,
+        "renewables_TWh": 1.29,
+        "solar_TWh": 0.0,
+        "total_TWh": 4.859999999999999,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "POL": {
-        "biofuel_Twh": 7.53,
-        "carbon_intensity": 739.445,
-        "coal_Twh": 126.03,
+        "biofuel_TWh": 8.06,
+        "carbon_intensity": 660.122,
+        "coal_TWh": 127.57,
         "country_name": "Poland",
-        "fossil_Twh": 147.66,
-        "gaz_Twh": 16.49,
-        "hydroelectricity_Twh": 2.26,
+        "fossil_TWh": 148.21,
+        "gas_TWh": 15.82,
+        "hydroelectricity_TWh": 2.34,
         "iso_code": "POL",
-        "low_carbon_Twh": 29.5,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 5.14,
-        "other_renewable_Twh": 7.53,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 4624.655,
-        "renewables_Twh": 29.5,
-        "solar_Twh": 3.91,
-        "total_Twh": 5016.004999999999,
-        "wind_Twh": 15.8,
+        "low_carbon_TWh": 30.56,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 4.82,
+        "other_renewable_TWh": 8.06,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 4666.683,
+        "renewables_TWh": 30.56,
+        "solar_TWh": 3.93,
+        "total_TWh": 178.77,
+        "wind_TWh": 16.23,
         "year": 2021
     },
     "PRI": {
-        "biofuel_Twh": 0.03,
+        "biofuel_TWh": 0.02,
         "carbon_intensity": 681.469,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Puerto Rico",
-        "fossil_Twh": 17.73,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.05,
+        "fossil_TWh": 17.74,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.05,
         "iso_code": "PRI",
-        "low_carbon_Twh": 0.51,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 17.73,
-        "other_renewable_Twh": 0.03,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 5601.914,
-        "renewables_Twh": 0.51,
-        "solar_Twh": 0.27,
-        "total_Twh": 5638.933999999999,
-        "wind_Twh": 0.16,
+        "low_carbon_TWh": 0.5,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 17.74,
+        "other_renewable_TWh": 0.02,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 5601.914,
+        "renewables_TWh": 0.5,
+        "solar_TWh": 0.27,
+        "total_TWh": 18.24,
+        "wind_TWh": 0.16,
         "year": 2021
     },
     "PRK": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 157.785,
-        "coal_Twh": 2.43,
+        "coal_TWh": 2.43,
         "country_name": "North Korea",
-        "fossil_Twh": 2.43,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 12.0,
+        "fossil_TWh": 2.43,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 12.0,
         "iso_code": "PRK",
-        "low_carbon_Twh": 12.02,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.0,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 556.37,
-        "renewables_Twh": 12.02,
-        "solar_Twh": 0.02,
-        "total_Twh": 597.29,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 12.02,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.0,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 556.37,
+        "renewables_TWh": 12.02,
+        "solar_TWh": 0.02,
+        "total_TWh": 14.45,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "PRT": {
-        "biofuel_Twh": 3.92,
-        "carbon_intensity": 182.964,
-        "coal_Twh": 1.1,
+        "biofuel_TWh": 4.0,
+        "carbon_intensity": 219.053,
+        "coal_TWh": 0.8,
         "country_name": "Portugal",
-        "fossil_Twh": 18.36,
-        "gaz_Twh": 15.8,
-        "hydroelectricity_Twh": 11.48,
+        "fossil_TWh": 17.89,
+        "gas_TWh": 15.57,
+        "hydroelectricity_TWh": 11.91,
         "iso_code": "PRT",
-        "low_carbon_Twh": 30.83,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 1.46,
-        "other_renewable_Twh": 4.14,
-        "other_renewable_exc_biofuel_Twh": 0.22,
-        "per_capita_Twh": 4780.318,
-        "renewables_Twh": 30.83,
-        "solar_Twh": 2.04,
-        "total_Twh": 4913.448,
-        "wind_Twh": 13.17,
+        "low_carbon_TWh": 31.55,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 1.52,
+        "other_renewable_TWh": 4.18,
+        "other_renewable_exc_biofuel_TWh": 0.18,
+        "per_capita_Wh": 4804.614,
+        "renewables_TWh": 31.55,
+        "solar_TWh": 2.24,
+        "total_TWh": 49.44,
+        "wind_TWh": 13.22,
         "year": 2021
     },
     "PRY": {
-        "biofuel_Twh": 0.06,
+        "biofuel_TWh": 0.06,
         "carbon_intensity": 25.487,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Paraguay",
-        "fossil_Twh": 0.07,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 39.89,
+        "fossil_TWh": 0.07,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 39.89,
         "iso_code": "PRY",
-        "low_carbon_Twh": 39.95,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.07,
-        "other_renewable_Twh": 0.06,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 5969.747,
-        "renewables_Twh": 39.95,
-        "solar_Twh": 0.0,
-        "total_Twh": 6089.797000000001,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 39.95,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.07,
+        "other_renewable_TWh": 0.06,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 5969.747,
+        "renewables_TWh": 39.95,
+        "solar_TWh": 0.0,
+        "total_TWh": 40.02,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "PSE": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 465.116,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Palestine",
-        "fossil_Twh": 0.66,
-        "gaz_Twh": 0.31,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 0.66,
+        "gas_TWh": 0.31,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "PSE",
-        "low_carbon_Twh": 0.2,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.35,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 167.531,
-        "renewables_Twh": 0.2,
-        "solar_Twh": 0.2,
-        "total_Twh": 169.45100000000002,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.2,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.35,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 167.531,
+        "renewables_TWh": 0.2,
+        "solar_TWh": 0.2,
+        "total_TWh": 0.8600000000000001,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "PYF": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 471.429,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "French Polynesia",
-        "fossil_Twh": 0.47,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.18,
+        "fossil_TWh": 0.47,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.18,
         "iso_code": "PYF",
-        "low_carbon_Twh": 0.23,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.47,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 2302.344,
-        "renewables_Twh": 0.23,
-        "solar_Twh": 0.05,
-        "total_Twh": 2303.9739999999997,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.23,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.47,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 2302.344,
+        "renewables_TWh": 0.23,
+        "solar_TWh": 0.05,
+        "total_TWh": 0.7,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "QAT": {
-        "biofuel_Twh": 0.03,
-        "carbon_intensity": 489.895,
-        "coal_Twh": 0.0,
+        "biofuel_TWh": 0.02,
+        "carbon_intensity": 489.792,
+        "coal_TWh": 0.0,
         "country_name": "Qatar",
-        "fossil_Twh": 47.46,
-        "gaz_Twh": 47.46,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 47.48,
+        "gas_TWh": 47.48,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "QAT",
-        "low_carbon_Twh": 0.04,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.0,
-        "other_renewable_Twh": 0.03,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 17669.561,
-        "renewables_Twh": 0.04,
-        "solar_Twh": 0.01,
-        "total_Twh": 17764.631,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.03,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.0,
+        "other_renewable_TWh": 0.02,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 17673.279,
+        "renewables_TWh": 0.03,
+        "solar_TWh": 0.01,
+        "total_TWh": 47.51,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "ROU": {
-        "biofuel_Twh": 0.65,
-        "carbon_intensity": 255.537,
-        "coal_Twh": 10.84,
+        "biofuel_TWh": 0.65,
+        "carbon_intensity": 255.877,
+        "coal_TWh": 10.69,
         "country_name": "Romania",
-        "fossil_Twh": 21.71,
-        "gaz_Twh": 10.16,
-        "hydroelectricity_Twh": 17.04,
+        "fossil_TWh": 21.51,
+        "gas_TWh": 9.91,
+        "hydroelectricity_TWh": 17.41,
         "iso_code": "ROU",
-        "low_carbon_Twh": 36.99,
-        "nuclear_Twh": 11.09,
-        "oil_Twh": 0.71,
-        "other_renewable_Twh": 0.65,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 3036.957,
-        "renewables_Twh": 25.9,
-        "solar_Twh": 1.7,
-        "total_Twh": 3169.817,
-        "wind_Twh": 6.51,
+        "low_carbon_TWh": 37.62,
+        "nuclear_TWh": 11.28,
+        "oil_TWh": 0.91,
+        "other_renewable_TWh": 0.65,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 3059.204,
+        "renewables_TWh": 26.34,
+        "solar_TWh": 1.7,
+        "total_TWh": 59.13,
+        "wind_TWh": 6.58,
         "year": 2021
     },
     "RUS": {
-        "biofuel_Twh": 0.49,
+        "biofuel_TWh": 0.49,
         "carbon_intensity": 359.937,
-        "coal_Twh": 192.12,
+        "coal_TWh": 192.12,
         "country_name": "Russia",
-        "fossil_Twh": 666.3,
-        "gaz_Twh": 466.24,
-        "hydroelectricity_Twh": 214.5,
+        "fossil_TWh": 666.3,
+        "gas_TWh": 466.24,
+        "hydroelectricity_TWh": 214.5,
         "iso_code": "RUS",
-        "low_carbon_Twh": 444.06,
-        "nuclear_Twh": 222.44,
-        "oil_Twh": 7.94,
-        "other_renewable_Twh": 0.93,
-        "other_renewable_exc_biofuel_Twh": 0.44,
-        "per_capita_Twh": 7652.232,
-        "renewables_Twh": 221.62,
-        "solar_Twh": 2.3,
-        "total_Twh": 9872.622,
-        "wind_Twh": 3.89,
+        "low_carbon_TWh": 444.06,
+        "nuclear_TWh": 222.44,
+        "oil_TWh": 7.94,
+        "other_renewable_TWh": 0.93,
+        "other_renewable_exc_biofuel_TWh": 0.44,
+        "per_capita_Wh": 7652.232,
+        "renewables_TWh": 221.62,
+        "solar_TWh": 2.3,
+        "total_TWh": 1110.36,
+        "wind_TWh": 3.89,
         "year": 2021
     },
     "RWA": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 294.118,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Rwanda",
-        "fossil_Twh": 0.34,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.45,
+        "fossil_TWh": 0.34,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.45,
         "iso_code": "RWA",
-        "low_carbon_Twh": 0.51,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.34,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 63.141,
-        "renewables_Twh": 0.51,
-        "solar_Twh": 0.06,
-        "total_Twh": 65.35100000000001,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.51,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.34,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 63.141,
+        "renewables_TWh": 0.51,
+        "solar_TWh": 0.06,
+        "total_TWh": 0.8500000000000001,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "SAU": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 571.336,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Saudi Arabia",
-        "fossil_Twh": 355.79,
-        "gaz_Twh": 215.93,
-        "hydroelectricity_Twh": NaN,
+        "fossil_TWh": 355.79,
+        "gas_TWh": 215.93,
+        "hydroelectricity_TWh": NaN,
         "iso_code": "SAU",
-        "low_carbon_Twh": 0.83,
-        "nuclear_Twh": NaN,
-        "oil_Twh": 139.86,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": NaN,
-        "per_capita_Twh": 9919.779,
-        "renewables_Twh": 0.83,
-        "solar_Twh": 0.83,
-        "total_Twh": 10633.849000000002,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.83,
+        "nuclear_TWh": NaN,
+        "oil_TWh": 139.86,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": NaN,
+        "per_capita_Wh": 9919.779,
+        "renewables_TWh": 0.83,
+        "solar_TWh": 0.83,
+        "total_TWh": 356.62,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "SDN": {
-        "biofuel_Twh": 0.94,
-        "carbon_intensity": 242.917,
-        "coal_Twh": 0.0,
+        "biofuel_TWh": 0.52,
+        "carbon_intensity": 264.014,
+        "coal_TWh": 0.0,
         "country_name": "Sudan",
-        "fossil_Twh": 5.62,
-        "gaz_Twh": 1.77,
-        "hydroelectricity_Twh": 10.0,
+        "fossil_TWh": 6.04,
+        "gas_TWh": 0.98,
+        "hydroelectricity_TWh": 10.0,
         "iso_code": "SDN",
-        "low_carbon_Twh": 10.97,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 3.85,
-        "other_renewable_Twh": 0.94,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 363.36,
-        "renewables_Twh": 10.97,
-        "solar_Twh": 0.03,
-        "total_Twh": 408.45,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 10.55,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 5.06,
+        "other_renewable_TWh": 0.52,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 363.36,
+        "renewables_TWh": 10.55,
+        "solar_TWh": 0.03,
+        "total_TWh": 16.59,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "SEN": {
-        "biofuel_Twh": 0.1,
-        "carbon_intensity": 502.674,
-        "coal_Twh": 0.12,
+        "biofuel_TWh": 0.09,
+        "carbon_intensity": 523.132,
+        "coal_TWh": 0.55,
         "country_name": "Senegal",
-        "fossil_Twh": 4.48,
-        "gaz_Twh": 1.81,
-        "hydroelectricity_Twh": 0.31,
+        "fossil_TWh": 4.5,
+        "gas_TWh": 1.54,
+        "hydroelectricity_TWh": 0.31,
         "iso_code": "SEN",
-        "low_carbon_Twh": 1.13,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 2.55,
-        "other_renewable_Twh": 0.1,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 332.41,
-        "renewables_Twh": 1.13,
-        "solar_Twh": 0.47,
-        "total_Twh": 344.86000000000007,
-        "wind_Twh": 0.25,
+        "low_carbon_TWh": 1.12,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 2.41,
+        "other_renewable_TWh": 0.09,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 333.003,
+        "renewables_TWh": 1.12,
+        "solar_TWh": 0.47,
+        "total_TWh": 5.62,
+        "wind_TWh": 0.25,
         "year": 2021
     },
     "SGP": {
-        "biofuel_Twh": 0.44,
-        "carbon_intensity": 488.594,
-        "coal_Twh": 0.0,
+        "biofuel_TWh": 0.38,
+        "carbon_intensity": 487.937,
+        "coal_TWh": 0.0,
         "country_name": "Singapore",
-        "fossil_Twh": 52.37,
-        "gaz_Twh": 50.77,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 52.42,
+        "gas_TWh": 51.05,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "SGP",
-        "low_carbon_Twh": 1.11,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 1.6,
-        "other_renewable_Twh": 0.44,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 9001.756,
-        "renewables_Twh": 1.11,
-        "solar_Twh": 0.67,
-        "total_Twh": 9110.266000000001,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 1.05,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 1.37,
+        "other_renewable_TWh": 0.38,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 9000.073,
+        "renewables_TWh": 1.05,
+        "solar_TWh": 0.67,
+        "total_TWh": 53.47,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "SLB": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 727.273,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Solomon Islands",
-        "fossil_Twh": 0.11,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 0.11,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "SLB",
-        "low_carbon_Twh": 0.0,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.11,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 155.399,
-        "renewables_Twh": 0.0,
-        "solar_Twh": 0.0,
-        "total_Twh": 155.61900000000003,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.0,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.11,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 155.399,
+        "renewables_TWh": 0.0,
+        "solar_TWh": 0.0,
+        "total_TWh": 0.11,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "SLE": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 47.619,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Sierra Leone",
-        "fossil_Twh": 0.02,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.18,
+        "fossil_TWh": 0.02,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.18,
         "iso_code": "SLE",
-        "low_carbon_Twh": 0.19,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.02,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 24.939,
-        "renewables_Twh": 0.19,
-        "solar_Twh": 0.01,
-        "total_Twh": 25.549000000000003,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.19,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.02,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 24.939,
+        "renewables_TWh": 0.19,
+        "solar_TWh": 0.01,
+        "total_TWh": 0.21,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "SLV": {
-        "biofuel_Twh": 0.52,
+        "biofuel_TWh": 0.52,
         "carbon_intensity": 185.976,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "El Salvador",
-        "fossil_Twh": 1.34,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 2.0,
+        "fossil_TWh": 1.34,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 2.0,
         "iso_code": "SLV",
-        "low_carbon_Twh": 5.22,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 1.34,
-        "other_renewable_Twh": 2.1,
-        "other_renewable_exc_biofuel_Twh": 1.58,
-        "per_capita_Twh": 1038.934,
-        "renewables_Twh": 5.22,
-        "solar_Twh": 1.11,
-        "total_Twh": 1057.7939999999999,
-        "wind_Twh": 0.01,
+        "low_carbon_TWh": 5.22,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 1.34,
+        "other_renewable_TWh": 2.1,
+        "other_renewable_exc_biofuel_TWh": 1.58,
+        "per_capita_Wh": 1038.934,
+        "renewables_TWh": 5.22,
+        "solar_TWh": 1.11,
+        "total_TWh": 6.56,
+        "wind_TWh": 0.01,
         "year": 2021
     },
     "SOM": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 634.146,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Somalia",
-        "fossil_Twh": 0.37,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 0.37,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "SOM",
-        "low_carbon_Twh": 0.04,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.37,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 24.025,
-        "renewables_Twh": 0.04,
-        "solar_Twh": 0.03,
-        "total_Twh": 24.884999999999998,
-        "wind_Twh": 0.01,
+        "low_carbon_TWh": 0.04,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.37,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 24.025,
+        "renewables_TWh": 0.04,
+        "solar_TWh": 0.03,
+        "total_TWh": 0.41,
+        "wind_TWh": 0.01,
         "year": 2021
     },
     "SPM": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 800.0,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Saint Pierre and Miquelon",
-        "fossil_Twh": 0.05,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 0.05,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "SPM",
-        "low_carbon_Twh": 0.0,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.05,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 8467.4,
-        "renewables_Twh": 0.0,
-        "solar_Twh": 0.0,
-        "total_Twh": 8467.499999999998,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.0,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.05,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 8467.4,
+        "renewables_TWh": 0.0,
+        "solar_TWh": 0.0,
+        "total_TWh": 0.05,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "SRB": {
-        "biofuel_Twh": 0.28,
-        "carbon_intensity": 545.552,
-        "coal_Twh": 23.94,
+        "biofuel_TWh": 0.25,
+        "carbon_intensity": 543.565,
+        "coal_TWh": 23.77,
         "country_name": "Serbia",
-        "fossil_Twh": 25.05,
-        "gaz_Twh": 0.67,
-        "hydroelectricity_Twh": 11.08,
+        "fossil_TWh": 24.91,
+        "gas_TWh": 1.07,
+        "hydroelectricity_TWh": 11.28,
         "iso_code": "SRB",
-        "low_carbon_Twh": 12.27,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.44,
-        "other_renewable_Twh": 0.28,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 5114.591,
-        "renewables_Twh": 12.27,
-        "solar_Twh": 0.01,
-        "total_Twh": 5201.781,
-        "wind_Twh": 0.9,
+        "low_carbon_TWh": 12.62,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.07,
+        "other_renewable_TWh": 0.25,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 5143.371,
+        "renewables_TWh": 12.62,
+        "solar_TWh": 0.01,
+        "total_TWh": 37.53,
+        "wind_TWh": 1.08,
         "year": 2021
     },
     "SSD": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 684.211,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "South Sudan",
-        "fossil_Twh": 0.56,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 0.56,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "SSD",
-        "low_carbon_Twh": 0.01,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.56,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 53.032,
-        "renewables_Twh": 0.01,
-        "solar_Twh": 0.01,
-        "total_Twh": 54.181999999999995,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.01,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.56,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 53.032,
+        "renewables_TWh": 0.01,
+        "solar_TWh": 0.01,
+        "total_TWh": 0.5700000000000001,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "STP": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 600.0,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Sao Tome and Principe",
-        "fossil_Twh": 0.09,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.01,
+        "fossil_TWh": 0.09,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.01,
         "iso_code": "STP",
-        "low_carbon_Twh": 0.01,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.09,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 448.193,
-        "renewables_Twh": 0.01,
-        "solar_Twh": 0.0,
-        "total_Twh": 448.40299999999996,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.01,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.09,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 448.193,
+        "renewables_TWh": 0.01,
+        "solar_TWh": 0.0,
+        "total_TWh": 0.09999999999999999,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "SUR": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 356.436,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Suriname",
-        "fossil_Twh": 1.0,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 1.0,
+        "fossil_TWh": 1.0,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 1.0,
         "iso_code": "SUR",
-        "low_carbon_Twh": 1.02,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 1.0,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 3295.328,
-        "renewables_Twh": 1.02,
-        "solar_Twh": 0.02,
-        "total_Twh": 3300.388,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 1.02,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 1.0,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 3295.328,
+        "renewables_TWh": 1.02,
+        "solar_TWh": 0.02,
+        "total_TWh": 2.02,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "SVK": {
-        "biofuel_Twh": 1.76,
-        "carbon_intensity": 101.798,
-        "coal_Twh": 2.08,
+        "biofuel_TWh": 1.84,
+        "carbon_intensity": 169.589,
+        "coal_TWh": 1.7,
         "country_name": "Slovakia",
-        "fossil_Twh": 7.24,
-        "gaz_Twh": 4.32,
-        "hydroelectricity_Twh": 4.25,
+        "fossil_TWh": 7.16,
+        "gas_TWh": 4.37,
+        "hydroelectricity_TWh": 4.26,
         "iso_code": "SVK",
-        "low_carbon_Twh": 22.23,
-        "nuclear_Twh": 15.64,
-        "oil_Twh": 0.84,
-        "other_renewable_Twh": 1.76,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 5409.701,
-        "renewables_Twh": 6.59,
-        "solar_Twh": 0.57,
-        "total_Twh": 5461.351,
-        "wind_Twh": 0.01,
+        "low_carbon_TWh": 22.5,
+        "nuclear_TWh": 15.73,
+        "oil_TWh": 1.09,
+        "other_renewable_TWh": 1.84,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 5444.579,
+        "renewables_TWh": 6.77,
+        "solar_TWh": 0.67,
+        "total_TWh": 29.66,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "SVN": {
-        "biofuel_Twh": 0.2,
-        "carbon_intensity": 257.069,
-        "coal_Twh": 3.92,
+        "biofuel_TWh": 0.27,
+        "carbon_intensity": 238.614,
+        "coal_TWh": 3.85,
         "country_name": "Slovenia",
-        "fossil_Twh": 4.59,
-        "gaz_Twh": 0.65,
-        "hydroelectricity_Twh": 4.69,
+        "fossil_TWh": 4.44,
+        "gas_TWh": 0.52,
+        "hydroelectricity_TWh": 4.71,
         "iso_code": "SVN",
-        "low_carbon_Twh": 10.97,
-        "nuclear_Twh": 5.73,
-        "oil_Twh": 0.02,
-        "other_renewable_Twh": 0.2,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 7341.673,
-        "renewables_Twh": 5.24,
-        "solar_Twh": 0.34,
-        "total_Twh": 7372.503,
-        "wind_Twh": 0.01,
+        "low_carbon_TWh": 11.15,
+        "nuclear_TWh": 5.71,
+        "oil_TWh": 0.07,
+        "other_renewable_TWh": 0.27,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 7355.828,
+        "renewables_TWh": 5.44,
+        "solar_TWh": 0.45,
+        "total_TWh": 15.59,
+        "wind_TWh": 0.01,
         "year": 2021
     },
     "SWE": {
-        "biofuel_Twh": 12.99,
-        "carbon_intensity": 11.553,
-        "coal_Twh": 0.21,
+        "biofuel_TWh": 13.08,
+        "carbon_intensity": 45.817,
+        "coal_TWh": 0.01,
         "country_name": "Sweden",
-        "fossil_Twh": 3.35,
-        "gaz_Twh": 0.29,
-        "hydroelectricity_Twh": 75.66,
+        "fossil_TWh": 3.06,
+        "gas_TWh": 0.29,
+        "hydroelectricity_TWh": 73.89,
         "iso_code": "SWE",
-        "low_carbon_Twh": 169.76,
-        "nuclear_Twh": 53.42,
-        "oil_Twh": 2.85,
-        "other_renewable_Twh": 12.99,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 16538.496,
-        "renewables_Twh": 116.34,
-        "solar_Twh": 0.68,
-        "total_Twh": 16960.626,
-        "wind_Twh": 27.01,
+        "low_carbon_TWh": 168.71,
+        "nuclear_TWh": 52.97,
+        "oil_TWh": 2.76,
+        "other_renewable_TWh": 13.08,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 16410.475,
+        "renewables_TWh": 115.74,
+        "solar_TWh": 1.53,
+        "total_TWh": 171.76999999999998,
+        "wind_TWh": 27.24,
         "year": 2021
     },
     "SWZ": {
-        "biofuel_Twh": 0.45,
+        "biofuel_TWh": 0.45,
         "carbon_intensity": 189.189,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Eswatini",
-        "fossil_Twh": 0.04,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.25,
+        "fossil_TWh": 0.04,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.25,
         "iso_code": "SWZ",
-        "low_carbon_Twh": 0.7,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.04,
-        "other_renewable_Twh": 0.45,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 620.663,
-        "renewables_Twh": 0.7,
-        "solar_Twh": 0.0,
-        "total_Twh": 623.2930000000001,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.7,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.04,
+        "other_renewable_TWh": 0.45,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 620.663,
+        "renewables_TWh": 0.7,
+        "solar_TWh": 0.0,
+        "total_TWh": 0.74,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "SYC": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 615.385,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Seychelles",
-        "fossil_Twh": 0.57,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 0.57,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "SYC",
-        "low_carbon_Twh": 0.08,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.57,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 6104.089,
-        "renewables_Twh": 0.08,
-        "solar_Twh": 0.07,
-        "total_Twh": 6105.468999999999,
-        "wind_Twh": 0.01,
+        "low_carbon_TWh": 0.08,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.57,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 6104.089,
+        "renewables_TWh": 0.08,
+        "solar_TWh": 0.07,
+        "total_TWh": 0.6499999999999999,
+        "wind_TWh": 0.01,
         "year": 2021
     },
     "SYR": {
-        "biofuel_Twh": 0.01,
-        "carbon_intensity": 540.573,
-        "coal_Twh": 0.09,
+        "biofuel_TWh": 0.01,
+        "carbon_intensity": 541.169,
+        "coal_TWh": 0.09,
         "country_name": "Syria",
-        "fossil_Twh": 16.0,
-        "gaz_Twh": 10.31,
-        "hydroelectricity_Twh": 0.75,
+        "fossil_TWh": 16.0,
+        "gas_TWh": 10.3,
+        "hydroelectricity_TWh": 0.75,
         "iso_code": "SYR",
-        "low_carbon_Twh": 0.76,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 5.6,
-        "other_renewable_Twh": 0.01,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 785.955,
-        "renewables_Twh": 0.76,
-        "solar_Twh": 0.0,
-        "total_Twh": 820.245,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.76,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 5.61,
+        "other_renewable_TWh": 0.01,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 785.955,
+        "renewables_TWh": 0.76,
+        "solar_TWh": 0.0,
+        "total_TWh": 16.76,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "TCA": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 703.704,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Turks and Caicos Islands",
-        "fossil_Twh": 0.27,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 0.27,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "TCA",
-        "low_carbon_Twh": 0.0,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.27,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 5981.259,
-        "renewables_Twh": 0.0,
-        "solar_Twh": 0.0,
-        "total_Twh": 5981.799000000001,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.0,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.27,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 5981.259,
+        "renewables_TWh": 0.0,
+        "solar_TWh": 0.0,
+        "total_TWh": 0.27,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "TCD": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 677.419,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Chad",
-        "fossil_Twh": 0.3,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 0.3,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "TCD",
-        "low_carbon_Twh": 0.01,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.3,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 18.045,
-        "renewables_Twh": 0.01,
-        "solar_Twh": 0.0,
-        "total_Twh": 18.675,
-        "wind_Twh": 0.01,
+        "low_carbon_TWh": 0.01,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.3,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 18.045,
+        "renewables_TWh": 0.01,
+        "solar_TWh": 0.0,
+        "total_TWh": 0.31,
+        "wind_TWh": 0.01,
         "year": 2021
     },
     "TGO": {
-        "biofuel_Twh": 0.0,
-        "carbon_intensity": 507.936,
-        "coal_Twh": 0.0,
+        "biofuel_TWh": 0.0,
+        "carbon_intensity": 460.317,
+        "coal_TWh": 0.0,
         "country_name": "Togo",
-        "fossil_Twh": 0.46,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.15,
+        "fossil_TWh": 0.46,
+        "gas_TWh": 0.14,
+        "hydroelectricity_TWh": 0.15,
         "iso_code": "TGO",
-        "low_carbon_Twh": 0.17,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.46,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 72.876,
-        "renewables_Twh": 0.17,
-        "solar_Twh": 0.02,
-        "total_Twh": 74.30600000000001,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.17,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.32,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 72.876,
+        "renewables_TWh": 0.17,
+        "solar_TWh": 0.02,
+        "total_TWh": 0.63,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "THA": {
-        "biofuel_Twh": 13.84,
+        "biofuel_TWh": 13.84,
         "carbon_intensity": 506.635,
-        "coal_Twh": 38.44,
+        "coal_TWh": 38.44,
         "country_name": "Thailand",
-        "fossil_Twh": 159.77,
-        "gaz_Twh": 120.57,
-        "hydroelectricity_Twh": 4.68,
+        "fossil_TWh": 159.77,
+        "gas_TWh": 120.57,
+        "hydroelectricity_TWh": 4.68,
         "iso_code": "THA",
-        "low_carbon_Twh": 27.11,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.76,
-        "other_renewable_Twh": 13.84,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 2610.016,
-        "renewables_Twh": 27.11,
-        "solar_Twh": 4.29,
-        "total_Twh": 3024.7260000000006,
-        "wind_Twh": 4.3,
+        "low_carbon_TWh": 27.11,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.76,
+        "other_renewable_TWh": 13.84,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 2610.016,
+        "renewables_TWh": 27.11,
+        "solar_TWh": 4.29,
+        "total_TWh": 186.88,
+        "wind_TWh": 4.3,
         "year": 2021
     },
     "TJK": {
-        "biofuel_Twh": 0.0,
-        "carbon_intensity": 84.136,
-        "coal_Twh": 0.58,
+        "biofuel_TWh": 0.0,
+        "carbon_intensity": 83.629,
+        "coal_TWh": 1.14,
         "country_name": "Tajikistan",
-        "fossil_Twh": 1.73,
-        "gaz_Twh": 0.27,
-        "hydroelectricity_Twh": 18.0,
+        "fossil_TWh": 1.73,
+        "gas_TWh": 0.59,
+        "hydroelectricity_TWh": 18.0,
         "iso_code": "TJK",
-        "low_carbon_Twh": 18.0,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.88,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 2023.573,
-        "renewables_Twh": 18.0,
-        "solar_Twh": 0.0,
-        "total_Twh": 2081.0330000000004,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 18.0,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.0,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 2023.573,
+        "renewables_TWh": 18.0,
+        "solar_TWh": 0.0,
+        "total_TWh": 19.73,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "TKM": {
-        "biofuel_Twh": 0.0,
-        "carbon_intensity": 544.392,
-        "coal_Twh": 0.0,
+        "biofuel_TWh": 0.0,
+        "carbon_intensity": 490.187,
+        "coal_TWh": 0.0,
         "country_name": "Turkmenistan",
-        "fossil_Twh": 21.4,
-        "gaz_Twh": 15.86,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 21.4,
+        "gas_TWh": 21.4,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "TKM",
-        "low_carbon_Twh": 0.0,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 5.54,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 3374.41,
-        "renewables_Twh": 0.0,
-        "solar_Twh": 0.0,
-        "total_Twh": 3417.21,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.0,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.0,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 3374.41,
+        "renewables_TWh": 0.0,
+        "solar_TWh": 0.0,
+        "total_TWh": 21.4,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "TLS": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 698.113,
-        "coal_Twh": 0.0,
-        "country_name": "Timor",
-        "fossil_Twh": 0.53,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.0,
+        "coal_TWh": 0.0,
+        "country_name": "East Timor",
+        "fossil_TWh": 0.53,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "TLS",
-        "low_carbon_Twh": 0.0,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.53,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 401.228,
-        "renewables_Twh": 0.0,
-        "solar_Twh": 0.0,
-        "total_Twh": 402.28799999999995,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.0,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.53,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 401.228,
+        "renewables_TWh": 0.0,
+        "solar_TWh": 0.0,
+        "total_TWh": 0.53,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "TON": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 625.0,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Tonga",
-        "fossil_Twh": 0.07,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 0.07,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "TON",
-        "low_carbon_Twh": 0.01,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.07,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 754.475,
-        "renewables_Twh": 0.01,
-        "solar_Twh": 0.01,
-        "total_Twh": 754.6450000000001,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.01,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.07,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 754.475,
+        "renewables_TWh": 0.01,
+        "solar_TWh": 0.01,
+        "total_TWh": 0.08,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "TTO": {
-        "biofuel_Twh": 0.0,
-        "carbon_intensity": 520.046,
-        "coal_Twh": 0.0,
+        "biofuel_TWh": 0.0,
+        "carbon_intensity": 491.409,
+        "coal_TWh": 0.0,
         "country_name": "Trinidad and Tobago",
-        "fossil_Twh": 8.72,
-        "gaz_Twh": 7.43,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 8.72,
+        "gas_TWh": 8.63,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "TTO",
-        "low_carbon_Twh": 0.01,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 1.29,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 5722.072,
-        "renewables_Twh": 0.01,
-        "solar_Twh": 0.01,
-        "total_Twh": 5739.5419999999995,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.01,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.09,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 5722.072,
+        "renewables_TWh": 0.01,
+        "solar_TWh": 0.01,
+        "total_TWh": 8.73,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "TUN": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 468.227,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Tunisia",
-        "fossil_Twh": 19.93,
-        "gaz_Twh": 19.93,
-        "hydroelectricity_Twh": 0.06,
+        "fossil_TWh": 19.93,
+        "gas_TWh": 19.93,
+        "hydroelectricity_TWh": 0.06,
         "iso_code": "TUN",
-        "low_carbon_Twh": 1.0,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.0,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 1706.767,
-        "renewables_Twh": 1.0,
-        "solar_Twh": 0.41,
-        "total_Twh": 1749.627,
-        "wind_Twh": 0.53,
+        "low_carbon_TWh": 1.0,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.0,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 1706.767,
+        "renewables_TWh": 1.0,
+        "solar_TWh": 0.41,
+        "total_TWh": 20.93,
+        "wind_TWh": 0.53,
         "year": 2021
     },
     "TUR": {
-        "biofuel_Twh": 6.26,
-        "carbon_intensity": 433.326,
-        "coal_Twh": 102.44,
+        "biofuel_TWh": 6.45,
+        "carbon_intensity": 430.401,
+        "coal_TWh": 101.61,
         "country_name": "Turkey",
-        "fossil_Twh": 213.68,
-        "gaz_Twh": 109.76,
-        "hydroelectricity_Twh": 55.71,
+        "fossil_TWh": 214.86,
+        "gas_TWh": 111.18,
+        "hydroelectricity_TWh": 55.93,
         "iso_code": "TUR",
-        "low_carbon_Twh": 116.81,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 1.48,
-        "other_renewable_Twh": 17.09,
-        "other_renewable_exc_biofuel_Twh": 10.83,
-        "per_capita_Twh": 3898.418,
-        "renewables_Twh": 116.81,
-        "solar_Twh": 12.91,
-        "total_Twh": 4682.468000000001,
-        "wind_Twh": 31.1,
+        "low_carbon_TWh": 118.55,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 2.07,
+        "other_renewable_TWh": 17.24,
+        "other_renewable_exc_biofuel_TWh": 10.79,
+        "per_capita_Wh": 3932.862,
+        "renewables_TWh": 118.55,
+        "solar_TWh": 13.94,
+        "total_TWh": 333.41,
+        "wind_TWh": 31.44,
         "year": 2021
     },
     "TWN": {
-        "biofuel_Twh": 1.99,
+        "biofuel_TWh": 1.99,
         "carbon_intensity": 573.275,
-        "coal_Twh": 129.84,
+        "coal_TWh": 129.84,
         "country_name": "Taiwan",
-        "fossil_Twh": 244.31,
-        "gaz_Twh": 109.1,
-        "hydroelectricity_Twh": 3.47,
+        "fossil_TWh": 244.31,
+        "gas_TWh": 109.1,
+        "hydroelectricity_TWh": 3.47,
         "iso_code": "TWN",
-        "low_carbon_Twh": 43.44,
-        "nuclear_Twh": 27.79,
-        "oil_Twh": 5.37,
-        "other_renewable_Twh": 2.0,
-        "other_renewable_exc_biofuel_Twh": 0.01,
-        "per_capita_Twh": 12059.981,
-        "renewables_Twh": 15.65,
-        "solar_Twh": 7.97,
-        "total_Twh": 12625.330999999998,
-        "wind_Twh": 2.21,
+        "low_carbon_TWh": 43.44,
+        "nuclear_TWh": 27.79,
+        "oil_TWh": 5.37,
+        "other_renewable_TWh": 2.0,
+        "other_renewable_exc_biofuel_TWh": 0.01,
+        "per_capita_Wh": 12059.981,
+        "renewables_TWh": 15.65,
+        "solar_TWh": 7.97,
+        "total_TWh": 287.75,
+        "wind_TWh": 2.21,
         "year": 2021
     },
     "TZA": {
-        "biofuel_Twh": 0.59,
-        "carbon_intensity": 361.077,
-        "coal_Twh": 0.0,
+        "biofuel_TWh": 0.55,
+        "carbon_intensity": 366.748,
+        "coal_TWh": 0.0,
         "country_name": "Tanzania",
-        "fossil_Twh": 4.52,
-        "gaz_Twh": 2.0,
-        "hydroelectricity_Twh": 3.0,
+        "fossil_TWh": 4.57,
+        "gas_TWh": 1.88,
+        "hydroelectricity_TWh": 3.0,
         "iso_code": "TZA",
-        "low_carbon_Twh": 3.65,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 2.52,
-        "other_renewable_Twh": 0.59,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 128.483,
-        "renewables_Twh": 3.65,
-        "solar_Twh": 0.06,
-        "total_Twh": 149.06300000000002,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 3.61,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 2.69,
+        "other_renewable_TWh": 0.55,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 128.64,
+        "renewables_TWh": 3.61,
+        "solar_TWh": 0.06,
+        "total_TWh": 8.18,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "UGA": {
-        "biofuel_Twh": 0.12,
+        "biofuel_TWh": 0.12,
         "carbon_intensity": 52.273,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Uganda",
-        "fossil_Twh": 0.13,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 4.0,
+        "fossil_TWh": 0.13,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 4.0,
         "iso_code": "UGA",
-        "low_carbon_Twh": 4.27,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.13,
-        "other_renewable_Twh": 0.12,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 95.957,
-        "renewables_Twh": 4.27,
-        "solar_Twh": 0.15,
-        "total_Twh": 109.147,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 4.27,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.13,
+        "other_renewable_TWh": 0.12,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 95.957,
+        "renewables_TWh": 4.27,
+        "solar_TWh": 0.15,
+        "total_TWh": 4.3999999999999995,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "UKR": {
-        "biofuel_Twh": 0.76,
-        "carbon_intensity": 240.28,
-        "coal_Twh": 36.14,
+        "biofuel_TWh": 0.76,
+        "carbon_intensity": 240.175,
+        "coal_TWh": 36.13,
         "country_name": "Ukraine",
-        "fossil_Twh": 47.58,
-        "gaz_Twh": 9.76,
-        "hydroelectricity_Twh": 10.54,
+        "fossil_TWh": 47.57,
+        "gas_TWh": 9.76,
+        "hydroelectricity_TWh": 10.67,
         "iso_code": "UKR",
-        "low_carbon_Twh": 108.03,
-        "nuclear_Twh": 86.3,
-        "oil_Twh": 1.68,
-        "other_renewable_Twh": 0.76,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 3574.659,
-        "renewables_Twh": 21.73,
-        "solar_Twh": 5.97,
-        "total_Twh": 3822.0690000000004,
-        "wind_Twh": 4.46,
+        "low_carbon_TWh": 108.15,
+        "nuclear_TWh": 86.29,
+        "oil_TWh": 1.68,
+        "other_renewable_TWh": 0.76,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 3577.186,
+        "renewables_TWh": 21.86,
+        "solar_TWh": 5.97,
+        "total_TWh": 155.72000000000003,
+        "wind_TWh": 4.46,
         "year": 2021
     },
     "URY": {
-        "biofuel_Twh": 1.61,
+        "biofuel_TWh": 1.61,
         "carbon_intensity": 147.282,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Uruguay",
-        "fossil_Twh": 3.47,
-        "gaz_Twh": 3.15,
-        "hydroelectricity_Twh": 5.27,
+        "fossil_TWh": 3.47,
+        "gas_TWh": 3.2,
+        "hydroelectricity_TWh": 5.27,
         "iso_code": "URY",
-        "low_carbon_Twh": 12.35,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.32,
-        "other_renewable_Twh": 1.61,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 4617.272,
-        "renewables_Twh": 12.35,
-        "solar_Twh": 0.48,
-        "total_Twh": 4662.871999999999,
-        "wind_Twh": 4.99,
+        "low_carbon_TWh": 12.35,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.27,
+        "other_renewable_TWh": 1.61,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 4617.272,
+        "renewables_TWh": 12.35,
+        "solar_TWh": 0.48,
+        "total_TWh": 15.82,
+        "wind_TWh": 4.99,
         "year": 2021
     },
     "USA": {
-        "biofuel_Twh": 54.25,
-        "carbon_intensity": 379.571,
-        "coal_Twh": 897.89,
+        "biofuel_TWh": 54.25,
+        "carbon_intensity": 379.26,
+        "coal_TWh": 898.0,
         "country_name": "United States",
-        "fossil_Twh": 2512.45,
-        "gaz_Twh": 1579.36,
-        "hydroelectricity_Twh": 246.47,
+        "fossil_TWh": 2512.39,
+        "gas_TWh": 1579.19,
+        "hydroelectricity_TWh": 246.47,
         "iso_code": "USA",
-        "low_carbon_Twh": 1637.5,
-        "nuclear_Twh": 778.19,
-        "oil_Twh": 35.2,
-        "other_renewable_Twh": 70.22,
-        "other_renewable_exc_biofuel_Twh": 15.97,
-        "per_capita_Twh": 12314.479,
-        "renewables_Twh": 859.31,
-        "solar_Twh": 164.42,
-        "total_Twh": 20749.749,
-        "wind_Twh": 378.2,
+        "low_carbon_TWh": 1641.23,
+        "nuclear_TWh": 779.65,
+        "oil_TWh": 35.2,
+        "other_renewable_TWh": 72.49,
+        "other_renewable_exc_biofuel_TWh": 18.24,
+        "per_capita_Wh": 12325.368,
+        "renewables_TWh": 861.58,
+        "solar_TWh": 164.42,
+        "total_TWh": 4153.62,
+        "wind_TWh": 378.2,
         "year": 2021
     },
     "UZB": {
-        "biofuel_Twh": 0.0,
-        "carbon_intensity": 506.164,
-        "coal_Twh": 9.28,
+        "biofuel_TWh": 0.0,
+        "carbon_intensity": 505.405,
+        "coal_TWh": 9.12,
         "country_name": "Uzbekistan",
-        "fossil_Twh": 54.2,
-        "gaz_Twh": 43.8,
-        "hydroelectricity_Twh": 5.0,
+        "fossil_TWh": 54.19,
+        "gas_TWh": 43.97,
+        "hydroelectricity_TWh": 5.0,
         "iso_code": "UZB",
-        "low_carbon_Twh": 5.01,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 1.12,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 1737.309,
-        "renewables_Twh": 5.01,
-        "solar_Twh": 0.01,
-        "total_Twh": 1860.739,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 5.01,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 1.1,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 1737.015,
+        "renewables_TWh": 5.01,
+        "solar_TWh": 0.01,
+        "total_TWh": 59.199999999999996,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "VCT": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 500.0,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Saint Vincent and the Grenadines",
-        "fossil_Twh": 0.12,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.04,
+        "fossil_TWh": 0.12,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.04,
         "iso_code": "VCT",
-        "low_carbon_Twh": 0.04,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.12,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 1533.448,
-        "renewables_Twh": 0.04,
-        "solar_Twh": 0.0,
-        "total_Twh": 1533.808,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.04,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.12,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 1533.448,
+        "renewables_TWh": 0.04,
+        "solar_TWh": 0.0,
+        "total_TWh": 0.16,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "VEN": {
-        "biofuel_Twh": 0.0,
-        "carbon_intensity": 189.446,
-        "coal_Twh": 0.0,
+        "biofuel_TWh": 0.0,
+        "carbon_intensity": 212.476,
+        "coal_TWh": 0.0,
         "country_name": "Venezuela",
-        "fossil_Twh": 33.65,
-        "gaz_Twh": 33.65,
-        "hydroelectricity_Twh": 61.0,
+        "fossil_TWh": 33.64,
+        "gas_TWh": 23.22,
+        "hydroelectricity_TWh": 61.0,
         "iso_code": "VEN",
-        "low_carbon_Twh": 61.1,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.0,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 3359.946,
-        "renewables_Twh": 61.1,
-        "solar_Twh": 0.01,
-        "total_Twh": 3610.546,
-        "wind_Twh": 0.09,
+        "low_carbon_TWh": 61.1,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 10.42,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 3359.591,
+        "renewables_TWh": 61.1,
+        "solar_TWh": 0.01,
+        "total_TWh": 94.74000000000001,
+        "wind_TWh": 0.09,
         "year": 2021
     },
     "VGB": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 714.286,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "British Virgin Islands",
-        "fossil_Twh": 0.14,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 0.14,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "VGB",
-        "low_carbon_Twh": 0.0,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.14,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 4495.104,
-        "renewables_Twh": 0.0,
-        "solar_Twh": 0.0,
-        "total_Twh": 4495.384000000001,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.0,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.14,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 4495.104,
+        "renewables_TWh": 0.0,
+        "solar_TWh": 0.0,
+        "total_TWh": 0.14,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "VIR": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 685.714,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "United States Virgin Islands",
-        "fossil_Twh": 0.68,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 0.68,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "VIR",
-        "low_carbon_Twh": 0.02,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.68,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 6993.007,
-        "renewables_Twh": 0.02,
-        "solar_Twh": 0.02,
-        "total_Twh": 6994.427,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.02,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.68,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 6993.007,
+        "renewables_TWh": 0.02,
+        "solar_TWh": 0.02,
+        "total_TWh": 0.7000000000000001,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "VNM": {
-        "biofuel_Twh": 0.18,
-        "carbon_intensity": 497.58,
-        "coal_Twh": 127.32,
+        "biofuel_TWh": 0.16,
+        "carbon_intensity": 448.217,
+        "coal_TWh": 114.12,
         "country_name": "Vietnam",
-        "fossil_Twh": 156.82,
-        "gaz_Twh": 29.26,
-        "hydroelectricity_Twh": 74.0,
+        "fossil_TWh": 140.55,
+        "gas_TWh": 26.22,
+        "hydroelectricity_TWh": 75.9,
         "iso_code": "VNM",
-        "low_carbon_Twh": 86.96,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.24,
-        "other_renewable_Twh": 0.18,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 2501.128,
-        "renewables_Twh": 86.96,
-        "solar_Twh": 11.68,
-        "total_Twh": 3075.828,
-        "wind_Twh": 1.1,
+        "low_carbon_TWh": 104.22,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.21,
+        "other_renewable_TWh": 0.158,
+        "other_renewable_exc_biofuel_TWh": NaN,
+        "per_capita_Wh": 2511.285,
+        "renewables_TWh": 104.22,
+        "solar_TWh": 25.77,
+        "total_TWh": 244.77,
+        "wind_TWh": 2.39,
         "year": 2021
     },
     "VUT": {
-        "biofuel_Twh": 0.01,
+        "biofuel_TWh": 0.01,
         "carbon_intensity": 571.429,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Vanuatu",
-        "fossil_Twh": 0.05,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 0.05,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "VUT",
-        "low_carbon_Twh": 0.02,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.05,
-        "other_renewable_Twh": 0.01,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 219.335,
-        "renewables_Twh": 0.02,
-        "solar_Twh": 0.01,
-        "total_Twh": 219.505,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.02,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.05,
+        "other_renewable_TWh": 0.01,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 219.335,
+        "renewables_TWh": 0.02,
+        "solar_TWh": 0.01,
+        "total_TWh": 0.07,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "WSM": {
-        "biofuel_Twh": 0.0,
+        "biofuel_TWh": 0.0,
         "carbon_intensity": 470.588,
-        "coal_Twh": 0.0,
+        "coal_TWh": 0.0,
         "country_name": "Samoa",
-        "fossil_Twh": 0.11,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 0.04,
+        "fossil_TWh": 0.11,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 0.04,
         "iso_code": "WSM",
-        "low_carbon_Twh": 0.06,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.11,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 777.033,
-        "renewables_Twh": 0.06,
-        "solar_Twh": 0.02,
-        "total_Twh": 777.4329999999999,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.06,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.11,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 777.033,
+        "renewables_TWh": 0.06,
+        "solar_TWh": 0.02,
+        "total_TWh": 0.16999999999999998,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "YEM": {
-        "biofuel_Twh": 0.0,
-        "carbon_intensity": 528.409,
-        "coal_Twh": 0.0,
+        "biofuel_TWh": 0.0,
+        "carbon_intensity": 543.909,
+        "coal_TWh": 0.0,
         "country_name": "Yemen",
-        "fossil_Twh": 2.92,
-        "gaz_Twh": 1.01,
-        "hydroelectricity_Twh": 0.0,
+        "fossil_TWh": 2.93,
+        "gas_TWh": 0.74,
+        "hydroelectricity_TWh": 0.0,
         "iso_code": "YEM",
-        "low_carbon_Twh": 0.6,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 1.91,
-        "other_renewable_Twh": 0.0,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 106.726,
-        "renewables_Twh": 0.6,
-        "solar_Twh": 0.6,
-        "total_Twh": 114.36599999999999,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 0.6,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 2.19,
+        "other_renewable_TWh": 0.0,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 107.029,
+        "renewables_TWh": 0.6,
+        "solar_TWh": 0.6,
+        "total_TWh": 3.5300000000000002,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "ZAF": {
-        "biofuel_Twh": 0.4,
+        "biofuel_TWh": 0.4,
         "carbon_intensity": 715.681,
-        "coal_Twh": 192.73,
+        "coal_TWh": 192.73,
         "country_name": "South Africa",
-        "fossil_Twh": 194.17,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 1.47,
+        "fossil_TWh": 194.17,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 1.47,
         "iso_code": "ZAF",
-        "low_carbon_Twh": 29.03,
-        "nuclear_Twh": 12.15,
-        "oil_Twh": 1.44,
-        "other_renewable_Twh": 0.4,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 3758.066,
-        "renewables_Twh": 16.88,
-        "solar_Twh": 6.65,
-        "total_Twh": 4209.595999999999,
-        "wind_Twh": 8.36,
+        "low_carbon_TWh": 29.03,
+        "nuclear_TWh": 12.15,
+        "oil_TWh": 1.44,
+        "other_renewable_TWh": 0.4,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 3758.066,
+        "renewables_TWh": 16.88,
+        "solar_TWh": 6.65,
+        "total_TWh": 223.2,
+        "wind_TWh": 8.36,
         "year": 2021
     },
     "ZMB": {
-        "biofuel_Twh": 0.11,
+        "biofuel_TWh": 0.11,
         "carbon_intensity": 84.698,
-        "coal_Twh": 0.88,
+        "coal_TWh": 0.87,
         "country_name": "Zambia",
-        "fossil_Twh": 1.38,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 16.07,
+        "fossil_TWh": 1.38,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 16.07,
         "iso_code": "ZMB",
-        "low_carbon_Twh": 16.33,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.5,
-        "other_renewable_Twh": 0.11,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 909.458,
-        "renewables_Twh": 16.33,
-        "solar_Twh": 0.15,
-        "total_Twh": 961.3180000000001,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 16.33,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.51,
+        "other_renewable_TWh": 0.11,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 909.458,
+        "renewables_TWh": 16.33,
+        "solar_TWh": 0.15,
+        "total_TWh": 17.709999999999997,
+        "wind_TWh": 0.0,
         "year": 2021
     },
     "ZWE": {
-        "biofuel_Twh": 0.38,
-        "carbon_intensity": 393.035,
-        "coal_Twh": 3.58,
+        "biofuel_TWh": 0.38,
+        "carbon_intensity": 392.279,
+        "coal_TWh": 3.57,
         "country_name": "Zimbabwe",
-        "fossil_Twh": 3.62,
-        "gaz_Twh": 0.0,
-        "hydroelectricity_Twh": 4.0,
+        "fossil_TWh": 3.61,
+        "gas_TWh": 0.0,
+        "hydroelectricity_TWh": 4.0,
         "iso_code": "ZWE",
-        "low_carbon_Twh": 4.42,
-        "nuclear_Twh": 0.0,
-        "oil_Twh": 0.04,
-        "other_renewable_Twh": 0.38,
-        "other_renewable_exc_biofuel_Twh": 0.0,
-        "per_capita_Twh": 502.703,
-        "renewables_Twh": 4.42,
-        "solar_Twh": 0.04,
-        "total_Twh": 523.583,
-        "wind_Twh": 0.0,
+        "low_carbon_TWh": 4.42,
+        "nuclear_TWh": 0.0,
+        "oil_TWh": 0.04,
+        "other_renewable_TWh": 0.38,
+        "other_renewable_exc_biofuel_TWh": 0.0,
+        "per_capita_Wh": 502.078,
+        "renewables_TWh": 4.42,
+        "solar_TWh": 0.04,
+        "total_TWh": 8.03,
+        "wind_TWh": 0.0,
         "year": 2021
     }
 }
\ No newline at end of file
diff --git a/codecarbon/data/private_infra/our_world_in_data-2021_data.ipynb b/codecarbon/data/private_infra/our_world_in_data-2021_data.ipynb
index 6f9935989..4929e72c9 100644
--- a/codecarbon/data/private_infra/our_world_in_data-2021_data.ipynb
+++ b/codecarbon/data/private_infra/our_world_in_data-2021_data.ipynb
@@ -1,6 +1,7 @@
 {
  "cells": [
   {
+   "attachments": {},
    "cell_type": "markdown",
    "id": "c7370033-e883-4810-a885-9a61acae671d",
    "metadata": {},
@@ -76,122 +77,122 @@
        "  <tbody>\n",
        "    <tr>\n",
        "      <th>0</th>\n",
-       "      <td>Afghanistan</td>\n",
-       "      <td>1900</td>\n",
-       "      <td>AFG</td>\n",
-       "      <td>4832414.0</td>\n",
+       "      <td>ASEAN (Ember)</td>\n",
+       "      <td>2000</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
-       "      <td>...</td>\n",
-       "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
+       "      <td>...</td>\n",
+       "      <td>0.000</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
+       "      <td>0.0</td>\n",
        "      <td>NaN</td>\n",
+       "      <td>0.0</td>\n",
        "      <td>NaN</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>1</th>\n",
-       "      <td>Afghanistan</td>\n",
-       "      <td>1901</td>\n",
-       "      <td>AFG</td>\n",
-       "      <td>4879685.0</td>\n",
+       "      <td>ASEAN (Ember)</td>\n",
+       "      <td>2001</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
-       "      <td>...</td>\n",
-       "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
+       "      <td>...</td>\n",
+       "      <td>0.000</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
+       "      <td>0.0</td>\n",
        "      <td>NaN</td>\n",
+       "      <td>0.0</td>\n",
        "      <td>NaN</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>2</th>\n",
-       "      <td>Afghanistan</td>\n",
-       "      <td>1902</td>\n",
-       "      <td>AFG</td>\n",
-       "      <td>4935122.0</td>\n",
+       "      <td>ASEAN (Ember)</td>\n",
+       "      <td>2002</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
-       "      <td>...</td>\n",
-       "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
+       "      <td>...</td>\n",
+       "      <td>0.000</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
+       "      <td>0.0</td>\n",
        "      <td>NaN</td>\n",
+       "      <td>0.0</td>\n",
        "      <td>NaN</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>3</th>\n",
-       "      <td>Afghanistan</td>\n",
-       "      <td>1903</td>\n",
-       "      <td>AFG</td>\n",
-       "      <td>4998861.0</td>\n",
-       "      <td>NaN</td>\n",
+       "      <td>ASEAN (Ember)</td>\n",
+       "      <td>2003</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
-       "      <td>...</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
+       "      <td>...</td>\n",
+       "      <td>0.000</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
+       "      <td>0.0</td>\n",
        "      <td>NaN</td>\n",
+       "      <td>0.0</td>\n",
        "      <td>NaN</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>4</th>\n",
-       "      <td>Afghanistan</td>\n",
-       "      <td>1904</td>\n",
-       "      <td>AFG</td>\n",
-       "      <td>5063419.0</td>\n",
-       "      <td>NaN</td>\n",
+       "      <td>ASEAN (Ember)</td>\n",
+       "      <td>2004</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
-       "      <td>...</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
+       "      <td>...</td>\n",
+       "      <td>0.000</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
+       "      <td>0.0</td>\n",
        "      <td>NaN</td>\n",
+       "      <td>0.0</td>\n",
        "      <td>NaN</td>\n",
        "    </tr>\n",
        "    <tr>\n",
@@ -219,31 +220,7 @@
        "      <td>...</td>\n",
        "    </tr>\n",
        "    <tr>\n",
-       "      <th>22550</th>\n",
-       "      <td>Zimbabwe</td>\n",
-       "      <td>2017</td>\n",
-       "      <td>ZWE</td>\n",
-       "      <td>14751101.0</td>\n",
-       "      <td>2.194784e+10</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>21.693</td>\n",
-       "      <td>...</td>\n",
-       "      <td>0.136</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>0.0</td>\n",
-       "      <td>0.0</td>\n",
-       "      <td>NaN</td>\n",
-       "      <td>0.0</td>\n",
-       "      <td>NaN</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>22551</th>\n",
+       "      <th>22007</th>\n",
        "      <td>Zimbabwe</td>\n",
        "      <td>2018</td>\n",
        "      <td>ZWE</td>\n",
@@ -267,7 +244,7 @@
        "      <td>NaN</td>\n",
        "    </tr>\n",
        "    <tr>\n",
-       "      <th>22552</th>\n",
+       "      <th>22008</th>\n",
        "      <td>Zimbabwe</td>\n",
        "      <td>2019</td>\n",
        "      <td>ZWE</td>\n",
@@ -291,7 +268,7 @@
        "      <td>NaN</td>\n",
        "    </tr>\n",
        "    <tr>\n",
-       "      <th>22553</th>\n",
+       "      <th>22009</th>\n",
        "      <td>Zimbabwe</td>\n",
        "      <td>2020</td>\n",
        "      <td>ZWE</td>\n",
@@ -315,7 +292,7 @@
        "      <td>NaN</td>\n",
        "    </tr>\n",
        "    <tr>\n",
-       "      <th>22554</th>\n",
+       "      <th>22010</th>\n",
        "      <td>Zimbabwe</td>\n",
        "      <td>2021</td>\n",
        "      <td>ZWE</td>\n",
@@ -338,24 +315,48 @@
        "      <td>0.0</td>\n",
        "      <td>NaN</td>\n",
        "    </tr>\n",
+       "    <tr>\n",
+       "      <th>22011</th>\n",
+       "      <td>Zimbabwe</td>\n",
+       "      <td>2022</td>\n",
+       "      <td>ZWE</td>\n",
+       "      <td>16320539.0</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>...</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>NaN</td>\n",
+       "    </tr>\n",
        "  </tbody>\n",
        "</table>\n",
-       "<p>22555 rows × 129 columns</p>\n",
+       "<p>22012 rows × 129 columns</p>\n",
        "</div>"
       ],
       "text/plain": [
-       "           country  year iso_code  population           gdp  \\\n",
-       "0      Afghanistan  1900      AFG   4832414.0           NaN   \n",
-       "1      Afghanistan  1901      AFG   4879685.0           NaN   \n",
-       "2      Afghanistan  1902      AFG   4935122.0           NaN   \n",
-       "3      Afghanistan  1903      AFG   4998861.0           NaN   \n",
-       "4      Afghanistan  1904      AFG   5063419.0           NaN   \n",
-       "...            ...   ...      ...         ...           ...   \n",
-       "22550     Zimbabwe  2017      ZWE  14751101.0  2.194784e+10   \n",
-       "22551     Zimbabwe  2018      ZWE  15052191.0  2.271535e+10   \n",
-       "22552     Zimbabwe  2019      ZWE  15354606.0           NaN   \n",
-       "22553     Zimbabwe  2020      ZWE  15669663.0           NaN   \n",
-       "22554     Zimbabwe  2021      ZWE  15993525.0           NaN   \n",
+       "             country  year iso_code  population           gdp  \\\n",
+       "0      ASEAN (Ember)  2000      NaN         NaN           NaN   \n",
+       "1      ASEAN (Ember)  2001      NaN         NaN           NaN   \n",
+       "2      ASEAN (Ember)  2002      NaN         NaN           NaN   \n",
+       "3      ASEAN (Ember)  2003      NaN         NaN           NaN   \n",
+       "4      ASEAN (Ember)  2004      NaN         NaN           NaN   \n",
+       "...              ...   ...      ...         ...           ...   \n",
+       "22007       Zimbabwe  2018      ZWE  15052191.0  2.271535e+10   \n",
+       "22008       Zimbabwe  2019      ZWE  15354606.0           NaN   \n",
+       "22009       Zimbabwe  2020      ZWE  15669663.0           NaN   \n",
+       "22010       Zimbabwe  2021      ZWE  15993525.0           NaN   \n",
+       "22011       Zimbabwe  2022      ZWE  16320539.0           NaN   \n",
        "\n",
        "       biofuel_cons_change_pct  biofuel_cons_change_twh  \\\n",
        "0                          NaN                      NaN   \n",
@@ -364,11 +365,11 @@
        "3                          NaN                      NaN   \n",
        "4                          NaN                      NaN   \n",
        "...                        ...                      ...   \n",
-       "22550                      NaN                      NaN   \n",
-       "22551                      NaN                      NaN   \n",
-       "22552                      NaN                      NaN   \n",
-       "22553                      NaN                      NaN   \n",
-       "22554                      NaN                      NaN   \n",
+       "22007                      NaN                      NaN   \n",
+       "22008                      NaN                      NaN   \n",
+       "22009                      NaN                      NaN   \n",
+       "22010                      NaN                      NaN   \n",
+       "22011                      NaN                      NaN   \n",
        "\n",
        "       biofuel_cons_per_capita  biofuel_consumption  biofuel_elec_per_capita  \\\n",
        "0                          NaN                  NaN                      NaN   \n",
@@ -377,24 +378,24 @@
        "3                          NaN                  NaN                      NaN   \n",
        "4                          NaN                  NaN                      NaN   \n",
        "...                        ...                  ...                      ...   \n",
-       "22550                      NaN                  NaN                   21.693   \n",
-       "22551                      NaN                  NaN                   25.910   \n",
-       "22552                      NaN                  NaN                   24.748   \n",
-       "22553                      NaN                  NaN                   22.336   \n",
-       "22554                      NaN                  NaN                   23.760   \n",
+       "22007                      NaN                  NaN                   25.910   \n",
+       "22008                      NaN                  NaN                   24.748   \n",
+       "22009                      NaN                  NaN                   22.336   \n",
+       "22010                      NaN                  NaN                   23.760   \n",
+       "22011                      NaN                  NaN                      NaN   \n",
        "\n",
        "       ...  solar_share_elec  solar_share_energy  wind_cons_change_pct  \\\n",
-       "0      ...               NaN                 NaN                   NaN   \n",
-       "1      ...               NaN                 NaN                   NaN   \n",
-       "2      ...               NaN                 NaN                   NaN   \n",
-       "3      ...               NaN                 NaN                   NaN   \n",
-       "4      ...               NaN                 NaN                   NaN   \n",
+       "0      ...             0.000                 NaN                   NaN   \n",
+       "1      ...             0.000                 NaN                   NaN   \n",
+       "2      ...             0.000                 NaN                   NaN   \n",
+       "3      ...             0.000                 NaN                   NaN   \n",
+       "4      ...             0.000                 NaN                   NaN   \n",
        "...    ...               ...                 ...                   ...   \n",
-       "22550  ...             0.136                 NaN                   NaN   \n",
-       "22551  ...             0.218                 NaN                   NaN   \n",
-       "22552  ...             0.364                 NaN                   NaN   \n",
-       "22553  ...             0.395                 NaN                   NaN   \n",
-       "22554  ...             0.498                 NaN                   NaN   \n",
+       "22007  ...             0.218                 NaN                   NaN   \n",
+       "22008  ...             0.364                 NaN                   NaN   \n",
+       "22009  ...             0.395                 NaN                   NaN   \n",
+       "22010  ...             0.498                 NaN                   NaN   \n",
+       "22011  ...               NaN                 NaN                   NaN   \n",
        "\n",
        "       wind_cons_change_twh  wind_consumption  wind_elec_per_capita  \\\n",
        "0                       NaN               NaN                   NaN   \n",
@@ -403,24 +404,24 @@
        "3                       NaN               NaN                   NaN   \n",
        "4                       NaN               NaN                   NaN   \n",
        "...                     ...               ...                   ...   \n",
-       "22550                   NaN               NaN                   0.0   \n",
-       "22551                   NaN               NaN                   0.0   \n",
-       "22552                   NaN               NaN                   0.0   \n",
-       "22553                   NaN               NaN                   0.0   \n",
-       "22554                   NaN               NaN                   0.0   \n",
+       "22007                   NaN               NaN                   0.0   \n",
+       "22008                   NaN               NaN                   0.0   \n",
+       "22009                   NaN               NaN                   0.0   \n",
+       "22010                   NaN               NaN                   0.0   \n",
+       "22011                   NaN               NaN                   NaN   \n",
        "\n",
        "       wind_electricity  wind_energy_per_capita  wind_share_elec  \\\n",
-       "0                   NaN                     NaN              NaN   \n",
-       "1                   NaN                     NaN              NaN   \n",
-       "2                   NaN                     NaN              NaN   \n",
-       "3                   NaN                     NaN              NaN   \n",
-       "4                   NaN                     NaN              NaN   \n",
+       "0                   0.0                     NaN              0.0   \n",
+       "1                   0.0                     NaN              0.0   \n",
+       "2                   0.0                     NaN              0.0   \n",
+       "3                   0.0                     NaN              0.0   \n",
+       "4                   0.0                     NaN              0.0   \n",
        "...                 ...                     ...              ...   \n",
-       "22550               0.0                     NaN              0.0   \n",
-       "22551               0.0                     NaN              0.0   \n",
-       "22552               0.0                     NaN              0.0   \n",
-       "22553               0.0                     NaN              0.0   \n",
-       "22554               0.0                     NaN              0.0   \n",
+       "22007               0.0                     NaN              0.0   \n",
+       "22008               0.0                     NaN              0.0   \n",
+       "22009               0.0                     NaN              0.0   \n",
+       "22010               0.0                     NaN              0.0   \n",
+       "22011               NaN                     NaN              NaN   \n",
        "\n",
        "       wind_share_energy  \n",
        "0                    NaN  \n",
@@ -429,13 +430,13 @@
        "3                    NaN  \n",
        "4                    NaN  \n",
        "...                  ...  \n",
-       "22550                NaN  \n",
-       "22551                NaN  \n",
-       "22552                NaN  \n",
-       "22553                NaN  \n",
-       "22554                NaN  \n",
+       "22007                NaN  \n",
+       "22008                NaN  \n",
+       "22009                NaN  \n",
+       "22010                NaN  \n",
+       "22011                NaN  \n",
        "\n",
-       "[22555 rows x 129 columns]"
+       "[22012 rows x 129 columns]"
       ]
      },
      "execution_count": 2,
@@ -500,11 +501,11 @@
        "  </thead>\n",
        "  <tbody>\n",
        "    <tr>\n",
-       "      <th>9150</th>\n",
+       "      <th>9166</th>\n",
        "      <td>India</td>\n",
        "      <td>1900</td>\n",
        "      <td>IND</td>\n",
-       "      <td>2.919791e+08</td>\n",
+       "      <td>2.807142e+08</td>\n",
        "      <td>2.716975e+11</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
@@ -524,11 +525,11 @@
        "      <td>NaN</td>\n",
        "    </tr>\n",
        "    <tr>\n",
-       "      <th>9151</th>\n",
+       "      <th>9167</th>\n",
        "      <td>India</td>\n",
        "      <td>1901</td>\n",
        "      <td>IND</td>\n",
-       "      <td>2.933739e+08</td>\n",
+       "      <td>2.818341e+08</td>\n",
        "      <td>2.773278e+11</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
@@ -548,11 +549,11 @@
        "      <td>NaN</td>\n",
        "    </tr>\n",
        "    <tr>\n",
-       "      <th>9152</th>\n",
+       "      <th>9168</th>\n",
        "      <td>India</td>\n",
        "      <td>1902</td>\n",
        "      <td>IND</td>\n",
-       "      <td>2.950267e+08</td>\n",
+       "      <td>2.831998e+08</td>\n",
        "      <td>3.006720e+11</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
@@ -572,11 +573,11 @@
        "      <td>NaN</td>\n",
        "    </tr>\n",
        "    <tr>\n",
-       "      <th>9153</th>\n",
+       "      <th>9169</th>\n",
        "      <td>India</td>\n",
        "      <td>1903</td>\n",
        "      <td>IND</td>\n",
-       "      <td>2.969399e+08</td>\n",
+       "      <td>2.848130e+08</td>\n",
        "      <td>3.047644e+11</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
@@ -596,11 +597,11 @@
        "      <td>NaN</td>\n",
        "    </tr>\n",
        "    <tr>\n",
-       "      <th>9154</th>\n",
+       "      <th>9170</th>\n",
        "      <td>India</td>\n",
        "      <td>1904</td>\n",
        "      <td>IND</td>\n",
-       "      <td>2.988655e+08</td>\n",
+       "      <td>2.864353e+08</td>\n",
        "      <td>3.060750e+11</td>\n",
        "      <td>NaN</td>\n",
        "      <td>NaN</td>\n",
@@ -644,44 +645,20 @@
        "      <td>...</td>\n",
        "    </tr>\n",
        "    <tr>\n",
-       "      <th>9267</th>\n",
-       "      <td>India</td>\n",
-       "      <td>2017</td>\n",
-       "      <td>IND</td>\n",
-       "      <td>1.354196e+09</td>\n",
-       "      <td>8.275647e+12</td>\n",
-       "      <td>-11.994</td>\n",
-       "      <td>-2.077</td>\n",
-       "      <td>11.251</td>\n",
-       "      <td>15.237</td>\n",
-       "      <td>18.395</td>\n",
-       "      <td>...</td>\n",
-       "      <td>1.464</td>\n",
-       "      <td>0.659</td>\n",
-       "      <td>21.119</td>\n",
-       "      <td>23.737</td>\n",
-       "      <td>140.062</td>\n",
-       "      <td>38.864</td>\n",
-       "      <td>52.63</td>\n",
-       "      <td>103.428</td>\n",
-       "      <td>3.577</td>\n",
-       "      <td>1.610</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>9268</th>\n",
+       "      <th>9284</th>\n",
        "      <td>India</td>\n",
        "      <td>2018</td>\n",
        "      <td>IND</td>\n",
        "      <td>1.369003e+09</td>\n",
        "      <td>8.835758e+12</td>\n",
-       "      <td>33.957</td>\n",
-       "      <td>5.174</td>\n",
-       "      <td>14.909</td>\n",
-       "      <td>20.410</td>\n",
+       "      <td>33.945</td>\n",
+       "      <td>5.170</td>\n",
+       "      <td>14.902</td>\n",
+       "      <td>20.401</td>\n",
        "      <td>19.883</td>\n",
        "      <td>...</td>\n",
        "      <td>2.301</td>\n",
-       "      <td>1.038</td>\n",
+       "      <td>1.058</td>\n",
        "      <td>14.596</td>\n",
        "      <td>19.505</td>\n",
        "      <td>159.567</td>\n",
@@ -689,23 +666,23 @@
        "      <td>60.31</td>\n",
        "      <td>116.557</td>\n",
        "      <td>3.820</td>\n",
-       "      <td>1.723</td>\n",
+       "      <td>1.757</td>\n",
        "    </tr>\n",
        "    <tr>\n",
-       "      <th>9269</th>\n",
+       "      <th>9285</th>\n",
        "      <td>India</td>\n",
        "      <td>2019</td>\n",
        "      <td>IND</td>\n",
        "      <td>1.383112e+09</td>\n",
        "      <td>NaN</td>\n",
-       "      <td>11.677</td>\n",
-       "      <td>2.383</td>\n",
-       "      <td>16.480</td>\n",
-       "      <td>22.794</td>\n",
+       "      <td>11.529</td>\n",
+       "      <td>2.352</td>\n",
+       "      <td>16.451</td>\n",
+       "      <td>22.753</td>\n",
        "      <td>22.782</td>\n",
        "      <td>...</td>\n",
        "      <td>2.853</td>\n",
-       "      <td>1.286</td>\n",
+       "      <td>1.310</td>\n",
        "      <td>4.979</td>\n",
        "      <td>7.327</td>\n",
        "      <td>166.895</td>\n",
@@ -713,23 +690,23 @@
        "      <td>63.31</td>\n",
        "      <td>120.666</td>\n",
        "      <td>3.903</td>\n",
-       "      <td>1.759</td>\n",
+       "      <td>1.792</td>\n",
        "    </tr>\n",
        "    <tr>\n",
-       "      <th>9270</th>\n",
+       "      <th>9286</th>\n",
        "      <td>India</td>\n",
        "      <td>2020</td>\n",
        "      <td>IND</td>\n",
        "      <td>1.396387e+09</td>\n",
        "      <td>NaN</td>\n",
-       "      <td>-2.910</td>\n",
-       "      <td>-0.663</td>\n",
-       "      <td>15.848</td>\n",
-       "      <td>22.130</td>\n",
+       "      <td>-1.031</td>\n",
+       "      <td>-0.235</td>\n",
+       "      <td>16.126</td>\n",
+       "      <td>22.518</td>\n",
        "      <td>23.589</td>\n",
        "      <td>...</td>\n",
        "      <td>3.755</td>\n",
-       "      <td>1.724</td>\n",
+       "      <td>1.747</td>\n",
        "      <td>-4.560</td>\n",
        "      <td>-8.195</td>\n",
        "      <td>158.700</td>\n",
@@ -737,23 +714,23 @@
        "      <td>60.43</td>\n",
        "      <td>113.650</td>\n",
        "      <td>3.867</td>\n",
-       "      <td>1.775</td>\n",
+       "      <td>1.799</td>\n",
        "    </tr>\n",
        "    <tr>\n",
-       "      <th>9271</th>\n",
+       "      <th>9287</th>\n",
        "      <td>India</td>\n",
        "      <td>2021</td>\n",
        "      <td>IND</td>\n",
        "      <td>1.407564e+09</td>\n",
        "      <td>NaN</td>\n",
-       "      <td>20.318</td>\n",
-       "      <td>4.496</td>\n",
-       "      <td>18.917</td>\n",
-       "      <td>26.627</td>\n",
+       "      <td>39.907</td>\n",
+       "      <td>8.986</td>\n",
+       "      <td>22.382</td>\n",
+       "      <td>31.505</td>\n",
        "      <td>25.200</td>\n",
        "      <td>...</td>\n",
        "      <td>3.986</td>\n",
-       "      <td>1.816</td>\n",
+       "      <td>1.865</td>\n",
        "      <td>12.688</td>\n",
        "      <td>19.481</td>\n",
        "      <td>178.181</td>\n",
@@ -761,106 +738,130 @@
        "      <td>68.09</td>\n",
        "      <td>126.588</td>\n",
        "      <td>3.973</td>\n",
-       "      <td>1.811</td>\n",
+       "      <td>1.859</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>9288</th>\n",
+       "      <td>India</td>\n",
+       "      <td>2022</td>\n",
+       "      <td>IND</td>\n",
+       "      <td>1.417173e+09</td>\n",
+       "      <td>NaN</td>\n",
+       "      <td>14.897</td>\n",
+       "      <td>4.693</td>\n",
+       "      <td>25.542</td>\n",
+       "      <td>36.198</td>\n",
+       "      <td>25.755</td>\n",
+       "      <td>...</td>\n",
+       "      <td>5.178</td>\n",
+       "      <td>2.451</td>\n",
+       "      <td>2.865</td>\n",
+       "      <td>4.437</td>\n",
+       "      <td>182.617</td>\n",
+       "      <td>49.429</td>\n",
+       "      <td>70.05</td>\n",
+       "      <td>128.860</td>\n",
+       "      <td>3.811</td>\n",
+       "      <td>1.804</td>\n",
        "    </tr>\n",
        "  </tbody>\n",
        "</table>\n",
-       "<p>122 rows × 129 columns</p>\n",
+       "<p>123 rows × 129 columns</p>\n",
        "</div>"
       ],
       "text/plain": [
        "     country  year iso_code    population           gdp  \\\n",
-       "9150   India  1900      IND  2.919791e+08  2.716975e+11   \n",
-       "9151   India  1901      IND  2.933739e+08  2.773278e+11   \n",
-       "9152   India  1902      IND  2.950267e+08  3.006720e+11   \n",
-       "9153   India  1903      IND  2.969399e+08  3.047644e+11   \n",
-       "9154   India  1904      IND  2.988655e+08  3.060750e+11   \n",
+       "9166   India  1900      IND  2.807142e+08  2.716975e+11   \n",
+       "9167   India  1901      IND  2.818341e+08  2.773278e+11   \n",
+       "9168   India  1902      IND  2.831998e+08  3.006720e+11   \n",
+       "9169   India  1903      IND  2.848130e+08  3.047644e+11   \n",
+       "9170   India  1904      IND  2.864353e+08  3.060750e+11   \n",
        "...      ...   ...      ...           ...           ...   \n",
-       "9267   India  2017      IND  1.354196e+09  8.275647e+12   \n",
-       "9268   India  2018      IND  1.369003e+09  8.835758e+12   \n",
-       "9269   India  2019      IND  1.383112e+09           NaN   \n",
-       "9270   India  2020      IND  1.396387e+09           NaN   \n",
-       "9271   India  2021      IND  1.407564e+09           NaN   \n",
+       "9284   India  2018      IND  1.369003e+09  8.835758e+12   \n",
+       "9285   India  2019      IND  1.383112e+09           NaN   \n",
+       "9286   India  2020      IND  1.396387e+09           NaN   \n",
+       "9287   India  2021      IND  1.407564e+09           NaN   \n",
+       "9288   India  2022      IND  1.417173e+09           NaN   \n",
        "\n",
        "      biofuel_cons_change_pct  biofuel_cons_change_twh  \\\n",
-       "9150                      NaN                      NaN   \n",
-       "9151                      NaN                      NaN   \n",
-       "9152                      NaN                      NaN   \n",
-       "9153                      NaN                      NaN   \n",
-       "9154                      NaN                      NaN   \n",
+       "9166                      NaN                      NaN   \n",
+       "9167                      NaN                      NaN   \n",
+       "9168                      NaN                      NaN   \n",
+       "9169                      NaN                      NaN   \n",
+       "9170                      NaN                      NaN   \n",
        "...                       ...                      ...   \n",
-       "9267                  -11.994                   -2.077   \n",
-       "9268                   33.957                    5.174   \n",
-       "9269                   11.677                    2.383   \n",
-       "9270                   -2.910                   -0.663   \n",
-       "9271                   20.318                    4.496   \n",
+       "9284                   33.945                    5.170   \n",
+       "9285                   11.529                    2.352   \n",
+       "9286                   -1.031                   -0.235   \n",
+       "9287                   39.907                    8.986   \n",
+       "9288                   14.897                    4.693   \n",
        "\n",
        "      biofuel_cons_per_capita  biofuel_consumption  biofuel_elec_per_capita  \\\n",
-       "9150                      NaN                  NaN                      NaN   \n",
-       "9151                      NaN                  NaN                      NaN   \n",
-       "9152                      NaN                  NaN                      NaN   \n",
-       "9153                      NaN                  NaN                      NaN   \n",
-       "9154                      NaN                  NaN                      NaN   \n",
+       "9166                      NaN                  NaN                      NaN   \n",
+       "9167                      NaN                  NaN                      NaN   \n",
+       "9168                      NaN                  NaN                      NaN   \n",
+       "9169                      NaN                  NaN                      NaN   \n",
+       "9170                      NaN                  NaN                      NaN   \n",
        "...                       ...                  ...                      ...   \n",
-       "9267                   11.251               15.237                   18.395   \n",
-       "9268                   14.909               20.410                   19.883   \n",
-       "9269                   16.480               22.794                   22.782   \n",
-       "9270                   15.848               22.130                   23.589   \n",
-       "9271                   18.917               26.627                   25.200   \n",
+       "9284                   14.902               20.401                   19.883   \n",
+       "9285                   16.451               22.753                   22.782   \n",
+       "9286                   16.126               22.518                   23.589   \n",
+       "9287                   22.382               31.505                   25.200   \n",
+       "9288                   25.542               36.198                   25.755   \n",
        "\n",
        "      ...  solar_share_elec  solar_share_energy  wind_cons_change_pct  \\\n",
-       "9150  ...               NaN                 NaN                   NaN   \n",
-       "9151  ...               NaN                 NaN                   NaN   \n",
-       "9152  ...               NaN                 NaN                   NaN   \n",
-       "9153  ...               NaN                 NaN                   NaN   \n",
-       "9154  ...               NaN                 NaN                   NaN   \n",
+       "9166  ...               NaN                 NaN                   NaN   \n",
+       "9167  ...               NaN                 NaN                   NaN   \n",
+       "9168  ...               NaN                 NaN                   NaN   \n",
+       "9169  ...               NaN                 NaN                   NaN   \n",
+       "9170  ...               NaN                 NaN                   NaN   \n",
        "...   ...               ...                 ...                   ...   \n",
-       "9267  ...             1.464               0.659                21.119   \n",
-       "9268  ...             2.301               1.038                14.596   \n",
-       "9269  ...             2.853               1.286                 4.979   \n",
-       "9270  ...             3.755               1.724                -4.560   \n",
-       "9271  ...             3.986               1.816                12.688   \n",
+       "9284  ...             2.301               1.058                14.596   \n",
+       "9285  ...             2.853               1.310                 4.979   \n",
+       "9286  ...             3.755               1.747                -4.560   \n",
+       "9287  ...             3.986               1.865                12.688   \n",
+       "9288  ...             5.178               2.451                 2.865   \n",
        "\n",
        "      wind_cons_change_twh  wind_consumption  wind_elec_per_capita  \\\n",
-       "9150                   NaN               NaN                   NaN   \n",
-       "9151                   NaN               NaN                   NaN   \n",
-       "9152                   NaN               NaN                   NaN   \n",
-       "9153                   NaN               NaN                   NaN   \n",
-       "9154                   NaN               NaN                   NaN   \n",
+       "9166                   NaN               NaN                   NaN   \n",
+       "9167                   NaN               NaN                   NaN   \n",
+       "9168                   NaN               NaN                   NaN   \n",
+       "9169                   NaN               NaN                   NaN   \n",
+       "9170                   NaN               NaN                   NaN   \n",
        "...                    ...               ...                   ...   \n",
-       "9267                23.737           140.062                38.864   \n",
-       "9268                19.505           159.567                44.054   \n",
-       "9269                 7.327           166.895                45.774   \n",
-       "9270                -8.195           158.700                43.276   \n",
-       "9271                19.481           178.181                48.374   \n",
+       "9284                19.505           159.567                44.054   \n",
+       "9285                 7.327           166.895                45.774   \n",
+       "9286                -8.195           158.700                43.276   \n",
+       "9287                19.481           178.181                48.374   \n",
+       "9288                 4.437           182.617                49.429   \n",
        "\n",
        "      wind_electricity  wind_energy_per_capita  wind_share_elec  \\\n",
-       "9150               NaN                     NaN              NaN   \n",
-       "9151               NaN                     NaN              NaN   \n",
-       "9152               NaN                     NaN              NaN   \n",
-       "9153               NaN                     NaN              NaN   \n",
-       "9154               NaN                     NaN              NaN   \n",
+       "9166               NaN                     NaN              NaN   \n",
+       "9167               NaN                     NaN              NaN   \n",
+       "9168               NaN                     NaN              NaN   \n",
+       "9169               NaN                     NaN              NaN   \n",
+       "9170               NaN                     NaN              NaN   \n",
        "...                ...                     ...              ...   \n",
-       "9267             52.63                 103.428            3.577   \n",
-       "9268             60.31                 116.557            3.820   \n",
-       "9269             63.31                 120.666            3.903   \n",
-       "9270             60.43                 113.650            3.867   \n",
-       "9271             68.09                 126.588            3.973   \n",
+       "9284             60.31                 116.557            3.820   \n",
+       "9285             63.31                 120.666            3.903   \n",
+       "9286             60.43                 113.650            3.867   \n",
+       "9287             68.09                 126.588            3.973   \n",
+       "9288             70.05                 128.860            3.811   \n",
        "\n",
        "      wind_share_energy  \n",
-       "9150                NaN  \n",
-       "9151                NaN  \n",
-       "9152                NaN  \n",
-       "9153                NaN  \n",
-       "9154                NaN  \n",
+       "9166                NaN  \n",
+       "9167                NaN  \n",
+       "9168                NaN  \n",
+       "9169                NaN  \n",
+       "9170                NaN  \n",
        "...                 ...  \n",
-       "9267              1.610  \n",
-       "9268              1.723  \n",
-       "9269              1.759  \n",
-       "9270              1.775  \n",
-       "9271              1.811  \n",
+       "9284              1.757  \n",
+       "9285              1.792  \n",
+       "9286              1.799  \n",
+       "9287              1.859  \n",
+       "9288              1.804  \n",
        "\n",
-       "[122 rows x 129 columns]"
+       "[123 rows x 129 columns]"
       ]
      },
      "execution_count": 3,
@@ -954,25 +955,25 @@
        "  </thead>\n",
        "  <tbody>\n",
        "    <tr>\n",
-       "      <th>7274</th>\n",
+       "      <th>7353</th>\n",
        "      <td>France</td>\n",
        "      <td>FRA</td>\n",
        "      <td>2021</td>\n",
-       "      <td>58.034</td>\n",
-       "      <td>8.67</td>\n",
-       "      <td>6.1</td>\n",
-       "      <td>50.62</td>\n",
-       "      <td>33.92</td>\n",
-       "      <td>59.12</td>\n",
-       "      <td>500.78</td>\n",
-       "      <td>380.68</td>\n",
-       "      <td>10.6</td>\n",
-       "      <td>9.28</td>\n",
-       "      <td>0.61</td>\n",
-       "      <td>8544.672</td>\n",
-       "      <td>120.1</td>\n",
-       "      <td>14.52</td>\n",
-       "      <td>37.18</td>\n",
+       "      <td>67.39</td>\n",
+       "      <td>9.6</td>\n",
+       "      <td>5.44</td>\n",
+       "      <td>48.66</td>\n",
+       "      <td>33.36</td>\n",
+       "      <td>59.62</td>\n",
+       "      <td>501.72</td>\n",
+       "      <td>379.36</td>\n",
+       "      <td>9.86</td>\n",
+       "      <td>10.18</td>\n",
+       "      <td>0.58</td>\n",
+       "      <td>8528.864</td>\n",
+       "      <td>122.36</td>\n",
+       "      <td>15.73</td>\n",
+       "      <td>36.83</td>\n",
        "    </tr>\n",
        "  </tbody>\n",
        "</table>\n",
@@ -980,22 +981,22 @@
       ],
       "text/plain": [
        "     country iso_code  year  carbon_intensity_elec  biofuel_electricity  \\\n",
-       "7274  France      FRA  2021                 58.034                 8.67   \n",
+       "7353  France      FRA  2021                  67.39                  9.6   \n",
        "\n",
        "      coal_electricity  fossil_electricity  gas_electricity  \\\n",
-       "7274               6.1               50.62            33.92   \n",
+       "7353              5.44               48.66            33.36   \n",
        "\n",
        "      hydro_electricity  low_carbon_electricity  nuclear_electricity  \\\n",
-       "7274              59.12                  500.78               380.68   \n",
+       "7353              59.62                  501.72               379.36   \n",
        "\n",
        "      oil_electricity  other_renewable_electricity  \\\n",
-       "7274             10.6                         9.28   \n",
+       "7353             9.86                        10.18   \n",
        "\n",
        "      other_renewable_exc_biofuel_electricity  per_capita_electricity  \\\n",
-       "7274                                     0.61                8544.672   \n",
+       "7353                                     0.58                8528.864   \n",
        "\n",
        "      renewables_electricity  solar_electricity  wind_electricity  \n",
-       "7274                   120.1              14.52             37.18  "
+       "7353                  122.36              15.73             36.83  "
       ]
      },
      "execution_count": 6,
@@ -1038,25 +1039,25 @@
        "      <th>iso_code</th>\n",
        "      <th>year</th>\n",
        "      <th>carbon_intensity</th>\n",
-       "      <th>fossil_Twh</th>\n",
-       "      <th>renewables_Twh</th>\n",
-       "      <th>per_capita_Twh</th>\n",
-       "      <th>coal_Twh</th>\n",
-       "      <th>gaz_Twh</th>\n",
-       "      <th>oil_Twh</th>\n",
-       "      <th>solar_Twh</th>\n",
-       "      <th>wind_Twh</th>\n",
-       "      <th>hydroelectricity_Twh</th>\n",
-       "      <th>other_renewable_Twh</th>\n",
-       "      <th>other_renewable_exc_biofuel_Twh</th>\n",
-       "      <th>nuclear_Twh</th>\n",
-       "      <th>biofuel_Twh</th>\n",
-       "      <th>low_carbon_Twh</th>\n",
+       "      <th>fossil_TWh</th>\n",
+       "      <th>renewables_TWh</th>\n",
+       "      <th>per_capita_Wh</th>\n",
+       "      <th>coal_TWh</th>\n",
+       "      <th>gas_TWh</th>\n",
+       "      <th>oil_TWh</th>\n",
+       "      <th>solar_TWh</th>\n",
+       "      <th>wind_TWh</th>\n",
+       "      <th>hydroelectricity_TWh</th>\n",
+       "      <th>other_renewable_TWh</th>\n",
+       "      <th>other_renewable_exc_biofuel_TWh</th>\n",
+       "      <th>nuclear_TWh</th>\n",
+       "      <th>biofuel_TWh</th>\n",
+       "      <th>low_carbon_TWh</th>\n",
        "    </tr>\n",
        "  </thead>\n",
        "  <tbody>\n",
        "    <tr>\n",
-       "      <th>121</th>\n",
+       "      <th>144</th>\n",
        "      <td>Afghanistan</td>\n",
        "      <td>AFG</td>\n",
        "      <td>2021</td>\n",
@@ -1077,17 +1078,38 @@
        "      <td>0.70</td>\n",
        "    </tr>\n",
        "    <tr>\n",
-       "      <th>682</th>\n",
+       "      <th>587</th>\n",
+       "      <td>Albania</td>\n",
+       "      <td>ALB</td>\n",
+       "      <td>2021</td>\n",
+       "      <td>23.437</td>\n",
+       "      <td>0.00</td>\n",
+       "      <td>8.96</td>\n",
+       "      <td>3138.673</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>0.00</td>\n",
+       "      <td>0.00</td>\n",
+       "      <td>0.07</td>\n",
+       "      <td>0.00</td>\n",
+       "      <td>8.89</td>\n",
+       "      <td>0.00</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>0.00</td>\n",
+       "      <td>8.96</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>709</th>\n",
        "      <td>Algeria</td>\n",
        "      <td>DZA</td>\n",
        "      <td>2021</td>\n",
-       "      <td>488.393</td>\n",
-       "      <td>76.63</td>\n",
+       "      <td>498.904</td>\n",
+       "      <td>76.62</td>\n",
        "      <td>0.91</td>\n",
-       "      <td>1755.174</td>\n",
+       "      <td>1754.947</td>\n",
        "      <td>0.0</td>\n",
-       "      <td>75.30</td>\n",
-       "      <td>1.33</td>\n",
+       "      <td>71.40</td>\n",
+       "      <td>5.22</td>\n",
        "      <td>0.81</td>\n",
        "      <td>0.01</td>\n",
        "      <td>0.09</td>\n",
@@ -1098,7 +1120,7 @@
        "      <td>0.91</td>\n",
        "    </tr>\n",
        "    <tr>\n",
-       "      <th>724</th>\n",
+       "      <th>752</th>\n",
        "      <td>American Samoa</td>\n",
        "      <td>ASM</td>\n",
        "      <td>2021</td>\n",
@@ -1119,79 +1141,58 @@
        "      <td>0.00</td>\n",
        "    </tr>\n",
        "    <tr>\n",
-       "      <th>846</th>\n",
+       "      <th>874</th>\n",
        "      <td>Angola</td>\n",
        "      <td>AGO</td>\n",
        "      <td>2021</td>\n",
-       "      <td>168.594</td>\n",
-       "      <td>4.63</td>\n",
-       "      <td>11.80</td>\n",
+       "      <td>195.983</td>\n",
+       "      <td>4.77</td>\n",
+       "      <td>11.66</td>\n",
        "      <td>476.180</td>\n",
        "      <td>0.0</td>\n",
-       "      <td>3.89</td>\n",
-       "      <td>0.74</td>\n",
+       "      <td>2.01</td>\n",
+       "      <td>2.76</td>\n",
        "      <td>0.02</td>\n",
        "      <td>0.00</td>\n",
        "      <td>11.50</td>\n",
-       "      <td>0.28</td>\n",
+       "      <td>0.14</td>\n",
        "      <td>0.0</td>\n",
        "      <td>0.0</td>\n",
-       "      <td>0.28</td>\n",
-       "      <td>11.80</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>928</th>\n",
-       "      <td>Antigua and Barbuda</td>\n",
-       "      <td>ATG</td>\n",
-       "      <td>2021</td>\n",
-       "      <td>657.143</td>\n",
-       "      <td>0.33</td>\n",
-       "      <td>0.02</td>\n",
-       "      <td>3754.197</td>\n",
-       "      <td>0.0</td>\n",
-       "      <td>0.00</td>\n",
-       "      <td>0.33</td>\n",
-       "      <td>0.02</td>\n",
-       "      <td>0.00</td>\n",
-       "      <td>0.00</td>\n",
-       "      <td>0.00</td>\n",
-       "      <td>0.0</td>\n",
-       "      <td>0.0</td>\n",
-       "      <td>0.00</td>\n",
-       "      <td>0.02</td>\n",
+       "      <td>0.14</td>\n",
+       "      <td>11.66</td>\n",
        "    </tr>\n",
        "  </tbody>\n",
        "</table>\n",
        "</div>"
       ],
       "text/plain": [
-       "            country_name iso_code  year  carbon_intensity  fossil_Twh  \\\n",
-       "121          Afghanistan      AFG  2021           120.482        0.13   \n",
-       "682              Algeria      DZA  2021           488.393       76.63   \n",
-       "724       American Samoa      ASM  2021           687.500        0.16   \n",
-       "846               Angola      AGO  2021           168.594        4.63   \n",
-       "928  Antigua and Barbuda      ATG  2021           657.143        0.33   \n",
+       "       country_name iso_code  year  carbon_intensity  fossil_TWh  \\\n",
+       "144     Afghanistan      AFG  2021           120.482        0.13   \n",
+       "587         Albania      ALB  2021            23.437        0.00   \n",
+       "709         Algeria      DZA  2021           498.904       76.62   \n",
+       "752  American Samoa      ASM  2021           687.500        0.16   \n",
+       "874          Angola      AGO  2021           195.983        4.77   \n",
        "\n",
-       "     renewables_Twh  per_capita_Twh  coal_Twh  gaz_Twh  oil_Twh  solar_Twh  \\\n",
-       "121            0.70          20.699       0.0     0.00     0.13       0.08   \n",
-       "682            0.91        1755.174       0.0    75.30     1.33       0.81   \n",
-       "724            0.00        3551.136       0.0     0.00     0.16       0.00   \n",
-       "846           11.80         476.180       0.0     3.89     0.74       0.02   \n",
-       "928            0.02        3754.197       0.0     0.00     0.33       0.02   \n",
+       "     renewables_TWh  per_capita_Wh  coal_TWh  gas_TWh  oil_TWh  solar_TWh  \\\n",
+       "144            0.70         20.699       0.0     0.00     0.13       0.08   \n",
+       "587            8.96       3138.673       0.0     0.00     0.00       0.07   \n",
+       "709            0.91       1754.947       0.0    71.40     5.22       0.81   \n",
+       "752            0.00       3551.136       0.0     0.00     0.16       0.00   \n",
+       "874           11.66        476.180       0.0     2.01     2.76       0.02   \n",
        "\n",
-       "     wind_Twh  hydroelectricity_Twh  other_renewable_Twh  \\\n",
-       "121      0.00                  0.62                 0.00   \n",
-       "682      0.01                  0.09                 0.00   \n",
-       "724      0.00                  0.00                 0.00   \n",
-       "846      0.00                 11.50                 0.28   \n",
-       "928      0.00                  0.00                 0.00   \n",
+       "     wind_TWh  hydroelectricity_TWh  other_renewable_TWh  \\\n",
+       "144      0.00                  0.62                 0.00   \n",
+       "587      0.00                  8.89                 0.00   \n",
+       "709      0.01                  0.09                 0.00   \n",
+       "752      0.00                  0.00                 0.00   \n",
+       "874      0.00                 11.50                 0.14   \n",
        "\n",
-       "     other_renewable_exc_biofuel_Twh  nuclear_Twh  biofuel_Twh  low_carbon_Twh  \n",
-       "121                              0.0          0.0         0.00            0.70  \n",
-       "682                              0.0          0.0         0.00            0.91  \n",
-       "724                              0.0          0.0         0.00            0.00  \n",
-       "846                              0.0          0.0         0.28           11.80  \n",
-       "928                              0.0          0.0         0.00            0.02  "
+       "     other_renewable_exc_biofuel_TWh  nuclear_TWh  biofuel_TWh  low_carbon_TWh  \n",
+       "144                              0.0          0.0         0.00            0.70  \n",
+       "587                              0.0          0.0         0.00            8.96  \n",
+       "709                              0.0          0.0         0.00            0.91  \n",
+       "752                              0.0          0.0         0.00            0.00  \n",
+       "874                              0.0          0.0         0.14           11.66  "
       ]
      },
      "execution_count": 7,
@@ -1204,40 +1205,40 @@
     "columns_names = {\n",
     "    'country':'country_name',\n",
     "    'carbon_intensity_elec':'carbon_intensity',\n",
-    "    'biofuel_electricity':'biofuel_Twh',\n",
-    "    'coal_electricity':'coal_Twh',\n",
-    "    'fossil_electricity':'fossil_Twh',\n",
-    "    'gas_electricity':'gaz_Twh',\n",
-    "    'hydro_electricity':'hydroelectricity_Twh',\n",
-    "    'low_carbon_electricity':'low_carbon_Twh',\n",
-    "    'nuclear_electricity':'nuclear_Twh',\n",
-    "    'oil_electricity':'oil_Twh',\n",
-    "    'other_renewable_electricity':'other_renewable_Twh',\n",
-    "    'other_renewable_exc_biofuel_electricity':'other_renewable_exc_biofuel_Twh',\n",
-    "    'per_capita_electricity':'per_capita_Twh',\n",
-    "    'renewables_electricity':'renewables_Twh',\n",
-    "    'solar_electricity':'solar_Twh',\n",
-    "    'wind_electricity':'wind_Twh'\n",
+    "    'biofuel_electricity':'biofuel_TWh',\n",
+    "    'coal_electricity':'coal_TWh',\n",
+    "    'fossil_electricity':'fossil_TWh',\n",
+    "    'gas_electricity':'gas_TWh',\n",
+    "    'hydro_electricity':'hydroelectricity_TWh',\n",
+    "    'low_carbon_electricity':'low_carbon_TWh',\n",
+    "    'nuclear_electricity':'nuclear_TWh',\n",
+    "    'oil_electricity':'oil_TWh',\n",
+    "    'other_renewable_electricity':'other_renewable_TWh',\n",
+    "    'other_renewable_exc_biofuel_electricity':'other_renewable_exc_biofuel_TWh',\n",
+    "    'per_capita_electricity':'per_capita_Wh',\n",
+    "    'renewables_electricity':'renewables_TWh',\n",
+    "    'solar_electricity':'solar_TWh',\n",
+    "    'wind_electricity':'wind_TWh'\n",
     "}\n",
     "df_filtered.rename(columns=columns_names, inplace=True)\n",
     "df_filtered = df_filtered[['country_name',\n",
     "                        'iso_code',\n",
     "                        'year',\n",
     "                        'carbon_intensity',\n",
-    "                        'fossil_Twh',\n",
-    "                        'renewables_Twh',\n",
-    "                        'per_capita_Twh',\n",
-    "                        'coal_Twh',\n",
-    "                        'gaz_Twh',\n",
-    "                        'oil_Twh',\n",
-    "                        'solar_Twh',\n",
-    "                        'wind_Twh',\n",
-    "                        'hydroelectricity_Twh',\n",
-    "                        'other_renewable_Twh',\n",
-    "                        'other_renewable_exc_biofuel_Twh',\n",
-    "                        'nuclear_Twh',\n",
-    "                        'biofuel_Twh',\n",
-    "                        'low_carbon_Twh']]\n",
+    "                        'fossil_TWh',\n",
+    "                        'renewables_TWh',\n",
+    "                        'per_capita_Wh',\n",
+    "                        'coal_TWh',\n",
+    "                        'gas_TWh',\n",
+    "                        'oil_TWh',\n",
+    "                        'solar_TWh',\n",
+    "                        'wind_TWh',\n",
+    "                        'hydroelectricity_TWh',\n",
+    "                        'other_renewable_TWh',\n",
+    "                        'other_renewable_exc_biofuel_TWh',\n",
+    "                        'nuclear_TWh',\n",
+    "                        'biofuel_TWh',\n",
+    "                        'low_carbon_TWh']]\n",
     "df_filtered.head(5)"
    ]
   },
@@ -1272,26 +1273,26 @@
        "      <th>iso_code</th>\n",
        "      <th>year</th>\n",
        "      <th>carbon_intensity</th>\n",
-       "      <th>fossil_Twh</th>\n",
-       "      <th>renewables_Twh</th>\n",
-       "      <th>per_capita_Twh</th>\n",
-       "      <th>coal_Twh</th>\n",
-       "      <th>gaz_Twh</th>\n",
-       "      <th>oil_Twh</th>\n",
-       "      <th>solar_Twh</th>\n",
-       "      <th>wind_Twh</th>\n",
-       "      <th>hydroelectricity_Twh</th>\n",
-       "      <th>other_renewable_Twh</th>\n",
-       "      <th>other_renewable_exc_biofuel_Twh</th>\n",
-       "      <th>nuclear_Twh</th>\n",
-       "      <th>biofuel_Twh</th>\n",
-       "      <th>low_carbon_Twh</th>\n",
-       "      <th>total_Twh</th>\n",
+       "      <th>fossil_TWh</th>\n",
+       "      <th>renewables_TWh</th>\n",
+       "      <th>per_capita_Wh</th>\n",
+       "      <th>coal_TWh</th>\n",
+       "      <th>gas_TWh</th>\n",
+       "      <th>oil_TWh</th>\n",
+       "      <th>solar_TWh</th>\n",
+       "      <th>wind_TWh</th>\n",
+       "      <th>hydroelectricity_TWh</th>\n",
+       "      <th>other_renewable_TWh</th>\n",
+       "      <th>other_renewable_exc_biofuel_TWh</th>\n",
+       "      <th>nuclear_TWh</th>\n",
+       "      <th>biofuel_TWh</th>\n",
+       "      <th>low_carbon_TWh</th>\n",
+       "      <th>total_TWh</th>\n",
        "    </tr>\n",
        "  </thead>\n",
        "  <tbody>\n",
        "    <tr>\n",
-       "      <th>121</th>\n",
+       "      <th>144</th>\n",
        "      <td>Afghanistan</td>\n",
        "      <td>AFG</td>\n",
        "      <td>2021</td>\n",
@@ -1303,61 +1304,61 @@
        "      <td>0.0</td>\n",
        "      <td>0.13</td>\n",
        "      <td>0.08</td>\n",
-       "      <td>0.00</td>\n",
+       "      <td>0.0</td>\n",
        "      <td>0.62</td>\n",
        "      <td>0.0</td>\n",
        "      <td>0.0</td>\n",
        "      <td>0.0</td>\n",
        "      <td>0.0</td>\n",
        "      <td>0.70</td>\n",
-       "      <td>23.059</td>\n",
+       "      <td>0.83</td>\n",
        "    </tr>\n",
        "    <tr>\n",
-       "      <th>682</th>\n",
-       "      <td>Algeria</td>\n",
-       "      <td>DZA</td>\n",
+       "      <th>587</th>\n",
+       "      <td>Albania</td>\n",
+       "      <td>ALB</td>\n",
        "      <td>2021</td>\n",
-       "      <td>488.393</td>\n",
-       "      <td>76.63</td>\n",
-       "      <td>0.91</td>\n",
-       "      <td>1755.174</td>\n",
+       "      <td>23.437</td>\n",
+       "      <td>0.00</td>\n",
+       "      <td>8.96</td>\n",
+       "      <td>3138.673</td>\n",
        "      <td>0.0</td>\n",
-       "      <td>75.3</td>\n",
-       "      <td>1.33</td>\n",
-       "      <td>0.81</td>\n",
-       "      <td>0.01</td>\n",
-       "      <td>0.09</td>\n",
        "      <td>0.0</td>\n",
+       "      <td>0.00</td>\n",
+       "      <td>0.07</td>\n",
        "      <td>0.0</td>\n",
+       "      <td>8.89</td>\n",
        "      <td>0.0</td>\n",
        "      <td>0.0</td>\n",
-       "      <td>0.91</td>\n",
-       "      <td>1911.164</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>8.96</td>\n",
+       "      <td>8.96</td>\n",
        "    </tr>\n",
        "  </tbody>\n",
        "</table>\n",
        "</div>"
       ],
       "text/plain": [
-       "    country_name iso_code  year  carbon_intensity  fossil_Twh  renewables_Twh  \\\n",
-       "121  Afghanistan      AFG  2021           120.482        0.13            0.70   \n",
-       "682      Algeria      DZA  2021           488.393       76.63            0.91   \n",
+       "    country_name iso_code  year  carbon_intensity  fossil_TWh  renewables_TWh  \\\n",
+       "144  Afghanistan      AFG  2021           120.482        0.13            0.70   \n",
+       "587      Albania      ALB  2021            23.437        0.00            8.96   \n",
        "\n",
-       "     per_capita_Twh  coal_Twh  gaz_Twh  oil_Twh  solar_Twh  wind_Twh  \\\n",
-       "121          20.699       0.0      0.0     0.13       0.08      0.00   \n",
-       "682        1755.174       0.0     75.3     1.33       0.81      0.01   \n",
+       "     per_capita_Wh  coal_TWh  gas_TWh  oil_TWh  solar_TWh  wind_TWh  \\\n",
+       "144         20.699       0.0      0.0     0.13       0.08       0.0   \n",
+       "587       3138.673       0.0      0.0     0.00       0.07       0.0   \n",
        "\n",
-       "     hydroelectricity_Twh  other_renewable_Twh  \\\n",
-       "121                  0.62                  0.0   \n",
-       "682                  0.09                  0.0   \n",
+       "     hydroelectricity_TWh  other_renewable_TWh  \\\n",
+       "144                  0.62                  0.0   \n",
+       "587                  8.89                  0.0   \n",
        "\n",
-       "     other_renewable_exc_biofuel_Twh  nuclear_Twh  biofuel_Twh  \\\n",
-       "121                              0.0          0.0          0.0   \n",
-       "682                              0.0          0.0          0.0   \n",
+       "     other_renewable_exc_biofuel_TWh  nuclear_TWh  biofuel_TWh  \\\n",
+       "144                              0.0          0.0          0.0   \n",
+       "587                              0.0          0.0          0.0   \n",
        "\n",
-       "     low_carbon_Twh  total_Twh  \n",
-       "121            0.70     23.059  \n",
-       "682            0.91   1911.164  "
+       "     low_carbon_TWh  total_TWh  \n",
+       "144            0.70       0.83  \n",
+       "587            8.96       8.96  "
       ]
      },
      "execution_count": 8,
@@ -1366,14 +1367,244 @@
     }
    ],
    "source": [
-    "columns_to_sum = df_filtered.columns[4:14].append(df_filtered.columns[16:18]).tolist()\n",
-    "df_filtered['total_Twh'] = df_filtered[columns_to_sum].sum(axis=1)\n",
+    "columns_to_sum = [\"fossil_TWh\", \"renewables_TWh\", \"nuclear_TWh\"]\n",
+    "df_filtered['total_TWh'] = df_filtered[columns_to_sum].sum(axis=1)\n",
     "df_filtered.head(2)"
    ]
   },
   {
    "cell_type": "code",
    "execution_count": 9,
+   "id": "e7d87abd",
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/html": [
+       "<div>\n",
+       "<style scoped>\n",
+       "    .dataframe tbody tr th:only-of-type {\n",
+       "        vertical-align: middle;\n",
+       "    }\n",
+       "\n",
+       "    .dataframe tbody tr th {\n",
+       "        vertical-align: top;\n",
+       "    }\n",
+       "\n",
+       "    .dataframe thead th {\n",
+       "        text-align: right;\n",
+       "    }\n",
+       "</style>\n",
+       "<table border=\"1\" class=\"dataframe\">\n",
+       "  <thead>\n",
+       "    <tr style=\"text-align: right;\">\n",
+       "      <th></th>\n",
+       "      <th>country_name</th>\n",
+       "      <th>iso_code</th>\n",
+       "      <th>year</th>\n",
+       "      <th>carbon_intensity</th>\n",
+       "      <th>fossil_TWh</th>\n",
+       "      <th>renewables_TWh</th>\n",
+       "      <th>per_capita_Wh</th>\n",
+       "      <th>coal_TWh</th>\n",
+       "      <th>gas_TWh</th>\n",
+       "      <th>oil_TWh</th>\n",
+       "      <th>solar_TWh</th>\n",
+       "      <th>wind_TWh</th>\n",
+       "      <th>hydroelectricity_TWh</th>\n",
+       "      <th>other_renewable_TWh</th>\n",
+       "      <th>other_renewable_exc_biofuel_TWh</th>\n",
+       "      <th>nuclear_TWh</th>\n",
+       "      <th>biofuel_TWh</th>\n",
+       "      <th>low_carbon_TWh</th>\n",
+       "      <th>total_TWh</th>\n",
+       "    </tr>\n",
+       "  </thead>\n",
+       "  <tbody>\n",
+       "    <tr>\n",
+       "      <th>7353</th>\n",
+       "      <td>France</td>\n",
+       "      <td>FRA</td>\n",
+       "      <td>2021</td>\n",
+       "      <td>67.39</td>\n",
+       "      <td>48.66</td>\n",
+       "      <td>122.36</td>\n",
+       "      <td>8528.864</td>\n",
+       "      <td>5.44</td>\n",
+       "      <td>33.36</td>\n",
+       "      <td>9.86</td>\n",
+       "      <td>15.73</td>\n",
+       "      <td>36.83</td>\n",
+       "      <td>59.62</td>\n",
+       "      <td>10.18</td>\n",
+       "      <td>0.58</td>\n",
+       "      <td>379.36</td>\n",
+       "      <td>9.6</td>\n",
+       "      <td>501.72</td>\n",
+       "      <td>550.38</td>\n",
+       "    </tr>\n",
+       "  </tbody>\n",
+       "</table>\n",
+       "</div>"
+      ],
+      "text/plain": [
+       "     country_name iso_code  year  carbon_intensity  fossil_TWh  \\\n",
+       "7353       France      FRA  2021             67.39       48.66   \n",
+       "\n",
+       "      renewables_TWh  per_capita_Wh  coal_TWh  gas_TWh  oil_TWh  solar_TWh  \\\n",
+       "7353          122.36       8528.864      5.44    33.36     9.86      15.73   \n",
+       "\n",
+       "      wind_TWh  hydroelectricity_TWh  other_renewable_TWh  \\\n",
+       "7353     36.83                 59.62                10.18   \n",
+       "\n",
+       "      other_renewable_exc_biofuel_TWh  nuclear_TWh  biofuel_TWh  \\\n",
+       "7353                             0.58       379.36          9.6   \n",
+       "\n",
+       "      low_carbon_TWh  total_TWh  \n",
+       "7353          501.72     550.38  "
+      ]
+     },
+     "execution_count": 9,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "df_filtered.query(\"iso_code=='FRA'\")"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 10,
+   "id": "8c540b05",
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/html": [
+       "<div>\n",
+       "<style scoped>\n",
+       "    .dataframe tbody tr th:only-of-type {\n",
+       "        vertical-align: middle;\n",
+       "    }\n",
+       "\n",
+       "    .dataframe tbody tr th {\n",
+       "        vertical-align: top;\n",
+       "    }\n",
+       "\n",
+       "    .dataframe thead th {\n",
+       "        text-align: right;\n",
+       "    }\n",
+       "</style>\n",
+       "<table border=\"1\" class=\"dataframe\">\n",
+       "  <thead>\n",
+       "    <tr style=\"text-align: right;\">\n",
+       "      <th></th>\n",
+       "      <th>country_name</th>\n",
+       "      <th>iso_code</th>\n",
+       "      <th>year</th>\n",
+       "      <th>carbon_intensity</th>\n",
+       "      <th>fossil_TWh</th>\n",
+       "      <th>renewables_TWh</th>\n",
+       "      <th>per_capita_Wh</th>\n",
+       "      <th>coal_TWh</th>\n",
+       "      <th>gas_TWh</th>\n",
+       "      <th>oil_TWh</th>\n",
+       "      <th>solar_TWh</th>\n",
+       "      <th>wind_TWh</th>\n",
+       "      <th>hydroelectricity_TWh</th>\n",
+       "      <th>other_renewable_TWh</th>\n",
+       "      <th>other_renewable_exc_biofuel_TWh</th>\n",
+       "      <th>nuclear_TWh</th>\n",
+       "      <th>biofuel_TWh</th>\n",
+       "      <th>low_carbon_TWh</th>\n",
+       "      <th>total_TWh</th>\n",
+       "    </tr>\n",
+       "  </thead>\n",
+       "  <tbody>\n",
+       "    <tr>\n",
+       "      <th>2124</th>\n",
+       "      <td>Bangladesh</td>\n",
+       "      <td>BGD</td>\n",
+       "      <td>2021</td>\n",
+       "      <td>555.914</td>\n",
+       "      <td>79.18</td>\n",
+       "      <td>1.39</td>\n",
+       "      <td>475.743</td>\n",
+       "      <td>9.56</td>\n",
+       "      <td>56.35</td>\n",
+       "      <td>13.27</td>\n",
+       "      <td>0.47</td>\n",
+       "      <td>0.01</td>\n",
+       "      <td>0.88</td>\n",
+       "      <td>0.03</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>0.03</td>\n",
+       "      <td>1.39</td>\n",
+       "      <td>80.57</td>\n",
+       "    </tr>\n",
+       "  </tbody>\n",
+       "</table>\n",
+       "</div>"
+      ],
+      "text/plain": [
+       "     country_name iso_code  year  carbon_intensity  fossil_TWh  \\\n",
+       "2124   Bangladesh      BGD  2021           555.914       79.18   \n",
+       "\n",
+       "      renewables_TWh  per_capita_Wh  coal_TWh  gas_TWh  oil_TWh  solar_TWh  \\\n",
+       "2124            1.39        475.743      9.56    56.35    13.27       0.47   \n",
+       "\n",
+       "      wind_TWh  hydroelectricity_TWh  other_renewable_TWh  \\\n",
+       "2124      0.01                  0.88                 0.03   \n",
+       "\n",
+       "      other_renewable_exc_biofuel_TWh  nuclear_TWh  biofuel_TWh  \\\n",
+       "2124                              0.0          0.0         0.03   \n",
+       "\n",
+       "      low_carbon_TWh  total_TWh  \n",
+       "2124            1.39      80.57  "
+      ]
+     },
+     "execution_count": 10,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "df_filtered.query(\"iso_code=='BGD'\")"
+   ]
+  },
+  {
+   "attachments": {},
+   "cell_type": "markdown",
+   "id": "9fbe26d1",
+   "metadata": {},
+   "source": [
+    "renewables_Twh = hydroelectricity_Twh + wind_Twh + solar_Twh + other_renewable_Twh\n",
+    "\n",
+    "RTE Production\n",
+    "\n",
+    "![RTE](2023-07-07-22-40-48.png)\n"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 11,
+   "id": "fb65e34b",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# French electricity consumption in 2021 from https://ourworldindata.org/grapher/elec-mix-bar?stackMode=absolute&facet=metric&country=~FRA\n",
+    "# 57 TWh fossil + 297 TWh nuclear + 115 TWh renewable = 469 TWh\n",
+    "# From https://bilan-electrique-2021.rte-france.com/# we read 522 TWh for Production, but 468 TWh of consumption.\n",
+    "# Here we found 550 TWh, which is not the same !\n",
+    "\n",
+    "assert df_filtered.query(\"iso_code=='FRA'\")[\"total_TWh\"].values[0] == 550.38"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 12,
    "id": "81dcd0fc",
    "metadata": {},
    "outputs": [
@@ -1381,15 +1612,19 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
+      "Warning: missing carbon_intensity value for ATA - Antarctica.\n",
       "Warning: missing carbon_intensity value for BMU - Bermuda.\n",
       "Warning: missing carbon_intensity value for GUF - French Guiana.\n",
       "Warning: missing carbon_intensity value for GIB - Gibraltar.\n",
       "Warning: missing carbon_intensity value for GLP - Guadeloupe.\n",
-      "Warning: missing carbon_intensity value for ISL - Iceland.\n",
       "Warning: missing carbon_intensity value for MTQ - Martinique.\n",
+      "Warning: missing carbon_intensity value for FSM - Micronesia (country).\n",
+      "Warning: missing carbon_intensity value for ANT - Netherlands Antilles.\n",
       "Warning: missing carbon_intensity value for NIU - Niue.\n",
+      "Warning: missing carbon_intensity value for MNP - Northern Mariana Islands.\n",
       "Warning: missing carbon_intensity value for REU - Reunion.\n",
       "Warning: missing carbon_intensity value for SHN - Saint Helena.\n",
+      "Warning: missing carbon_intensity value for TUV - Tuvalu.\n",
       "Warning: missing carbon_intensity value for ESH - Western Sahara.\n"
      ]
     },
@@ -1399,25 +1634,25 @@
        "{'country_name': 'United States',\n",
        " 'iso_code': 'USA',\n",
        " 'year': 2021,\n",
-       " 'carbon_intensity': 379.571,\n",
-       " 'fossil_Twh': 2512.45,\n",
-       " 'renewables_Twh': 859.31,\n",
-       " 'per_capita_Twh': 12314.479,\n",
-       " 'coal_Twh': 897.89,\n",
-       " 'gaz_Twh': 1579.36,\n",
-       " 'oil_Twh': 35.2,\n",
-       " 'solar_Twh': 164.42,\n",
-       " 'wind_Twh': 378.2,\n",
-       " 'hydroelectricity_Twh': 246.47,\n",
-       " 'other_renewable_Twh': 70.22,\n",
-       " 'other_renewable_exc_biofuel_Twh': 15.97,\n",
-       " 'nuclear_Twh': 778.19,\n",
-       " 'biofuel_Twh': 54.25,\n",
-       " 'low_carbon_Twh': 1637.5,\n",
-       " 'total_Twh': 20749.749}"
+       " 'carbon_intensity': 379.26,\n",
+       " 'fossil_TWh': 2512.39,\n",
+       " 'renewables_TWh': 861.58,\n",
+       " 'per_capita_Wh': 12325.368,\n",
+       " 'coal_TWh': 898.0,\n",
+       " 'gas_TWh': 1579.19,\n",
+       " 'oil_TWh': 35.2,\n",
+       " 'solar_TWh': 164.42,\n",
+       " 'wind_TWh': 378.2,\n",
+       " 'hydroelectricity_TWh': 246.47,\n",
+       " 'other_renewable_TWh': 72.49,\n",
+       " 'other_renewable_exc_biofuel_TWh': 18.24,\n",
+       " 'nuclear_TWh': 779.65,\n",
+       " 'biofuel_TWh': 54.25,\n",
+       " 'low_carbon_TWh': 1641.23,\n",
+       " 'total_TWh': 4153.62}"
       ]
      },
-     "execution_count": 9,
+     "execution_count": 12,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -1439,7 +1674,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 10,
+   "execution_count": 13,
    "id": "9d275aff",
    "metadata": {},
    "outputs": [
@@ -1449,7 +1684,7 @@
        "True"
       ]
      },
-     "execution_count": 10,
+     "execution_count": 13,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -1461,7 +1696,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 11,
+   "execution_count": 14,
    "id": "0533388d",
    "metadata": {},
    "outputs": [],
@@ -1472,47 +1707,11 @@
    ]
   },
   {
+   "attachments": {},
    "cell_type": "markdown",
    "id": "1737311d-a9d7-45ee-a871-c26a9e1763cf",
    "metadata": {},
    "source": [
-    "The output we need is a JSON file named `global_energy_mix.json` in this format:\n",
-    "```json\n",
-    "{\n",
-    "    \"FRA\": {\n",
-    "        \"carbon_intensity\": 55,\n",
-    "        \"country_id\": 194,\n",
-    "        \"country_name\": \"France\",\n",
-    "        \"fossil_TWh\": 44.553,\n",
-    "        \"geothermal_TWh\": 0.155753680282,\n",
-    "        \"hydroelectricity_TWh\": 60.75027,\n",
-    "        \"iso_code\": \"FRA\",\n",
-    "        \"nuclear_TWh\": 335.41461,\n",
-    "        \"official_name_en\": \"France\",\n",
-    "        \"region\": \"Europe\",\n",
-    "        \"solar_TWh\": 14.1455621272,\n",
-    "        \"total_TWh\": 498.55086677838193,\n",
-    "        \"wind_TWh\": 43.5316709709,\n",
-    "        \"year\": 2020\n",
-    "    },\n",
-    "    \"USA\": {\n",
-    "        \"country_id\": 48,\n",
-    "        \"country_name\": \"US\",\n",
-    "        \"fossil_TWh\": 2419.23028249,\n",
-    "        \"geothermal_TWh\": 16.93010517,\n",
-    "        \"hydroelectricity_TWh\": 291.11084,\n",
-    "        \"iso_code\": \"USA\",\n",
-    "        \"nuclear_TWh\": 789.91864,\n",
-    "        \"official_name_en\": \"United States of America\",\n",
-    "        \"region\": \"Americas\",\n",
-    "        \"solar_TWh\": 132.6307535,\n",
-    "        \"total_TWh\": 3987.3304358499995,\n",
-    "        \"wind_TWh\": 337.50981469,\n",
-    "        \"year\": 2020\n",
-    "    },\n",
-    "}\n",
-    "```\n",
-    "\n",
     "We need only the last available indicator for the columns `carbon_intensity_elec`, not the history, `year` is just an indicator of the freshness.\n",
     "\n",
     "If we don't have `carbon_intensity` it could be computed, but we prefer to not have to do it.\n",
@@ -1521,6 +1720,7 @@
    ]
   },
   {
+   "attachments": {},
    "cell_type": "markdown",
    "id": "8e8031a6-4b45-4ce5-a037-008173af37bb",
    "metadata": {},
@@ -1549,7 +1749,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.12"
+   "version": "3.8.16"
   },
   "vscode": {
    "interpreter": {
diff --git a/codecarbon/viz/components.py b/codecarbon/viz/components.py
index 731c9c35f..f44490fdc 100644
--- a/codecarbon/viz/components.py
+++ b/codecarbon/viz/components.py
@@ -329,7 +329,7 @@ def get_cloud_emissions_barchart_figure(
                 hover_data=["region", "country_name", "emissions"],
                 color="emissions",
                 labels={
-                    "emissions": "Carbon Equivalent (kg)",
+                    "emissions": "Carbon Equivalent (KgCO2)",
                     "region": "Region",
                     "country_name": "Country",
                 },
@@ -427,7 +427,6 @@ def get_energy_mix_tab():
                                 id="energy_type",
                                 options=[
                                     {"label": "Fossil", "value": "fossil"},
-                                    {"label": "Geothermal", "value": "geothermal"},
                                     {
                                         "label": "Hydroelectricity",
                                         "value": "hydroelectricity",
@@ -479,8 +478,8 @@ def get_global_emissions_choropleth_figure(self, choropleth_data):
             hover_data=[
                 "country",
                 "emissions",
+                "carbon_intensity",
                 "fossil",
-                "geothermal",
                 "hydroelectricity",
                 "nuclear",
                 "solar",
@@ -488,10 +487,10 @@ def get_global_emissions_choropleth_figure(self, choropleth_data):
             ],
             labels={
                 "country": "Country",
-                "emissions": "Carbon Equivalent (kg)",
+                "emissions": "Carbon Equivalent (KgCO2)",
+                "carbon_intensity": "Carbon Intensity (gCO2/kWh)",
                 "iso_code": "Country Code",
                 "fossil": "Fossil Energy(%)",
-                "geothermal": "Geothermal Energy (%)",
                 "hydroelectricity": "Hydroelectricity Energy (%)",
                 "nuclear": "Nuclear Energy (%)",
                 "solar": "Solar Energy (%)",
@@ -505,7 +504,6 @@ def get_global_emissions_choropleth_figure(self, choropleth_data):
     def get_global_energy_mix_choropleth_figure(self, energy_type, choropleth_data):
         energy_labels = {
             "fossil": "Fossil Energy(%)",
-            "geothermal": "Geothermal Energy (%)",
             "hydroelectricity": "Hydroelectricity Energy (%)",
             "nuclear": "Nuclear Energy (%)",
             "solar": "Solar Energy (%)",
@@ -518,7 +516,7 @@ def get_global_energy_mix_choropleth_figure(self, energy_type, choropleth_data):
             hover_data=["country", "emissions", energy_type],
             labels={
                 "country": "Country",
-                "emissions": "Carbon Equivalent (kg)",
+                "emissions": "Carbon Equivalent (KgCO2)",
                 "iso_code": "Country Code",
                 energy_type: energy_labels[energy_type],
             },
@@ -591,7 +589,7 @@ def get_regional_emissions_choropleth_figure(
             hover_data=["region_name", "emissions", "region_code"],
             labels={
                 "region_name": "Region",
-                "emissions": "Carbon Equivalent (kg)",
+                "emissions": "Carbon Equivalent (KgCO2)",
                 "region_code": "Region Code",
             },
             width=1400,
@@ -639,7 +637,7 @@ def get_project_time_series_figure(project_data: dt.DataTable):
                 y="emissions",
                 hover_data=["emissions"],
                 labels={
-                    "emissions": "Carbon Equivalent (kg)",
+                    "emissions": "Carbon Equivalent (KgCO2eq)",
                     "timestamp": "Timestamp",
                 },
             )
@@ -659,7 +657,7 @@ def get_project_emissions_bar_chart_figure(project_data: dt.DataTable):
                 y="emissions",
                 hover_data=hover_data,
                 labels={
-                    "emissions": "Carbon Equivalent (kg)",
+                    "emissions": "Carbon Equivalent (KgCO2eq)",
                     "energy_consumed": "Energy Consumed (kWh)",
                     "timestamp": "Timestamp",
                     "project_name": "Project Name",
diff --git a/codecarbon/viz/data.py b/codecarbon/viz/data.py
index c599a23eb..1d8d02f09 100644
--- a/codecarbon/viz/data.py
+++ b/codecarbon/viz/data.py
@@ -1,4 +1,4 @@
-from typing import Dict, List, Tuple
+from typing import Any, Dict, List, Tuple
 
 import pandas as pd
 import requests
@@ -14,10 +14,10 @@ def __init__(self):
         self._emissions = Emissions(self._data_source)
 
     @staticmethod
-    def get_project_data(df: pd.DataFrame, project_name) -> dt.DataTable:
+    def get_project_data(df: pd.DataFrame, project_name: str) -> dt.DataTable:
         project_df = df[df.project_name == project_name]
         project_df = project_df.sort_values(by="timestamp")
-        project_data = project_df.to_dict("rows")
+        project_data = project_df.to_dict("records")
         columns = [{"name": column, "id": column} for column in project_df.columns]
         return dt.DataTable(data=project_data, columns=columns)
 
@@ -98,13 +98,11 @@ def get_household_fraction(self, project_carbon_equivalent: float):
     def get_global_emissions_choropleth_data(
         self, net_energy_consumed: float
     ) -> List[Dict]:
-        def formatted_energy_percentage(energy_type: float, total: float) -> float:
-            return float(f"{energy_type / total * 100:.1f}")
-
         global_energy_mix = self._data_source.get_global_energy_mix_data()
         choropleth_data = []
         for country_iso_code in global_energy_mix.keys():
-            country_name = global_energy_mix[country_iso_code]["country_name"]
+            country_energy_mix = global_energy_mix[country_iso_code]
+            country_name = country_energy_mix["country_name"]
 
             if country_iso_code not in ["_define", "ATA"]:
                 from codecarbon.core.units import Energy
@@ -119,35 +117,43 @@ def formatted_energy_percentage(energy_type: float, total: float) -> float:
                         country_name=country_name, country_iso_code=country_iso_code
                     ),
                 )
-                total = global_energy_mix[country_iso_code]["total_TWh"]
-                choropleth_data.append(
-                    {
-                        "iso_code": country_iso_code,
-                        "emissions": country_emissions,
-                        "country": country_name,
-                        "fossil": formatted_energy_percentage(
-                            global_energy_mix[country_iso_code]["fossil_TWh"], total
-                        ),
-                        "geothermal": formatted_energy_percentage(
-                            global_energy_mix[country_iso_code]["geothermal_TWh"], total
-                        ),
-                        "hydroelectricity": formatted_energy_percentage(
-                            global_energy_mix[country_iso_code]["hydroelectricity_TWh"],
-                            total,
-                        ),
-                        "nuclear": formatted_energy_percentage(
-                            global_energy_mix[country_iso_code]["nuclear_TWh"], total
-                        ),
-                        "solar": formatted_energy_percentage(
-                            global_energy_mix[country_iso_code]["solar_TWh"], total
-                        ),
-                        "wind": formatted_energy_percentage(
-                            global_energy_mix[country_iso_code]["wind_TWh"], total
-                        ),
-                    }
+                country_choropleth_data = self.get_country_choropleth_data(
+                    country_energy_mix=country_energy_mix,
+                    country_name=country_name,
+                    country_iso_code=country_iso_code,
+                    country_emissions=country_emissions,
                 )
+                choropleth_data.append(country_choropleth_data)
         return choropleth_data
 
+    @staticmethod
+    def get_country_choropleth_data(
+        country_energy_mix: Dict,
+        country_name: str,
+        country_iso_code: str,
+        country_emissions: float,
+    ) -> Dict[str, Any]:
+        def format_energy_percentage(energy_type: float, total: float) -> float:
+            return float(f"{energy_type / total * 100:.1f}")
+
+        total = country_energy_mix["total_TWh"]
+        return {
+            "iso_code": country_iso_code,
+            "emissions": country_emissions,
+            "country": country_name,
+            "carbon_intensity": country_energy_mix["carbon_intensity"],
+            "fossil": format_energy_percentage(country_energy_mix["fossil_TWh"], total),
+            "hydroelectricity": format_energy_percentage(
+                country_energy_mix["hydroelectricity_TWh"],
+                total,
+            ),
+            "nuclear": format_energy_percentage(
+                country_energy_mix["nuclear_TWh"], total
+            ),
+            "solar": format_energy_percentage(country_energy_mix["solar_TWh"], total),
+            "wind": format_energy_percentage(country_energy_mix["wind_TWh"], total),
+        }
+
     def get_regional_emissions_choropleth_data(
         self, net_energy_consumed: float, country_iso_code: str
     ) -> List[Dict]:
diff --git a/dashboard/other/carbonBoard.py b/dashboard/other/carbonBoard.py
index 63423c9dc..e3dfc2885 100644
--- a/dashboard/other/carbonBoard.py
+++ b/dashboard/other/carbonBoard.py
@@ -716,7 +716,7 @@ def update_map(start_date, end_date, project, kpi):
                 "Country",
                 "Carbon intensity of electricity (gCO2/kWh)",
                 "% Fossil",
-                "% Geothermal",
+                "% Geothermal",  # TODO: Remove this line because data is unavailable
                 "% Hydro",
                 "% Nuclear",
                 "% Solar",
diff --git a/examples/emissions.csv b/examples/emissions.csv
index 7f5e42ec4..a352eed8b 100644
--- a/examples/emissions.csv
+++ b/examples/emissions.csv
@@ -1,75 +1,75 @@
 timestamp,project_name,duration,emissions,emissions_rate,cpu_power,gpu_power,ram_power,cpu_energy,gpu_energy,ram_energy,energy_consumed,country_name,country_iso_code,region,on_cloud,cloud_provider,cloud_region,,,,,,,,,,,,,,
-2020-03-23T09:26:11,project_gamma,34,8,4,8,0,1.234535,8,0,0.1565332,8,USA,USA,Ohio,Y,aws,us-east-2,,,,,,,,,,,,,,
+2020-03-23T09:26:11,project_gamma,34,8,4,8,0,1.234535,8,0,0.1565332,8,USA,USA,Ohio,N,,,,,,,,,,,,,,,,
 2020-03-24T15:26:11,project_delta,16,1,0.5,3,0,1.234535034,3,0,0.156533207,3,Taiwan,TWN,Changhua County,Y,gcp,asia-east1,,,,,,,,,,,,,,
 2020-03-25T21:26:11,project_alpha,19,1,0.5,1,0,1.234535069,1,0,0.156533215,1,Canada,CAN,Ontario,N,,,,,,,,,,,,,,,,
-2020-03-27T03:26:11,project_theta,34,8,4,5,0,1.234535103,5,0,0.156533222,5,Brazil,BRA,Sao Paulo,Y,azure,brazilsouth,,,,,,,,,,,,,,
-2020-03-28T09:26:11,project_gamma,48,8,4,7,0,1.234535137,7,0,0.156533229,7,USA,USA,Ohio,Y,aws,us-east-2,,,,,,,,,,,,,,
-2020-03-29T15:26:11,project_theta,25,7,3.5,6,0,1.234535172,6,0,0.156533236,6,Brazil,BRA,Sao Paulo,Y,azure,brazilsouth,,,,,,,,,,,,,,
+2020-03-27T03:26:11,project_theta,34,8,4,5,0,1.234535103,5,0,0.156533222,5,Brazil,BRA,Sao Paulo,N,,brazilsouth,,,,,,,,,,,,,,
+2020-03-28T09:26:11,project_gamma,48,8,4,7,0,1.234535137,7,0,0.156533229,7,USA,USA,Ohio,N,,,,,,,,,,,,,,,,
+2020-03-29T15:26:11,project_theta,25,7,3.5,6,0,1.234535172,6,0,0.156533236,6,Brazil,BRA,Sao Paulo,N,,brazilsouth,,,,,,,,,,,,,,
 2020-03-30T21:26:11,project_delta,29,6,3,8,0,1.234535206,8,0,0.156533244,8,Taiwan,TWN,Changhua County,Y,gcp,asia-east1,,,,,,,,,,,,,,
 2020-04-01T03:26:11,project_alpha,10,6,3,6,0,1.23453524,6,0,0.156533251,6,Canada,CAN,Ontario,N,,,,,,,,,,,,,,,,
 2020-04-02T09:26:11,project_alpha,13,9,4.5,9,0,1.234535274,9,0,0.156533258,9,Canada,CAN,Ontario,N,,,,,,,,,,,,,,,,
 2020-04-03T15:26:11,project_delta,35,2,1,4,0,1.234535309,4,0,0.156533265,4,Taiwan,TWN,Changhua County,Y,gcp,asia-east1,,,,,,,,,,,,,,
 2020-04-04T21:26:11,project_beta,27,7,3.5,8,0,1.234535343,8,0,0.156533273,8,Canada,CAN,Ontario,N,,,,,,,,,,,,,,,,
 2020-04-06T03:26:11,project_delta,42,7,3.5,1,0,1.234535377,1,0,0.15653328,1,Taiwan,TWN,Changhua County,Y,gcp,asia-east1,,,,,,,,,,,,,,
-2020-04-07T09:26:11,project_theta,49,7,3.5,6,0,1.234535412,6,0,0.156533287,6,Brazil,BRA,Sao Paulo,Y,azure,brazilsouth,,,,,,,,,,,,,,
-2020-04-08T15:26:11,project_gamma,49,3,1.5,9,0,1.234535446,9,0,0.156533295,9,USA,USA,Ohio,Y,aws,us-east-2,,,,,,,,,,,,,,
-2020-04-09T21:26:11,project_gamma,40,9,4.5,7,0,1.23453548,7,0,0.156533302,7,USA,USA,Ohio,Y,aws,us-east-2,,,,,,,,,,,,,,
+2020-04-07T09:26:11,project_theta,49,7,3.5,6,0,1.234535412,6,0,0.156533287,6,Brazil,BRA,Sao Paulo,N,,brazilsouth,,,,,,,,,,,,,,
+2020-04-08T15:26:11,project_gamma,49,3,1.5,9,0,1.234535446,9,0,0.156533295,9,USA,USA,Ohio,N,,,,,,,,,,,,,,,,
+2020-04-09T21:26:11,project_gamma,40,9,4.5,7,0,1.23453548,7,0,0.156533302,7,USA,USA,Ohio,N,,,,,,,,,,,,,,,,
 2020-04-11T03:26:11,project_beta,36,6,3,6,0,1.234535515,6,0,0.156533309,6,Canada,CAN,Ontario,N,,,,,,,,,,,,,,,,
 2020-04-12T09:26:11,project_beta,18,3,1.5,2,0,1.234535549,2,0,0.156533316,2,Canada,CAN,Ontario,N,,,,,,,,,,,,,,,,
-2020-04-13T15:26:11,project_theta,26,6,3,6,0,1.234535583,6,0,0.156533324,6,Brazil,BRA,Sao Paulo,Y,azure,brazilsouth,,,,,,,,,,,,,,
+2020-04-13T15:26:11,project_theta,26,6,3,6,0,1.234535583,6,0,0.156533324,6,Brazil,BRA,Sao Paulo,N,,brazilsouth,,,,,,,,,,,,,,
 2020-04-14T21:26:11,project_alpha,39,8,4,6,0,1.234535617,6,0,0.156533331,6,Canada,CAN,Ontario,N,,,,,,,,,,,,,,,,
-2020-04-16T03:26:11,project_gamma,24,2,1,8,0,1.234535652,8,0,0.156533338,8,USA,USA,Ohio,Y,aws,us-east-2,,,,,,,,,,,,,,
-2020-04-17T09:26:11,project_theta,40,8,4,5,0,1.234535686,5,0,0.156533345,5,Brazil,BRA,Sao Paulo,Y,azure,brazilsouth,,,,,,,,,,,,,,
-2020-04-18T15:26:11,project_gamma,42,4,2,1,0,1.23453572,1,0,0.156533353,1,USA,USA,Ohio,Y,aws,us-east-2,,,,,,,,,,,,,,
+2020-04-16T03:26:11,project_gamma,24,2,1,8,0,1.234535652,8,0,0.156533338,8,USA,USA,Ohio,N,,,,,,,,,,,,,,,,
+2020-04-17T09:26:11,project_theta,40,8,4,5,0,1.234535686,5,0,0.156533345,5,Brazil,BRA,Sao Paulo,N,,brazilsouth,,,,,,,,,,,,,,
+2020-04-18T15:26:11,project_gamma,42,4,2,1,0,1.23453572,1,0,0.156533353,1,USA,USA,Ohio,N,,,,,,,,,,,,,,,,
 2020-04-19T21:26:11,project_beta,12,5,2.5,4,0,1.234535755,4,0,0.15653336,4,Canada,CAN,Ontario,N,,,,,,,,,,,,,,,,
-2020-04-21T03:26:11,project_gamma,26,9,4.5,2,0,1.234535789,2,0,0.156533367,2,USA,USA,Ohio,Y,aws,us-east-2,,,,,,,,,,,,,,
+2020-04-21T03:26:11,project_gamma,26,9,4.5,2,0,1.234535789,2,0,0.156533367,2,USA,USA,Ohio,N,,,,,,,,,,,,,,,,
 2020-04-22T09:26:11,project_beta,31,4,2,2,0,1.234535823,2,0,0.156533375,2,Canada,CAN,Ontario,N,,,,,,,,,,,,,,,,
-2020-04-23T15:26:11,project_gamma,29,4,2,4,0,1.234535858,4,0,0.156533382,4,USA,USA,Ohio,Y,aws,us-east-2,,,,,,,,,,,,,,
+2020-04-23T15:26:11,project_gamma,29,4,2,4,0,1.234535858,4,0,0.156533382,4,USA,USA,Ohio,N,,,,,,,,,,,,,,,,
 2020-04-24T21:26:11,project_beta,19,2,1,7,0,1.234535892,7,0,0.156533389,7,Canada,CAN,Ontario,N,,,,,,,,,,,,,,,,
-2020-04-26T03:26:11,project_theta,39,1,0.5,4,0,1.234535926,4,0,0.156533396,4,Brazil,BRA,Sao Paulo,Y,azure,brazilsouth,,,,,,,,,,,,,,
+2020-04-26T03:26:11,project_theta,39,1,0.5,4,0,1.234535926,4,0,0.156533396,4,Brazil,BRA,Sao Paulo,N,,brazilsouth,,,,,,,,,,,,,,
 2020-04-27T09:26:11,project_delta,43,4,2,2,0,1.23453596,2,0,0.156533404,2,Taiwan,TWN,Changhua County,Y,gcp,asia-east1,,,,,,,,,,,,,,
 2020-04-28T15:26:11,project_delta,10,8,4,4,0,1.234535995,4,0,0.156533411,4,Taiwan,TWN,Changhua County,Y,gcp,asia-east1,,,,,,,,,,,,,,
-2020-04-29T21:26:11,project_gamma,19,7,3.5,9,0,1.234536029,9,0,0.156533418,9,USA,USA,Ohio,Y,aws,us-east-2,,,,,,,,,,,,,,
+2020-04-29T21:26:11,project_gamma,19,7,3.5,9,0,1.234536029,9,0,0.156533418,9,USA,USA,Ohio,N,,,,,,,,,,,,,,,,
 2020-04-31T03:26:11,project_beta,49,2,1,3,0,1.234536063,3,0,0.156533425,3,Canada,CAN,Ontario,N,,,,,,,,,,,,,,,,
 2020-05-01T09:26:11,project_alpha,37,3,1.5,2,0,1.234536098,2,0,0.156533433,2,Canada,CAN,Ontario,N,,,,,,,,,,,,,,,,
 2020-05-02T15:26:11,project_alpha,29,6,3,4,0,1.234536132,4,0,0.15653344,4,Canada,CAN,Ontario,N,,,,,,,,,,,,,,,,
-2020-05-03T21:26:11,project_theta,38,7,3.5,8,0,1.234536166,8,0,0.156533447,8,Brazil,BRA,Sao Paulo,Y,azure,brazilsouth,,,,,,,,,,,,,,
+2020-05-03T21:26:11,project_theta,38,7,3.5,8,0,1.234536166,8,0,0.156533447,8,Brazil,BRA,Sao Paulo,N,,brazilsouth,,,,,,,,,,,,,,
 2020-05-05T03:26:11,project_alpha,32,8,4,4,0,1.234536201,4,0,0.156533455,4,Canada,CAN,Ontario,N,,,,,,,,,,,,,,,,
 2020-05-06T09:26:11,project_beta,19,5,2.5,3,0,1.234536235,3,0,0.156533462,3,Canada,CAN,Ontario,N,,,,,,,,,,,,,,,,
 2020-05-07T15:26:11,project_delta,26,9,4.5,1,0,1.234536269,1,0,0.156533469,1,Taiwan,TWN,Changhua County,Y,gcp,asia-east1,,,,,,,,,,,,,,
-2020-05-08T21:26:11,project_theta,20,7,3.5,8,0,1.234536303,8,0,0.156533476,8,Brazil,BRA,Sao Paulo,Y,azure,brazilsouth,,,,,,,,,,,,,,
-2020-05-10T03:26:11,project_gamma,24,6,3,5,0,1.234536338,5,0,0.156533484,5,USA,USA,Ohio,Y,aws,us-east-2,,,,,,,,,,,,,,
+2020-05-08T21:26:11,project_theta,20,7,3.5,8,0,1.234536303,8,0,0.156533476,8,Brazil,BRA,Sao Paulo,N,,brazilsouth,,,,,,,,,,,,,,
+2020-05-10T03:26:11,project_gamma,24,6,3,5,0,1.234536338,5,0,0.156533484,5,USA,USA,Ohio,N,,,,,,,,,,,,,,,,
 2020-05-11T09:26:11,project_alpha,38,5,2.5,4,0,1.234536372,4,0,0.156533491,4,Canada,CAN,Ontario,N,,,,,,,,,,,,,,,,
 2020-05-12T15:26:11,project_alpha,41,3,1.5,5,0,1.234536406,5,0,0.156533498,5,Canada,CAN,Ontario,N,,,,,,,,,,,,,,,,
 2020-05-13T21:26:11,project_beta,47,4,2,3,0,1.234536441,3,0,0.156533505,3,Canada,CAN,Ontario,N,,,,,,,,,,,,,,,,
-2020-05-15T03:26:11,project_theta,24,9,4.5,4,0,1.234536475,4,0,0.156533513,4,Brazil,BRA,Sao Paulo,Y,azure,brazilsouth,,,,,,,,,,,,,,
+2020-05-15T03:26:11,project_theta,24,9,4.5,4,0,1.234536475,4,0,0.156533513,4,Brazil,BRA,Sao Paulo,N,,brazilsouth,,,,,,,,,,,,,,
 2020-05-16T09:26:11,project_delta,40,2,1,8,0,1.234536509,8,0,0.15653352,8,Taiwan,TWN,Changhua County,Y,gcp,asia-east1,,,,,,,,,,,,,,
 2020-05-17T15:26:11,project_delta,16,5,2.5,8,0,1.234536544,8,0,0.156533527,8,Taiwan,TWN,Changhua County,Y,gcp,asia-east1,,,,,,,,,,,,,,
-2020-05-18T21:26:11,project_gamma,40,2,1,2,0,1.234536578,2,0,0.156533535,2,USA,USA,Ohio,Y,aws,us-east-2,,,,,,,,,,,,,,
-2020-05-20T03:26:11,project_theta,13,5,2.5,5,0,1.234536612,5,0,0.156533542,5,Brazil,BRA,Sao Paulo,Y,azure,brazilsouth,,,,,,,,,,,,,,
-2020-05-21T09:26:11,project_theta,11,4,2,4,0,1.234536646,4,0,0.156533549,4,Brazil,BRA,Sao Paulo,Y,azure,brazilsouth,,,,,,,,,,,,,,
+2020-05-18T21:26:11,project_gamma,40,2,1,2,0,1.234536578,2,0,0.156533535,2,USA,USA,Ohio,N,,,,,,,,,,,,,,,,
+2020-05-20T03:26:11,project_theta,13,5,2.5,5,0,1.234536612,5,0,0.156533542,5,Brazil,BRA,Sao Paulo,N,,brazilsouth,,,,,,,,,,,,,,
+2020-05-21T09:26:11,project_theta,11,4,2,4,0,1.234536646,4,0,0.156533549,4,Brazil,BRA,Sao Paulo,N,,brazilsouth,,,,,,,,,,,,,,
 2020-05-22T15:26:11,project_delta,23,7,3.5,6,0,1.234536681,6,0,0.156533556,6,Taiwan,TWN,Changhua County,Y,gcp,asia-east1,,,,,,,,,,,,,,
 2020-05-23T21:26:11,project_alpha,45,8,4,5,0,1.234536715,5,0,0.156533564,5,Canada,CAN,Ontario,N,,,,,,,,,,,,,,,,
 2020-05-25T03:26:11,project_delta,18,7,3.5,1,0,1.234536749,1,0,0.156533571,1,Taiwan,TWN,Changhua County,Y,gcp,asia-east1,,,,,,,,,,,,,,
 2020-05-26T09:26:11,project_beta,19,9,4.5,8,0,1.234536784,8,0,0.156533578,8,Canada,CAN,Ontario,N,,,,,,,,,,,,,,,,
 2020-05-27T15:26:11,project_delta,33,4,2,4,0,1.234536818,4,0,0.156533585,4,Taiwan,TWN,Changhua County,Y,gcp,asia-east1,,,,,,,,,,,,,,
 2020-05-28T21:26:11,project_alpha,15,4,2,3,0,1.234536852,3,0,0.156533593,3,Canada,CAN,Ontario,N,,,,,,,,,,,,,,,,
-2020-05-30T03:26:11,project_gamma,45,4,2,2,0,1.234536887,2,0,0.1565336,2,USA,USA,Ohio,Y,aws,us-east-2,,,,,,,,,,,,,,
-2020-06-01T09:26:11,project_gamma,15,6,3,8,0,1.234536921,8,0,0.156533607,8,USA,USA,Ohio,Y,aws,us-east-2,,,,,,,,,,,,,,
+2020-05-30T03:26:11,project_gamma,45,4,2,2,0,1.234536887,2,0,0.1565336,2,USA,USA,Ohio,N,,,,,,,,,,,,,,,,
+2020-06-01T09:26:11,project_gamma,15,6,3,8,0,1.234536921,8,0,0.156533607,8,USA,USA,Ohio,N,,,,,,,,,,,,,,,,
 2020-06-02T15:26:11,project_alpha,45,4,2,2,0,1.234536955,2,0,0.156533615,2,Canada,CAN,Ontario,N,,,,,,,,,,,,,,,,
 2020-06-03T21:26:11,project_delta,44,1,0.5,3,0,1.234536989,3,0,0.156533622,3,Taiwan,TWN,Changhua County,Y,gcp,asia-east1,,,,,,,,,,,,,,
 2020-06-05T03:26:11,project_delta,48,4,2,7,0,1.234537024,7,0,0.156533629,7,Taiwan,TWN,Changhua County,Y,gcp,asia-east1,,,,,,,,,,,,,,
 2020-06-06T09:26:11,project_delta,11,5,2.5,3,0,1.234537058,3,0,0.156533636,3,Taiwan,TWN,Changhua County,Y,gcp,asia-east1,,,,,,,,,,,,,,
 2020-06-07T15:26:11,project_delta,21,1,0.5,7,0,1.234537092,7,0,0.156533644,7,Taiwan,TWN,Changhua County,Y,gcp,asia-east1,,,,,,,,,,,,,,
-2020-06-08T21:26:11,project_theta,43,2,1,2,0,1.234537127,2,0,0.156533651,2,Brazil,BRA,Sao Paulo,Y,azure,brazilsouth,,,,,,,,,,,,,,
+2020-06-08T21:26:11,project_theta,43,2,1,2,0,1.234537127,2,0,0.156533651,2,Brazil,BRA,Sao Paulo,N,,brazilsouth,,,,,,,,,,,,,,
 2020-06-10T03:26:11,project_alpha,19,8,4,5,0,1.234537161,5,0,0.156533658,5,Canada,CAN,Ontario,N,,,,,,,,,,,,,,,,
 2020-06-11T09:26:11,project_alpha,20,9,4.5,3,0,1.234537195,3,0,0.156533665,3,Canada,CAN,Ontario,N,,,,,,,,,,,,,,,,
-2020-06-12T15:26:11,project_theta,19,1,0.5,5,0,1.23453723,5,0,0.156533673,5,Brazil,BRA,Sao Paulo,Y,azure,brazilsouth,,,,,,,,,,,,,,
+2020-06-12T15:26:11,project_theta,19,1,0.5,5,0,1.23453723,5,0,0.156533673,5,Brazil,BRA,Sao Paulo,N,,brazilsouth,,,,,,,,,,,,,,
 2020-06-13T21:26:11,project_alpha,48,4,2,4,0,1.234537264,4,0,0.15653368,4,Canada,CAN,Ontario,N,,,,,,,,,,,,,,,,
 2020-06-15T03:26:11,project_alpha,48,2,1,9,0,1.234537298,9,0,0.156533687,9,Canada,CAN,Ontario,N,,,,,,,,,,,,,,,,
 2020-06-16T09:26:11,project_delta,18,9,4.5,3,0,1.234537332,3,0,0.156533695,3,Taiwan,TWN,Changhua County,Y,gcp,asia-east1,,,,,,,,,,,,,,
-2020-06-17T15:26:11,project_theta,38,7,3.5,7,0,1.234537367,7,0,0.156533702,7,Brazil,BRA,Sao Paulo,Y,azure,brazilsouth,,,,,,,,,,,,,,
-2020-06-18T21:26:11,project_gamma,36,5,2.5,7,0,1.234537401,7,0,0.156533709,7,USA,USA,Ohio,Y,aws,us-east-2,,,,,,,,,,,,,,
+2020-06-17T15:26:11,project_theta,38,7,3.5,7,0,1.234537367,7,0,0.156533702,7,Brazil,BRA,Sao Paulo,N,,brazilsouth,,,,,,,,,,,,,,
+2020-06-18T21:26:11,project_gamma,36,5,2.5,7,0,1.234537401,7,0,0.156533709,7,USA,USA,Ohio,N,,,,,,,,,,,,,,,,
 2020-06-20T03:26:11,project_delta,15,2,1,7,0,1.234537435,7,0,0.156533716,7,Taiwan,TWN,Changhua County,Y,gcp,asia-east1,,,,,,,,,,,,,,
 2020-06-21T09:26:11,project_alpha,41,4,2,6,0,1.23453747,6,0,0.156533724,6,Canada,CAN,Ontario,N,,,,,,,,,,,,,,,,
 2020-06-22T15:26:11,project_alpha,11,4,2,6,0,1.234537504,6,0,0.156533731,6,Canada,CAN,Ontario,N,,,,,,,,,,,,,,,,
@@ -78,24 +78,24 @@ timestamp,project_name,duration,emissions,emissions_rate,cpu_power,gpu_power,ram
 2020-06-26T09:26:11,project_beta,19,9,4.5,4,0,1.234537607,4,0,0.156533753,4,Canada,CAN,Ontario,N,,,,,,,,,,,,,,,,
 2020-06-27T15:26:11,project_alpha,39,2,1,7,0,1.234537641,7,0,0.15653376,7,Canada,CAN,Ontario,N,,,,,,,,,,,,,,,,
 2020-06-28T21:26:11,project_alpha,11,7,3.5,1,0,1.234537675,1,0,0.156533767,1,Canada,CAN,Ontario,N,,,,,,,,,,,,,,,,
-2020-06-30T03:26:11,project_gamma,46,9,4.5,1,0,1.23453771,1,0,0.156533775,1,USA,USA,Ohio,Y,aws,us-east-2,,,,,,,,,,,,,,
+2020-06-30T03:26:11,project_gamma,46,9,4.5,1,0,1.23453771,1,0,0.156533775,1,USA,USA,Ohio,N,,,,,,,,,,,,,,,,
 2020-06-31T09:26:11,project_alpha,23,2,1,9,0,1.234537744,9,0,0.156533782,9,Canada,CAN,Ontario,N,,,,,,,,,,,,,,,,
 2020-07-01T15:26:11,project_beta,34,7,3.5,8,0,1.234537778,8,0,0.156533789,8,Canada,CAN,Ontario,N,,,,,,,,,,,,,,,,
-2020-07-02T21:26:11,project_gamma,40,1,0.5,5,0,1.234537813,5,0,0.156533796,5,USA,USA,Ohio,Y,aws,us-east-2,,,,,,,,,,,,,,
-2020-07-04T03:26:11,project_gamma,34,7,3.5,7,0,1.234537847,7,0,0.156533804,7,USA,USA,Ohio,Y,aws,us-east-2,,,,,,,,,,,,,,
+2020-07-02T21:26:11,project_gamma,40,1,0.5,5,0,1.234537813,5,0,0.156533796,5,USA,USA,Ohio,N,,,,,,,,,,,,,,,,
+2020-07-04T03:26:11,project_gamma,34,7,3.5,7,0,1.234537847,7,0,0.156533804,7,USA,USA,Ohio,N,,,,,,,,,,,,,,,,
 2020-07-05T09:26:11,project_delta,39,9,4.5,3,0,1.234537881,3,0,0.156533811,3,Taiwan,TWN,Changhua County,Y,gcp,asia-east1,,,,,,,,,,,,,,
-2020-07-06T15:26:11,project_theta,49,5,2.5,3,0,1.234537916,3,0,0.156533818,3,Brazil,BRA,Sao Paulo,Y,azure,brazilsouth,,,,,,,,,,,,,,
-2020-07-07T21:26:11,project_gamma,42,8,4,9,0,1.23453795,9,0,0.156533825,9,USA,USA,Ohio,Y,aws,us-east-2,,,,,,,,,,,,,,
+2020-07-06T15:26:11,project_theta,49,5,2.5,3,0,1.234537916,3,0,0.156533818,3,Brazil,BRA,Sao Paulo,N,,brazilsouth,,,,,,,,,,,,,,
+2020-07-07T21:26:11,project_gamma,42,8,4,9,0,1.23453795,9,0,0.156533825,9,USA,USA,Ohio,N,,,,,,,,,,,,,,,,
 2020-07-09T03:26:11,project_delta,48,8,4,6,0,1.234537984,6,0,0.156533833,6,Taiwan,TWN,Changhua County,Y,gcp,asia-east1,,,,,,,,,,,,,,
-2020-07-10T09:26:11,project_theta,31,6,3,4,0,1.234538018,4,0,0.15653384,4,Brazil,BRA,Sao Paulo,Y,azure,brazilsouth,,,,,,,,,,,,,,
+2020-07-10T09:26:11,project_theta,31,6,3,4,0,1.234538018,4,0,0.15653384,4,Brazil,BRA,Sao Paulo,N,,brazilsouth,,,,,,,,,,,,,,
 2020-07-11T15:26:11,project_delta,21,2,1,6,0,1.234538053,6,0,0.156533847,6,Taiwan,TWN,Changhua County,Y,gcp,asia-east1,,,,,,,,,,,,,,
-2020-07-12T21:26:11,project_gamma,35,3,1.5,1,0,1.234538087,1,0,0.156533855,1,USA,USA,Ohio,Y,aws,us-east-2,,,,,,,,,,,,,,
-2020-07-14T03:26:11,project_theta,20,1,0.5,8,0,1.234538121,8,0,0.156533862,8,Brazil,BRA,Sao Paulo,Y,azure,brazilsouth,,,,,,,,,,,,,,
-2020-07-15T09:26:11,project_gamma,31,6,3,1,0,1.234538156,1,0,0.156533869,1,USA,USA,Ohio,Y,aws,us-east-2,,,,,,,,,,,,,,
-2020-07-16T15:26:11,project_gamma,48,5,2.5,4,0,1.23453819,4,0,0.156533876,4,USA,USA,Ohio,Y,aws,us-east-2,,,,,,,,,,,,,,
+2020-07-12T21:26:11,project_gamma,35,3,1.5,1,0,1.234538087,1,0,0.156533855,1,USA,USA,Ohio,N,,,,,,,,,,,,,,,,
+2020-07-14T03:26:11,project_theta,20,1,0.5,8,0,1.234538121,8,0,0.156533862,8,Brazil,BRA,Sao Paulo,N,,brazilsouth,,,,,,,,,,,,,,
+2020-07-15T09:26:11,project_gamma,31,6,3,1,0,1.234538156,1,0,0.156533869,1,USA,USA,Ohio,N,,,,,,,,,,,,,,,,
+2020-07-16T15:26:11,project_gamma,48,5,2.5,4,0,1.23453819,4,0,0.156533876,4,USA,USA,Ohio,N,,,,,,,,,,,,,,,,
 2020-07-17T21:26:11,project_beta,16,7,3.5,8,0,1.234538224,8,0,0.156533884,8,Canada,CAN,Ontario,N,,,,,,,,,,,,,,,,
 2020-07-19T03:26:11,project_delta,38,9,4.5,2,0,1.234538259,2,0,0.156533891,2,Taiwan,TWN,Changhua County,Y,gcp,asia-east1,,,,,,,,,,,,,,
-2020-07-20T09:26:11,project_gamma,45,4,2,9,0,1.234538293,9,0,0.156533898,9,USA,USA,Ohio,Y,aws,us-east-2,,,,,,,,,,,,,,
+2020-07-20T09:26:11,project_gamma,45,4,2,9,0,1.234538293,9,0,0.156533898,9,USA,USA,Ohio,N,,,,,,,,,,,,,,,,
 2020-07-21T15:26:11,project_beta,14,1,0.5,8,0,1.234538327,8,0,0.156533905,8,Canada,CAN,Ontario,N,,,,,,,,,,,,,,,,
 2020-07-22T21:26:11,project_alpha,48,4,2,6,0,1.234538361,6,0,0.156533913,6,Canada,CAN,Ontario,N,,,,,,,,,,,,,,,,
-2020-07-24T03:26:11,project_theta,32,8,4,5,0,1.234538396,5,0,0.15653392,5,Brazil,BRA,Sao Paulo,Y,azure,brazilsouth2021-07-14T10:59:36,codecarbon,3565.51492,0.027399096,2.6775,0,1.533303325,0.022284099,0,0.012761264,0.035045363,Morocco,MAR,casablanca-settat,N
\ No newline at end of file
+2020-07-24T03:26:11,project_theta,32,8,4,5,0,1.234538396,5,0,0.15653392,5,Brazil,BRA,Sao Paulo,N,,brazilsouth,,,,,,,,,,,,,,
\ No newline at end of file
diff --git a/setup.py b/setup.py
index c6dcc2a6f..b1ea5e0df 100644
--- a/setup.py
+++ b/setup.py
@@ -20,7 +20,7 @@
 
 setuptools.setup(
     name="codecarbon",
-    version="2.2.6",
+    version="2.2.7",
     author="Mila, DataForGood, BCG GAMMA, Comet.ml, Haverford College",
     long_description=long_description,
     long_description_content_type="text/markdown",
@@ -54,7 +54,7 @@
             "viz/assets/*.png",
         ],
     },
-    python_requires=">3.6",
+    python_requires=">=3.7",
     entry_points={
         "console_scripts": [
             "carbonboard = codecarbon.viz.carbonboard:main",


Test patch:
diff --git a/tests/test_emissions.py b/tests/test_emissions.py
index c4fcaba98..909497a6e 100644
--- a/tests/test_emissions.py
+++ b/tests/test_emissions.py
@@ -66,7 +66,7 @@ def test_get_emissions_PRIVATE_INFRA_FRA(self):
 
         # THEN
         assert isinstance(emissions, float)
-        self.assertAlmostEqual(emissions, 0.055, places=2)
+        self.assertAlmostEqual(emissions, 67.39 / 1000, places=2)
 
     def test_get_emissions_PRIVATE_INFRA_JOR(self):
         """
diff --git a/tests/test_viz_data.py b/tests/test_viz_data.py
new file mode 100644
index 000000000..54d9affe5
--- /dev/null
+++ b/tests/test_viz_data.py
@@ -0,0 +1,97 @@
+from pathlib import Path
+from typing import Any, Dict
+
+import pandas as pd
+import pytest
+from dash import dash_table as dt
+
+from codecarbon.input import DataSource
+from codecarbon.viz import data
+
+
+@pytest.fixture
+def emissions_data() -> pd.DataFrame:
+    tests_path = Path(__file__).parent
+    return pd.read_csv(tests_path / "test_data/emissions_valid_headers.csv")
+
+
+@pytest.fixture
+def global_energy_mix_data() -> Dict[str, Dict[str, Any]]:
+    return DataSource().get_global_energy_mix_data()
+
+
+def test_get_project_data(emissions_data: pd.DataFrame):
+    viz_data = data.Data()
+    project_data = viz_data.get_project_data(emissions_data, project_name="codecarbon")
+    assert isinstance(project_data, dt.DataTable)
+    assert project_data.columns == [
+        {"name": column, "id": column} for column in emissions_data.columns
+    ]
+    pd.testing.assert_frame_equal(pd.DataFrame(project_data.data), emissions_data)
+
+
+def test_get_global_emissions_choropleth_data(
+    global_energy_mix_data: Dict[str, Dict[str, Any]]
+):
+    viz_data = data.Data()
+    choropleth_data = viz_data.get_global_emissions_choropleth_data(
+        net_energy_consumed=100
+    )
+    assert sorted([row["iso_code"] for row in choropleth_data]) == sorted(
+        global_energy_mix_data.keys()
+    )
+    expected_keys = [
+        "iso_code",
+        "emissions",
+        "country",
+        "carbon_intensity",
+        "fossil",
+        "hydroelectricity",
+        "nuclear",
+        "solar",
+        "wind",
+    ]
+    assert all(list(row.keys()) == expected_keys for row in choropleth_data)
+
+
+def test_get_country_choropleth_data():
+    input_country_energy_mix = {
+        "biofuel_TWh": 20.0,
+        "carbon_intensity": 200,
+        "coal_TWh": 50.0,
+        "country_name": "Test",
+        "fossil_TWh": 200.0,
+        "gas_TWh": 120.0,
+        "hydroelectricity_TWh": 200.0,
+        "iso_code": "TST",
+        "low_carbon_TWh": 110.0,
+        "nuclear_TWh": 200.0,
+        "oil_TWh": 30.0,
+        "other_renewable_TWh": 25.0,
+        "other_renewable_exc_biofuel_TWh": 5.0,
+        "per_capita_TWh": 50.0,
+        "renewables_TWh": 600.0,
+        "solar_TWh": 275.0,
+        "total_TWh": 1000.0,
+        "wind_TWh": 100.0,
+        "year": 2021,
+    }
+    expected_choropleth_data = {
+        "iso_code": "TST",
+        "emissions": 100,
+        "carbon_intensity": 200,
+        "country": "Test",
+        "fossil": 20.0,
+        "hydroelectricity": 20.0,
+        "nuclear": 20.0,
+        "solar": 27.5,
+        "wind": 10.0,
+    }
+    viz_data = data.Data()
+    output_choropleth_data = viz_data.get_country_choropleth_data(
+        country_energy_mix=input_country_energy_mix,
+        country_name="Test",
+        country_iso_code="TST",
+        country_emissions=100,
+    )
+    assert output_choropleth_data == expected_choropleth_data