npm - @digital4better/data - Versions diffs - 1.3.4 → 1.3.6 - Mend

@digital4better/data 1.3.4 → 1.3.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (67) hide show

package/data/cloud/aws-vms.csv +5 -0
package/data/cloud/aws-vms.json +80 -0
package/data/factor/continent-monthly-green.csv +321 -321
package/data/factor/continent-monthly-green.json +2503 -2503
package/data/factor/continent-monthly.csv +370 -370
package/data/factor/continent-monthly.json +2457 -2457
package/data/factor/continent-yearly-green.csv +34 -34
package/data/factor/continent-yearly-green.json +255 -255
package/data/factor/continent-yearly.csv +35 -35
package/data/factor/continent-yearly.json +249 -249
package/data/factor/country-monthly-green.csv +4788 -4788
package/data/factor/country-monthly-green.json +40479 -40479
package/data/factor/country-monthly.csv +5144 -5144
package/data/factor/country-monthly.json +41699 -41699
package/data/factor/country-yearly-green.csv +566 -566
package/data/factor/country-yearly-green.json +4779 -4779
package/data/factor/country-yearly.csv +573 -573
package/data/factor/country-yearly.json +4638 -4638
package/data/factor/subdivision-monthly-green.csv +39 -39
package/data/factor/subdivision-monthly-green.json +339 -339
package/data/factor/subdivision-monthly.csv +39 -39
package/data/factor/subdivision-monthly.json +342 -342
package/data/factor/subdivision-yearly-green.csv +63 -63
package/data/factor/subdivision-yearly-green.json +332 -332
package/data/factor/subdivision-yearly.csv +60 -60
package/data/factor/subdivision-yearly.json +258 -258
package/data/factor/world-monthly-green.csv +78 -78
package/data/factor/world-monthly-green.json +700 -700
package/data/factor/world-monthly.csv +78 -78
package/data/factor/world-monthly.json +702 -702
package/data/factor/world-yearly-green.csv +7 -7
package/data/factor/world-yearly-green.json +63 -63
package/data/factor/world-yearly.csv +7 -7
package/data/factor/world-yearly.json +63 -63
package/data/mix/continent-monthly-green.csv +177 -177
package/data/mix/continent-monthly-green.json +411 -411
package/data/mix/continent-monthly.csv +177 -177
package/data/mix/continent-monthly.json +884 -884
package/data/mix/continent-yearly-green.csv +20 -20
package/data/mix/continent-yearly-green.json +46 -46
package/data/mix/continent-yearly.csv +20 -20
package/data/mix/continent-yearly.json +98 -98
package/data/mix/country-monthly-green.csv +4154 -4154
package/data/mix/country-monthly-green.json +9543 -9543
package/data/mix/country-monthly.csv +4154 -4154
package/data/mix/country-monthly.json +14936 -14936
package/data/mix/country-yearly-green.csv +430 -430
package/data/mix/country-yearly-green.json +1017 -1017
package/data/mix/country-yearly.csv +430 -430
package/data/mix/country-yearly.json +1619 -1619
package/data/mix/subdivision-monthly-green.csv +27 -27
package/data/mix/subdivision-monthly-green.json +48 -48
package/data/mix/subdivision-monthly.csv +27 -27
package/data/mix/subdivision-monthly.json +96 -96
package/data/mix/subdivision-yearly-green.csv +12 -12
package/data/mix/subdivision-yearly-green.json +35 -35
package/data/mix/subdivision-yearly.csv +12 -12
package/data/mix/subdivision-yearly.json +53 -53
package/data/mix/world-monthly-green.csv +76 -76
package/data/mix/world-monthly-green.json +185 -185
package/data/mix/world-monthly.csv +76 -76
package/data/mix/world-monthly.json +265 -265
package/data/mix/world-yearly-green.csv +7 -7
package/data/mix/world-yearly-green.json +15 -15
package/data/mix/world-yearly.csv +7 -7
package/data/mix/world-yearly.json +27 -27
package/package.json +2 -2

package/data/mix/country-yearly-green.json CHANGED Viewed

@@ -45,46 +45,46 @@
   },
   "AF": {
     "2019": {
-      "Bioenergy": 0.0316,
-      "Hydro": 0.7956,
+      "Bioenergy": 0.0318,
+      "Hydro": 0.7955,
       "Solar": 0.0883,
       "Wind": 0.0845
     },
     "2020": {
-      "Bioenergy": 0.0343,
-      "Hydro": 0.7782,
+      "Bioenergy": 0.0344,
+      "Hydro": 0.7781,
       "Solar": 0.0968,
       "Wind": 0.0907
     },
     "2021": {
-      "Bioenergy": 0.0377,
-      "Hydro": 0.7444,
+      "Bioenergy": 0.0378,
+      "Hydro": 0.7443,
       "Solar": 0.1063,
       "Wind": 0.1116
     },
     "2022": {
-      "Bioenergy": 0.0397,
-      "Hydro": 0.7196,
+      "Bioenergy": 0.0398,
+      "Hydro": 0.7195,
       "Solar": 0.1204,
-      "Wind": 0.1203
+      "Wind": 0.1202
     },
     "2023": {
-      "Bioenergy": 0.041,
-      "Hydro": 0.6877,
+      "Bioenergy": 0.0411,
+      "Hydro": 0.6876,
       "Solar": 0.1392,
       "Wind": 0.1321
     },
     "2024": {
-      "Bioenergy": 0.0379,
+      "Bioenergy": 0.038,
       "Hydro": 0.6672,
       "Solar": 0.1617,
-      "Wind": 0.1332
+      "Wind": 0.1331
     },
     "2025": {
-      "Bioenergy": 0.0368,
-      "Hydro": 0.6047,
-      "Solar": 0.1954,
-      "Wind": 0.1631
+      "Bioenergy": 0.0361,
+      "Hydro": 0.6112,
+      "Solar": 0.1943,
+      "Wind": 0.1583
     }
   },
   "AG": {
@@ -135,44 +135,44 @@
     "2019": {
       "Bioenergy": 0.0112,
       "Hydro": 0.9356,
-      "Solar": 0.016,
+      "Solar": 0.0159,
       "Wind": 0.0372
     },
     "2020": {
       "Bioenergy": 0.0117,
       "Hydro": 0.9276,
       "Solar": 0.0186,
-      "Wind": 0.0422
+      "Wind": 0.0421
     },
     "2021": {
-      "Bioenergy": 0.012,
-      "Hydro": 0.9285,
+      "Bioenergy": 0.0121,
+      "Hydro": 0.9284,
       "Solar": 0.0196,
       "Wind": 0.0399
     },
     "2022": {
-      "Bioenergy": 0.012,
-      "Hydro": 0.9188,
-      "Solar": 0.0237,
+      "Bioenergy": 0.0121,
+      "Hydro": 0.9186,
+      "Solar": 0.0239,
       "Wind": 0.0454
     },
     "2023": {
       "Bioenergy": 0.0109,
-      "Hydro": 0.9119,
-      "Solar": 0.0278,
+      "Hydro": 0.9115,
+      "Solar": 0.0282,
       "Wind": 0.0494
     },
     "2024": {
       "Bioenergy": 0.011,
-      "Hydro": 0.907,
-      "Solar": 0.0324,
-      "Wind": 0.0497
+      "Hydro": 0.9065,
+      "Solar": 0.0329,
+      "Wind": 0.0496
     },
     "2025": {
-      "Bioenergy": 0.0114,
-      "Hydro": 0.9033,
-      "Solar": 0.0385,
-      "Wind": 0.0468
+      "Bioenergy": 0.0108,
+      "Hydro": 0.9027,
+      "Solar": 0.0393,
+      "Wind": 0.0472
     }
   },
   "AM": {
@@ -291,7 +291,7 @@
     "2023": {
       "Bioenergy": 0.0191,
       "Hydro": 0.6869,
-      "Solar": 0.0565,
+      "Solar": 0.0566,
       "Wind": 0.2375
     },
     "2024": {
@@ -301,10 +301,10 @@
       "Wind": 0.2828
     },
     "2025": {
-      "Bioenergy": 0.027,
-      "Hydro": 0.5379,
-      "Solar": 0.0924,
-      "Wind": 0.3426
+      "Bioenergy": 0.0276,
+      "Hydro": 0.5458,
+      "Solar": 0.086,
+      "Wind": 0.3407
     }
   },
   "AS": {
@@ -367,7 +367,7 @@
     "2021": {
       "Bioenergy": 0.0331,
       "Hydro": 0.765,
-      "Solar": 0.0506,
+      "Solar": 0.0507,
       "Wind": 0.1513
     },
     "2022": {
@@ -379,20 +379,20 @@
     "2023": {
       "Bioenergy": 0.0269,
       "Hydro": 0.7237,
-      "Solar": 0.0931,
-      "Wind": 0.1563
+      "Solar": 0.0932,
+      "Wind": 0.1562
     },
     "2024": {
       "Bioenergy": 0.0307,
       "Hydro": 0.7002,
-      "Solar": 0.1179,
+      "Solar": 0.118,
       "Wind": 0.1511
     },
     "2025": {
-      "Bioenergy": 0.04,
-      "Hydro": 0.6301,
-      "Solar": 0.1733,
-      "Wind": 0.1566
+      "Bioenergy": 0.0377,
+      "Hydro": 0.6263,
+      "Solar": 0.1795,
+      "Wind": 0.1565
     }
   },
   "AU": {
@@ -433,10 +433,10 @@
       "Wind": 0.3444
     },
     "2025": {
-      "Bioenergy": 0.002,
-      "Hydro": 0.1294,
-      "Solar": 0.5186,
-      "Wind": 0.3499
+      "Bioenergy": 0.0024,
+      "Hydro": 0.1323,
+      "Solar": 0.5097,
+      "Wind": 0.3555
     }
   },
   "AW": {
@@ -566,9 +566,9 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.8959,
-      "Solar": 0.0659,
-      "Wind": 0.0382
+      "Hydro": 0.8846,
+      "Solar": 0.0775,
+      "Wind": 0.038
     }
   },
   "BB": {
@@ -617,46 +617,46 @@
   },
   "BD": {
     "2019": {
-      "Bioenergy": 0.0426,
-      "Hydro": 0.7252,
+      "Bioenergy": 0.0428,
+      "Hydro": 0.725,
       "Solar": 0.117,
       "Wind": 0.1152
     },
     "2020": {
-      "Bioenergy": 0.0464,
-      "Hydro": 0.7045,
+      "Bioenergy": 0.0465,
+      "Hydro": 0.7044,
       "Solar": 0.1262,
       "Wind": 0.1229
     },
     "2021": {
-      "Bioenergy": 0.0502,
-      "Hydro": 0.6002,
-      "Solar": 0.2002,
+      "Bioenergy": 0.0504,
+      "Hydro": 0.6001,
+      "Solar": 0.2001,
       "Wind": 0.1494
     },
     "2022": {
-      "Bioenergy": 0.0502,
-      "Hydro": 0.5478,
+      "Bioenergy": 0.0504,
+      "Hydro": 0.5477,
       "Solar": 0.2485,
       "Wind": 0.1534
     },
     "2023": {
-      "Bioenergy": 0.0604,
-      "Hydro": 0.4507,
+      "Bioenergy": 0.0605,
+      "Hydro": 0.4506,
       "Solar": 0.2955,
       "Wind": 0.1934
     },
     "2024": {
-      "Bioenergy": 0.0503,
+      "Bioenergy": 0.0504,
       "Hydro": 0.4304,
-      "Solar": 0.3425,
-      "Wind": 0.1769
+      "Solar": 0.3423,
+      "Wind": 0.1768
     },
     "2025": {
-      "Bioenergy": 0.0522,
-      "Hydro": 0.235,
-      "Solar": 0.4806,
-      "Wind": 0.2322
+      "Bioenergy": 0.051,
+      "Hydro": 0.2507,
+      "Solar": 0.4743,
+      "Wind": 0.2241
     }
   },
   "BE": {
@@ -685,66 +685,66 @@
       "Wind": 0.5695
     },
     "2023": {
-      "Bioenergy": 0.0432,
+      "Bioenergy": 0.0431,
       "Hydro": 0.0392,
-      "Solar": 0.3077,
-      "Wind": 0.6099
+      "Solar": 0.3078,
+      "Wind": 0.6098
     },
     "2024": {
       "Bioenergy": 0.0361,
-      "Hydro": 0.0794,
-      "Solar": 0.3412,
-      "Wind": 0.5432
+      "Hydro": 0.0793,
+      "Solar": 0.3416,
+      "Wind": 0.5429
     },
     "2025": {
-      "Bioenergy": 0.0365,
-      "Hydro": 0.082,
-      "Solar": 0.4398,
-      "Wind": 0.4417
+      "Bioenergy": 0.0364,
+      "Hydro": 0.0801,
+      "Solar": 0.442,
+      "Wind": 0.4415
     }
   },
   "BF": {
     "2019": {
-      "Bioenergy": 0.1342,
-      "Hydro": 0.5978,
-      "Solar": 0.2175,
-      "Wind": 0.0505
+      "Bioenergy": 0.1346,
+      "Hydro": 0.5968,
+      "Solar": 0.218,
+      "Wind": 0.0506
     },
     "2020": {
-      "Bioenergy": 0.1342,
-      "Hydro": 0.5978,
-      "Solar": 0.2175,
-      "Wind": 0.0505
+      "Bioenergy": 0.1346,
+      "Hydro": 0.5968,
+      "Solar": 0.218,
+      "Wind": 0.0506
     },
     "2021": {
-      "Bioenergy": 0.1342,
-      "Hydro": 0.5978,
-      "Solar": 0.2175,
-      "Wind": 0.0505
+      "Bioenergy": 0.1346,
+      "Hydro": 0.5968,
+      "Solar": 0.218,
+      "Wind": 0.0506
     },
     "2022": {
-      "Bioenergy": 0.1342,
-      "Hydro": 0.5978,
-      "Solar": 0.2175,
-      "Wind": 0.0505
+      "Bioenergy": 0.1346,
+      "Hydro": 0.5968,
+      "Solar": 0.218,
+      "Wind": 0.0506
     },
     "2023": {
-      "Bioenergy": 0.1342,
-      "Hydro": 0.5978,
-      "Solar": 0.2175,
-      "Wind": 0.0505
+      "Bioenergy": 0.1346,
+      "Hydro": 0.5968,
+      "Solar": 0.218,
+      "Wind": 0.0506
     },
     "2024": {
-      "Bioenergy": 0.1342,
-      "Hydro": 0.5978,
-      "Solar": 0.2175,
-      "Wind": 0.0505
+      "Bioenergy": 0.1346,
+      "Hydro": 0.5968,
+      "Solar": 0.218,
+      "Wind": 0.0506
     },
     "2025": {
-      "Bioenergy": 0.1342,
-      "Hydro": 0.5978,
-      "Solar": 0.2175,
-      "Wind": 0.0505
+      "Bioenergy": 0.1346,
+      "Hydro": 0.5968,
+      "Solar": 0.218,
+      "Wind": 0.0506
     }
   },
   "BG": {
@@ -774,21 +774,21 @@
     },
     "2023": {
       "Bioenergy": 0.0234,
-      "Hydro": 0.3932,
-      "Solar": 0.3896,
+      "Hydro": 0.3931,
+      "Solar": 0.3897,
       "Wind": 0.1938
     },
     "2024": {
       "Bioenergy": 0.0171,
       "Hydro": 0.3196,
-      "Solar": 0.5031,
-      "Wind": 0.1602
+      "Solar": 0.5032,
+      "Wind": 0.1601
     },
     "2025": {
-      "Bioenergy": 0.0124,
-      "Hydro": 0.2901,
-      "Solar": 0.5684,
-      "Wind": 0.1291
+      "Bioenergy": 0.0119,
+      "Hydro": 0.2711,
+      "Solar": 0.5918,
+      "Wind": 0.1252
     }
   },
   "BH": {
@@ -881,46 +881,46 @@
   },
   "BJ": {
     "2019": {
-      "Bioenergy": 0.0176,
-      "Hydro": 0.7723,
-      "Solar": 0.1038,
-      "Wind": 0.1063
+      "Bioenergy": 0.0177,
+      "Hydro": 0.7711,
+      "Solar": 0.1043,
+      "Wind": 0.1069
     },
     "2020": {
-      "Bioenergy": 0.0176,
-      "Hydro": 0.7723,
-      "Solar": 0.1038,
-      "Wind": 0.1063
+      "Bioenergy": 0.0177,
+      "Hydro": 0.7711,
+      "Solar": 0.1043,
+      "Wind": 0.1069
     },
     "2021": {
-      "Bioenergy": 0.0176,
-      "Hydro": 0.7723,
-      "Solar": 0.1038,
-      "Wind": 0.1063
+      "Bioenergy": 0.0177,
+      "Hydro": 0.7711,
+      "Solar": 0.1043,
+      "Wind": 0.1069
     },
     "2022": {
-      "Bioenergy": 0.0176,
-      "Hydro": 0.7723,
-      "Solar": 0.1038,
-      "Wind": 0.1063
+      "Bioenergy": 0.0177,
+      "Hydro": 0.7711,
+      "Solar": 0.1043,
+      "Wind": 0.1069
     },
     "2023": {
-      "Bioenergy": 0.0176,
-      "Hydro": 0.7723,
-      "Solar": 0.1038,
-      "Wind": 0.1063
+      "Bioenergy": 0.0177,
+      "Hydro": 0.7711,
+      "Solar": 0.1043,
+      "Wind": 0.1069
     },
     "2024": {
-      "Bioenergy": 0.0176,
-      "Hydro": 0.7723,
-      "Solar": 0.1038,
-      "Wind": 0.1063
+      "Bioenergy": 0.0177,
+      "Hydro": 0.7711,
+      "Solar": 0.1043,
+      "Wind": 0.1069
     },
     "2025": {
-      "Bioenergy": 0.0176,
-      "Hydro": 0.7723,
-      "Solar": 0.1038,
-      "Wind": 0.1063
+      "Bioenergy": 0.0177,
+      "Hydro": 0.7711,
+      "Solar": 0.1043,
+      "Wind": 0.1069
     }
   },
   "BM": {
@@ -1093,10 +1093,10 @@
       "Wind": 0.1713
     },
     "2025": {
-      "Bioenergy": 0.0096,
-      "Hydro": 0.7037,
-      "Solar": 0.1357,
-      "Wind": 0.151
+      "Bioenergy": 0.0099,
+      "Hydro": 0.7018,
+      "Solar": 0.133,
+      "Wind": 0.1553
     }
   },
   "BS": {
@@ -1189,53 +1189,53 @@
   },
   "BW": {
     "2019": {
-      "Bioenergy": 0.0176,
-      "Hydro": 0.7694,
-      "Solar": 0.1071,
-      "Wind": 0.1059
+      "Bioenergy": 0.0177,
+      "Hydro": 0.7682,
+      "Solar": 0.1076,
+      "Wind": 0.1065
     },
     "2020": {
-      "Bioenergy": 0.0176,
-      "Hydro": 0.7694,
-      "Solar": 0.1071,
-      "Wind": 0.1059
+      "Bioenergy": 0.0177,
+      "Hydro": 0.7682,
+      "Solar": 0.1076,
+      "Wind": 0.1065
     },
     "2021": {
-      "Bioenergy": 0.0176,
-      "Hydro": 0.7694,
-      "Solar": 0.1071,
-      "Wind": 0.1059
+      "Bioenergy": 0.0177,
+      "Hydro": 0.7682,
+      "Solar": 0.1076,
+      "Wind": 0.1065
     },
     "2022": {
-      "Bioenergy": 0.0176,
-      "Hydro": 0.7694,
-      "Solar": 0.1071,
-      "Wind": 0.1059
+      "Bioenergy": 0.0177,
+      "Hydro": 0.7682,
+      "Solar": 0.1076,
+      "Wind": 0.1065
     },
     "2023": {
-      "Bioenergy": 0.0176,
-      "Hydro": 0.7694,
-      "Solar": 0.1071,
-      "Wind": 0.1059
+      "Bioenergy": 0.0177,
+      "Hydro": 0.7682,
+      "Solar": 0.1076,
+      "Wind": 0.1065
     },
     "2024": {
-      "Bioenergy": 0.0176,
-      "Hydro": 0.7694,
-      "Solar": 0.1071,
-      "Wind": 0.1059
+      "Bioenergy": 0.0177,
+      "Hydro": 0.7682,
+      "Solar": 0.1076,
+      "Wind": 0.1065
     },
     "2025": {
-      "Bioenergy": 0.0176,
-      "Hydro": 0.7694,
-      "Solar": 0.1071,
-      "Wind": 0.1059
+      "Bioenergy": 0.0177,
+      "Hydro": 0.7682,
+      "Solar": 0.1076,
+      "Wind": 0.1065
     }
   },
   "BY": {
     "2019": {
       "Bioenergy": 0.1403,
       "Hydro": 0.4246,
-      "Solar": 0.2242,
+      "Solar": 0.2243,
       "Wind": 0.2108
     },
     "2020": {
@@ -1245,7 +1245,7 @@
       "Wind": 0.2147
     },
     "2021": {
-      "Bioenergy": 0.2408,
+      "Bioenergy": 0.2409,
       "Hydro": 0.4051,
       "Solar": 0.1865,
       "Wind": 0.1676
@@ -1259,17 +1259,17 @@
     "2023": {
       "Bioenergy": 0.4119,
       "Hydro": 0.3102,
-      "Solar": 0.1261,
+      "Solar": 0.1262,
       "Wind": 0.1517
     },
     "2024": {
-      "Bioenergy": 0.2936,
-      "Hydro": 0.3693,
-      "Solar": 0.1859,
+      "Bioenergy": 0.2935,
+      "Hydro": 0.3691,
+      "Solar": 0.1862,
       "Wind": 0.1512
     },
     "2025": {
-      "Bioenergy": 0.4559,
+      "Bioenergy": 0.4558,
       "Hydro": 0.3093,
       "Solar": 0.0781,
       "Wind": 0.1568
@@ -1292,7 +1292,7 @@
       "Bioenergy": 0.23,
       "Hydro": 0.6913,
       "Solar": 0.0339,
-      "Wind": 0.0448
+      "Wind": 0.0447
     },
     "2022": {
       "Bioenergy": 0.2233,
@@ -1303,20 +1303,20 @@
     "2023": {
       "Bioenergy": 0.2236,
       "Hydro": 0.6801,
-      "Solar": 0.0465,
+      "Solar": 0.0466,
       "Wind": 0.0498
     },
     "2024": {
-      "Bioenergy": 0.2236,
-      "Hydro": 0.668,
-      "Solar": 0.0548,
+      "Bioenergy": 0.2235,
+      "Hydro": 0.6679,
+      "Solar": 0.055,
       "Wind": 0.0536
     },
     "2025": {
-      "Bioenergy": 0.2179,
-      "Hydro": 0.6736,
-      "Solar": 0.06,
-      "Wind": 0.0486
+      "Bioenergy": 0.2192,
+      "Hydro": 0.6704,
+      "Solar": 0.0588,
+      "Wind": 0.0516
     }
   },
   "CA": {
@@ -1358,9 +1358,9 @@
     },
     "2025": {
       "Bioenergy": 0.0232,
-      "Hydro": 0.8402,
-      "Solar": 0.0107,
-      "Wind": 0.1259
+      "Hydro": 0.8357,
+      "Solar": 0.0129,
+      "Wind": 0.1281
     }
   },
   "CD": {
@@ -1504,15 +1504,15 @@
     },
     "2020": {
       "Bioenergy": 0.0018,
-      "Hydro": 0.9294,
+      "Hydro": 0.9295,
       "Solar": 0.0576,
-      "Wind": 0.0112
+      "Wind": 0.0111
     },
     "2021": {
-      "Bioenergy": 0.005,
+      "Bioenergy": 0.0051,
       "Hydro": 0.9053,
       "Solar": 0.0673,
-      "Wind": 0.0224
+      "Wind": 0.0223
     },
     "2022": {
       "Bioenergy": 0.005,
@@ -1533,7 +1533,7 @@
       "Wind": 0.0069
     },
     "2025": {
-      "Bioenergy": 0.0032,
+      "Bioenergy": 0.0031,
       "Hydro": 0.7853,
       "Solar": 0.1936,
       "Wind": 0.0179
@@ -1665,10 +1665,10 @@
       "Wind": 0.1887
     },
     "2025": {
-      "Bioenergy": 0.0402,
-      "Hydro": 0.3931,
-      "Solar": 0.3584,
-      "Wind": 0.2082
+      "Bioenergy": 0.0398,
+      "Hydro": 0.3939,
+      "Solar": 0.3525,
+      "Wind": 0.2138
     }
   },
   "CM": {
@@ -1761,10 +1761,10 @@
   },
   "CO": {
     "2019": {
-      "Bioenergy": 0.002,
-      "Hydro": 0.9911,
+      "Bioenergy": 0.0021,
+      "Hydro": 0.991,
       "Solar": 0.0028,
-      "Wind": 0.0041
+      "Wind": 0.0042
     },
     "2020": {
       "Bioenergy": 0.0036,
@@ -1792,9 +1792,9 @@
     },
     "2024": {
       "Bioenergy": 0.0015,
-      "Hydro": 0.9199,
+      "Hydro": 0.9198,
       "Solar": 0.0625,
-      "Wind": 0.0161
+      "Wind": 0.0162
     },
     "2025": {
       "Bioenergy": 0.0001,
@@ -1830,7 +1830,7 @@
     },
     "2023": {
       "Bioenergy": 0.0053,
-      "Hydro": 0.8433,
+      "Hydro": 0.8432,
       "Solar": 0.0021,
       "Wind": 0.1493
     },
@@ -2017,10 +2017,10 @@
       "Wind": 0.0743
     },
     "2025": {
-      "Bioenergy": 0.2794,
-      "Hydro": 0.1756,
-      "Solar": 0.4929,
-      "Wind": 0.0522
+      "Bioenergy": 0.2668,
+      "Hydro": 0.1792,
+      "Solar": 0.4962,
+      "Wind": 0.0578
     }
   },
   "DE": {
@@ -2031,10 +2031,10 @@
       "Wind": 0.5313
     },
     "2020": {
-      "Bioenergy": 0.1784,
-      "Hydro": 0.0803,
+      "Bioenergy": 0.1783,
+      "Hydro": 0.0802,
       "Solar": 0.2067,
-      "Wind": 0.5347
+      "Wind": 0.5348
     },
     "2021": {
       "Bioenergy": 0.1856,
@@ -2043,72 +2043,72 @@
       "Wind": 0.5003
     },
     "2022": {
-      "Bioenergy": 0.1812,
-      "Hydro": 0.0721,
-      "Solar": 0.2477,
-      "Wind": 0.499
+      "Bioenergy": 0.1806,
+      "Hydro": 0.072,
+      "Solar": 0.2499,
+      "Wind": 0.4975
     },
     "2023": {
-      "Bioenergy": 0.1601,
-      "Hydro": 0.0877,
-      "Solar": 0.237,
-      "Wind": 0.5153
+      "Bioenergy": 0.1587,
+      "Hydro": 0.0868,
+      "Solar": 0.2433,
+      "Wind": 0.5112
     },
     "2024": {
-      "Bioenergy": 0.1537,
-      "Hydro": 0.1008,
-      "Solar": 0.2622,
-      "Wind": 0.4833
+      "Bioenergy": 0.1521,
+      "Hydro": 0.0997,
+      "Solar": 0.2696,
+      "Wind": 0.4786
     },
     "2025": {
-      "Bioenergy": 0.1513,
-      "Hydro": 0.0718,
-      "Solar": 0.3343,
-      "Wind": 0.4426
+      "Bioenergy": 0.1476,
+      "Hydro": 0.0723,
+      "Solar": 0.3388,
+      "Wind": 0.4413
     }
   },
   "DJ": {
     "2019": {
-      "Bioenergy": 0.0184,
-      "Hydro": 0.8076,
-      "Solar": 0.0628,
-      "Wind": 0.1112
+      "Bioenergy": 0.0185,
+      "Hydro": 0.8065,
+      "Solar": 0.0632,
+      "Wind": 0.1118
     },
     "2020": {
-      "Bioenergy": 0.0184,
-      "Hydro": 0.8076,
-      "Solar": 0.0628,
-      "Wind": 0.1112
+      "Bioenergy": 0.0185,
+      "Hydro": 0.8065,
+      "Solar": 0.0632,
+      "Wind": 0.1118
     },
     "2021": {
-      "Bioenergy": 0.0184,
-      "Hydro": 0.8076,
-      "Solar": 0.0628,
-      "Wind": 0.1112
+      "Bioenergy": 0.0185,
+      "Hydro": 0.8065,
+      "Solar": 0.0632,
+      "Wind": 0.1118
     },
     "2022": {
-      "Bioenergy": 0.0184,
-      "Hydro": 0.8076,
-      "Solar": 0.0628,
-      "Wind": 0.1112
+      "Bioenergy": 0.0185,
+      "Hydro": 0.8065,
+      "Solar": 0.0632,
+      "Wind": 0.1118
     },
     "2023": {
-      "Bioenergy": 0.0184,
-      "Hydro": 0.8076,
-      "Solar": 0.0628,
-      "Wind": 0.1112
+      "Bioenergy": 0.0185,
+      "Hydro": 0.8065,
+      "Solar": 0.0632,
+      "Wind": 0.1118
     },
     "2024": {
-      "Bioenergy": 0.0184,
-      "Hydro": 0.8076,
-      "Solar": 0.0628,
-      "Wind": 0.1112
+      "Bioenergy": 0.0185,
+      "Hydro": 0.8065,
+      "Solar": 0.0632,
+      "Wind": 0.1118
     },
     "2025": {
-      "Bioenergy": 0.0184,
-      "Hydro": 0.8076,
-      "Solar": 0.0628,
-      "Wind": 0.1112
+      "Bioenergy": 0.0185,
+      "Hydro": 0.8065,
+      "Solar": 0.0632,
+      "Wind": 0.1118
     }
   },
   "DK": {
@@ -2133,26 +2133,26 @@
     "2022": {
       "Bioenergy": 0.1599,
       "Hydro": 0.0183,
-      "Solar": 0.0905,
-      "Wind": 0.7313
+      "Solar": 0.0906,
+      "Wind": 0.7312
     },
     "2023": {
       "Bioenergy": 0.1389,
       "Hydro": 0.0232,
-      "Solar": 0.12,
-      "Wind": 0.7179
+      "Solar": 0.1202,
+      "Wind": 0.7178
     },
     "2024": {
       "Bioenergy": 0.1375,
       "Hydro": 0.0247,
-      "Solar": 0.1359,
-      "Wind": 0.7019
+      "Solar": 0.136,
+      "Wind": 0.7018
     },
     "2025": {
-      "Bioenergy": 0.1408,
-      "Hydro": 0.0447,
-      "Solar": 0.184,
-      "Wind": 0.6305
+      "Bioenergy": 0.1354,
+      "Hydro": 0.0411,
+      "Solar": 0.1781,
+      "Wind": 0.6455
     }
   },
   "DM": {
@@ -2326,53 +2326,53 @@
     },
     "2025": {
       "Bioenergy": 0.0003,
-      "Hydro": 0.9884,
+      "Hydro": 0.9883,
       "Solar": 0.0033,
-      "Wind": 0.0079
+      "Wind": 0.0081
     }
   },
   "EE": {
     "2019": {
       "Bioenergy": 0.3153,
-      "Hydro": 0.1961,
+      "Hydro": 0.196,
       "Solar": 0.0376,
       "Wind": 0.4511
     },
     "2020": {
-      "Bioenergy": 0.2352,
-      "Hydro": 0.2298,
+      "Bioenergy": 0.2353,
+      "Hydro": 0.2295,
       "Solar": 0.0868,
-      "Wind": 0.4482
+      "Wind": 0.4483
     },
     "2021": {
-      "Bioenergy": 0.2228,
-      "Hydro": 0.1846,
-      "Solar": 0.168,
+      "Bioenergy": 0.223,
+      "Hydro": 0.1843,
+      "Solar": 0.1681,
       "Wind": 0.4246
     },
     "2022": {
-      "Bioenergy": 0.328,
-      "Hydro": 0.0688,
-      "Solar": 0.253,
-      "Wind": 0.3503
+      "Bioenergy": 0.3281,
+      "Hydro": 0.0686,
+      "Solar": 0.2531,
+      "Wind": 0.3502
     },
     "2023": {
-      "Bioenergy": 0.1797,
-      "Hydro": 0.169,
-      "Solar": 0.2783,
-      "Wind": 0.3731
+      "Bioenergy": 0.1796,
+      "Hydro": 0.1688,
+      "Solar": 0.2788,
+      "Wind": 0.3728
     },
     "2024": {
-      "Bioenergy": 0.1401,
-      "Hydro": 0.1365,
-      "Solar": 0.3042,
-      "Wind": 0.4191
+      "Bioenergy": 0.14,
+      "Hydro": 0.1362,
+      "Solar": 0.305,
+      "Wind": 0.4188
     },
     "2025": {
-      "Bioenergy": 0.1411,
-      "Hydro": 0.0996,
-      "Solar": 0.3494,
-      "Wind": 0.4099
+      "Bioenergy": 0.1432,
+      "Hydro": 0.1006,
+      "Solar": 0.3324,
+      "Wind": 0.4238
     }
   },
   "EG": {
@@ -2502,9 +2502,9 @@
     },
     "2025": {
       "Bioenergy": 0.023,
-      "Hydro": 0.2687,
-      "Solar": 0.3445,
-      "Wind": 0.3638
+      "Hydro": 0.2543,
+      "Solar": 0.3613,
+      "Wind": 0.3614
     }
   },
   "ET": {
@@ -2554,45 +2554,45 @@
   "FI": {
     "2019": {
       "Bioenergy": 0.3458,
-      "Hydro": 0.429,
+      "Hydro": 0.4289,
       "Solar": 0.021,
       "Wind": 0.2043
     },
     "2020": {
-      "Bioenergy": 0.268,
+      "Bioenergy": 0.2681,
       "Hydro": 0.4815,
       "Solar": 0.0227,
       "Wind": 0.2278
     },
     "2021": {
       "Bioenergy": 0.2968,
-      "Hydro": 0.447,
+      "Hydro": 0.4469,
       "Solar": 0.0256,
       "Wind": 0.2306
     },
     "2022": {
-      "Bioenergy": 0.3029,
-      "Hydro": 0.372,
-      "Solar": 0.0239,
-      "Wind": 0.3012
+      "Bioenergy": 0.303,
+      "Hydro": 0.3719,
+      "Solar": 0.024,
+      "Wind": 0.3011
     },
     "2023": {
       "Bioenergy": 0.2569,
       "Hydro": 0.378,
       "Solar": 0.0176,
-      "Wind": 0.3476
+      "Wind": 0.3475
     },
     "2024": {
-      "Bioenergy": 0.2091,
-      "Hydro": 0.3273,
-      "Solar": 0.0313,
-      "Wind": 0.4324
+      "Bioenergy": 0.209,
+      "Hydro": 0.3272,
+      "Solar": 0.0314,
+      "Wind": 0.4323
     },
     "2025": {
-      "Bioenergy": 0.2099,
-      "Hydro": 0.3074,
-      "Solar": 0.042,
-      "Wind": 0.4407
+      "Bioenergy": 0.2118,
+      "Hydro": 0.3031,
+      "Solar": 0.0435,
+      "Wind": 0.4416
     }
   },
   "FJ": {
@@ -2747,8 +2747,8 @@
       "Wind": 0.3296
     },
     "2022": {
-      "Bioenergy": 0.038,
-      "Hydro": 0.4255,
+      "Bioenergy": 0.0381,
+      "Hydro": 0.4254,
       "Solar": 0.1769,
       "Wind": 0.3596
     },
@@ -2765,10 +2765,10 @@
       "Wind": 0.3424
     },
     "2025": {
-      "Bioenergy": 0.0218,
-      "Hydro": 0.4235,
-      "Solar": 0.2087,
-      "Wind": 0.346
+      "Bioenergy": 0.0217,
+      "Hydro": 0.4247,
+      "Solar": 0.217,
+      "Wind": 0.3365
     }
   },
   "GA": {
@@ -2818,19 +2818,19 @@
   "GB": {
     "2019": {
       "Bioenergy": 0.1779,
-      "Hydro": 0.0712,
+      "Hydro": 0.0711,
       "Solar": 0.1232,
       "Wind": 0.6278
     },
     "2020": {
       "Bioenergy": 0.1635,
-      "Hydro": 0.0675,
+      "Hydro": 0.0674,
       "Solar": 0.1122,
       "Wind": 0.6568
     },
     "2021": {
       "Bioenergy": 0.1908,
-      "Hydro": 0.0728,
+      "Hydro": 0.0727,
       "Solar": 0.1187,
       "Wind": 0.6178
     },
@@ -2842,21 +2842,21 @@
     },
     "2023": {
       "Bioenergy": 0.1195,
-      "Hydro": 0.0622,
-      "Solar": 0.1165,
-      "Wind": 0.7018
+      "Hydro": 0.0621,
+      "Solar": 0.1166,
+      "Wind": 0.7017
     },
     "2024": {
-      "Bioenergy": 0.1502,
-      "Hydro": 0.0738,
-      "Solar": 0.1259,
-      "Wind": 0.6502
+      "Bioenergy": 0.1501,
+      "Hydro": 0.0737,
+      "Solar": 0.1262,
+      "Wind": 0.65
     },
     "2025": {
-      "Bioenergy": 0.161,
-      "Hydro": 0.0662,
-      "Solar": 0.1853,
-      "Wind": 0.5875
+      "Bioenergy": 0.15,
+      "Hydro": 0.0611,
+      "Solar": 0.172,
+      "Wind": 0.617
     }
   },
   "GD": {
@@ -2930,7 +2930,7 @@
     },
     "2023": {
       "Bioenergy": 0.0019,
-      "Hydro": 0.9764,
+      "Hydro": 0.9763,
       "Solar": 0.0044,
       "Wind": 0.0174
     },
@@ -2938,13 +2938,13 @@
       "Bioenergy": 0.0021,
       "Hydro": 0.973,
       "Solar": 0.0068,
-      "Wind": 0.0182
+      "Wind": 0.0181
     },
     "2025": {
-      "Bioenergy": 0.0037,
-      "Hydro": 0.9559,
-      "Solar": 0.0147,
-      "Wind": 0.0257
+      "Bioenergy": 0.0038,
+      "Hydro": 0.9556,
+      "Solar": 0.015,
+      "Wind": 0.0256
     }
   },
   "GF": {
@@ -3320,27 +3320,27 @@
     },
     "2022": {
       "Bioenergy": 0.0067,
-      "Hydro": 0.2033,
-      "Solar": 0.292,
+      "Hydro": 0.2032,
+      "Solar": 0.2921,
       "Wind": 0.498
     },
     "2023": {
       "Bioenergy": 0.0064,
       "Hydro": 0.188,
-      "Solar": 0.3609,
-      "Wind": 0.4447
+      "Solar": 0.361,
+      "Wind": 0.4446
     },
     "2024": {
       "Bioenergy": 0.0015,
       "Hydro": 0.1142,
-      "Solar": 0.4488,
+      "Solar": 0.4489,
       "Wind": 0.4355
     },
     "2025": {
-      "Bioenergy": 0.0014,
-      "Hydro": 0.0881,
-      "Solar": 0.5023,
-      "Wind": 0.4081
+      "Bioenergy": 0.0013,
+      "Hydro": 0.0918,
+      "Solar": 0.5114,
+      "Wind": 0.3954
     }
   },
   "GT": {
@@ -3521,46 +3521,46 @@
   },
   "HK": {
     "2019": {
-      "Bioenergy": 0.1121,
-      "Hydro": 0.5805,
+      "Bioenergy": 0.1123,
+      "Hydro": 0.5803,
       "Solar": 0.135,
-      "Wind": 0.1724
+      "Wind": 0.1723
     },
     "2020": {
-      "Bioenergy": 0.1127,
-      "Hydro": 0.5587,
+      "Bioenergy": 0.1128,
+      "Hydro": 0.5586,
       "Solar": 0.1492,
       "Wind": 0.1794
     },
     "2021": {
-      "Bioenergy": 0.1167,
-      "Hydro": 0.4997,
-      "Solar": 0.1661,
+      "Bioenergy": 0.117,
+      "Hydro": 0.4996,
+      "Solar": 0.166,
       "Wind": 0.2175
     },
     "2022": {
-      "Bioenergy": 0.1156,
-      "Hydro": 0.4683,
-      "Solar": 0.189,
+      "Bioenergy": 0.1159,
+      "Hydro": 0.4681,
+      "Solar": 0.1889,
       "Wind": 0.2271
     },
     "2023": {
-      "Bioenergy": 0.1169,
-      "Hydro": 0.4119,
-      "Solar": 0.2233,
+      "Bioenergy": 0.1171,
+      "Hydro": 0.4118,
+      "Solar": 0.2232,
       "Wind": 0.2479
     },
     "2024": {
-      "Bioenergy": 0.1058,
-      "Hydro": 0.3947,
-      "Solar": 0.258,
-      "Wind": 0.2414
+      "Bioenergy": 0.106,
+      "Hydro": 0.3949,
+      "Solar": 0.2579,
+      "Wind": 0.2413
     },
     "2025": {
-      "Bioenergy": 0.1013,
-      "Hydro": 0.2938,
-      "Solar": 0.3143,
-      "Wind": 0.2906
+      "Bioenergy": 0.0989,
+      "Hydro": 0.3115,
+      "Solar": 0.31,
+      "Wind": 0.2796
     }
   },
   "HN": {
@@ -3601,10 +3601,10 @@
       "Wind": 0.141
     },
     "2025": {
-      "Bioenergy": 0.2438,
-      "Hydro": 0.4254,
-      "Solar": 0.1903,
-      "Wind": 0.1405
+      "Bioenergy": 0.2439,
+      "Hydro": 0.4251,
+      "Solar": 0.1902,
+      "Wind": 0.1407
     }
   },
   "HR": {
@@ -3616,39 +3616,39 @@
     },
     "2020": {
       "Bioenergy": 0.0708,
-      "Hydro": 0.6454,
+      "Hydro": 0.6455,
       "Solar": 0.034,
       "Wind": 0.2497
     },
     "2021": {
       "Bioenergy": 0.0687,
-      "Hydro": 0.6665,
+      "Hydro": 0.6664,
       "Solar": 0.0297,
       "Wind": 0.2351
     },
     "2022": {
-      "Bioenergy": 0.0846,
-      "Hydro": 0.5616,
-      "Solar": 0.0511,
-      "Wind": 0.3027
+      "Bioenergy": 0.0847,
+      "Hydro": 0.5613,
+      "Solar": 0.0513,
+      "Wind": 0.3026
     },
     "2023": {
       "Bioenergy": 0.0596,
-      "Hydro": 0.6404,
-      "Solar": 0.0511,
+      "Hydro": 0.6403,
+      "Solar": 0.0513,
       "Wind": 0.2488
     },
     "2024": {
       "Bioenergy": 0.0633,
-      "Hydro": 0.5505,
-      "Solar": 0.1113,
-      "Wind": 0.2749
+      "Hydro": 0.5501,
+      "Solar": 0.1118,
+      "Wind": 0.2748
     },
     "2025": {
       "Bioenergy": 0.0588,
-      "Hydro": 0.5051,
-      "Solar": 0.1346,
-      "Wind": 0.3015
+      "Hydro": 0.496,
+      "Solar": 0.1427,
+      "Wind": 0.3025
     }
   },
   "HT": {
@@ -3697,46 +3697,46 @@
   },
   "HU": {
     "2019": {
-      "Bioenergy": 0.1795,
-      "Hydro": 0.3171,
-      "Solar": 0.2486,
+      "Bioenergy": 0.1796,
+      "Hydro": 0.317,
+      "Solar": 0.2487,
       "Wind": 0.2548
     },
     "2020": {
-      "Bioenergy": 0.161,
+      "Bioenergy": 0.1611,
       "Hydro": 0.2775,
-      "Solar": 0.3365,
-      "Wind": 0.2249
+      "Solar": 0.3366,
+      "Wind": 0.2248
     },
     "2021": {
-      "Bioenergy": 0.1475,
-      "Hydro": 0.2313,
-      "Solar": 0.4303,
-      "Wind": 0.1909
+      "Bioenergy": 0.1478,
+      "Hydro": 0.2309,
+      "Solar": 0.4305,
+      "Wind": 0.1908
     },
     "2022": {
-      "Bioenergy": 0.1385,
-      "Hydro": 0.187,
-      "Solar": 0.49,
-      "Wind": 0.1845
+      "Bioenergy": 0.1388,
+      "Hydro": 0.1866,
+      "Solar": 0.4903,
+      "Wind": 0.1843
     },
     "2023": {
       "Bioenergy": 0.0846,
-      "Hydro": 0.1679,
-      "Solar": 0.5812,
-      "Wind": 0.1663
+      "Hydro": 0.1677,
+      "Solar": 0.5815,
+      "Wind": 0.1662
     },
     "2024": {
-      "Bioenergy": 0.0806,
-      "Hydro": 0.1387,
-      "Solar": 0.6441,
-      "Wind": 0.1366
+      "Bioenergy": 0.0805,
+      "Hydro": 0.1384,
+      "Solar": 0.6446,
+      "Wind": 0.1365
     },
     "2025": {
-      "Bioenergy": 0.1074,
-      "Hydro": 0.1064,
-      "Solar": 0.6823,
-      "Wind": 0.1039
+      "Bioenergy": 0.1046,
+      "Hydro": 0.1035,
+      "Solar": 0.6897,
+      "Wind": 0.1021
     }
   },
   "ID": {
@@ -3777,10 +3777,10 @@
       "Wind": 0.0173
     },
     "2025": {
-      "Bioenergy": 0.3546,
-      "Hydro": 0.619,
-      "Solar": 0.0082,
-      "Wind": 0.0182
+      "Bioenergy": 0.3545,
+      "Hydro": 0.6192,
+      "Solar": 0.0083,
+      "Wind": 0.0181
     }
   },
   "IE": {
@@ -3788,7 +3788,7 @@
       "Bioenergy": 0.024,
       "Hydro": 0.1223,
       "Solar": 0.0092,
-      "Wind": 0.8445
+      "Wind": 0.8446
     },
     "2020": {
       "Bioenergy": 0.0186,
@@ -3798,33 +3798,33 @@
     },
     "2021": {
       "Bioenergy": 0.0187,
-      "Hydro": 0.1121,
+      "Hydro": 0.112,
       "Solar": 0.0122,
       "Wind": 0.8571
     },
     "2022": {
-      "Bioenergy": 0.0159,
+      "Bioenergy": 0.016,
       "Hydro": 0.0869,
-      "Solar": 0.0113,
-      "Wind": 0.8858
+      "Solar": 0.0114,
+      "Wind": 0.8857
     },
     "2023": {
       "Bioenergy": 0.016,
-      "Hydro": 0.1116,
-      "Solar": 0.0446,
-      "Wind": 0.8278
+      "Hydro": 0.1115,
+      "Solar": 0.0449,
+      "Wind": 0.8276
     },
     "2024": {
       "Bioenergy": 0.018,
-      "Hydro": 0.1142,
-      "Solar": 0.0745,
-      "Wind": 0.7933
+      "Hydro": 0.114,
+      "Solar": 0.075,
+      "Wind": 0.793
     },
     "2025": {
-      "Bioenergy": 0.0188,
-      "Hydro": 0.1056,
-      "Solar": 0.0998,
-      "Wind": 0.7758
+      "Bioenergy": 0.0183,
+      "Hydro": 0.1049,
+      "Solar": 0.1006,
+      "Wind": 0.7762
     }
   },
   "IL": {
@@ -3909,10 +3909,10 @@
       "Wind": 0.212
     },
     "2025": {
-      "Bioenergy": 0.0423,
-      "Hydro": 0.2999,
-      "Solar": 0.4753,
-      "Wind": 0.1825
+      "Bioenergy": 0.0382,
+      "Hydro": 0.3112,
+      "Solar": 0.4344,
+      "Wind": 0.2162
     }
   },
   "IQ": {
@@ -4049,46 +4049,46 @@
   },
   "IT": {
     "2019": {
-      "Bioenergy": 0.1643,
-      "Hydro": 0.4218,
-      "Solar": 0.2114,
-      "Wind": 0.2025
+      "Bioenergy": 0.1641,
+      "Hydro": 0.4215,
+      "Solar": 0.2113,
+      "Wind": 0.2032
     },
     "2020": {
       "Bioenergy": 0.1634,
       "Hydro": 0.4249,
       "Solar": 0.22,
-      "Wind": 0.1916
+      "Wind": 0.1917
     },
     "2021": {
-      "Bioenergy": 0.1584,
-      "Hydro": 0.4079,
-      "Solar": 0.223,
-      "Wind": 0.2107
+      "Bioenergy": 0.1585,
+      "Hydro": 0.4078,
+      "Solar": 0.2231,
+      "Wind": 0.2106
     },
     "2022": {
-      "Bioenergy": 0.1649,
-      "Hydro": 0.314,
-      "Solar": 0.2844,
-      "Wind": 0.2367
+      "Bioenergy": 0.1647,
+      "Hydro": 0.3132,
+      "Solar": 0.284,
+      "Wind": 0.2381
     },
     "2023": {
-      "Bioenergy": 0.1325,
-      "Hydro": 0.3581,
-      "Solar": 0.2697,
-      "Wind": 0.2398
+      "Bioenergy": 0.1324,
+      "Hydro": 0.3578,
+      "Solar": 0.2699,
+      "Wind": 0.2399
     },
     "2024": {
       "Bioenergy": 0.1179,
-      "Hydro": 0.396,
-      "Solar": 0.2808,
+      "Hydro": 0.3957,
+      "Solar": 0.2812,
       "Wind": 0.2052
     },
     "2025": {
-      "Bioenergy": 0.1435,
-      "Hydro": 0.3026,
-      "Solar": 0.219,
-      "Wind": 0.3349
+      "Bioenergy": 0.1173,
+      "Hydro": 0.328,
+      "Solar": 0.3068,
+      "Wind": 0.2479
     }
   },
   "JM": {
@@ -4211,24 +4211,24 @@
       "Wind": 0.0693
     },
     "2024": {
-      "Bioenergy": 0.214,
-      "Hydro": 0.281,
-      "Solar": 0.4333,
+      "Bioenergy": 0.2141,
+      "Hydro": 0.2809,
+      "Solar": 0.4332,
       "Wind": 0.0718
     },
     "2025": {
-      "Bioenergy": 0.232,
-      "Hydro": 0.2494,
-      "Solar": 0.412,
-      "Wind": 0.1066
+      "Bioenergy": 0.2267,
+      "Hydro": 0.2724,
+      "Solar": 0.4024,
+      "Wind": 0.0986
     }
   },
   "KE": {
     "2019": {
       "Bioenergy": 0.0279,
-      "Hydro": 0.6394,
+      "Hydro": 0.6393,
       "Solar": 0.0243,
-      "Wind": 0.3084
+      "Wind": 0.3085
     },
     "2020": {
       "Bioenergy": 0.0189,
@@ -4250,21 +4250,21 @@
     },
     "2023": {
       "Bioenergy": 0.0348,
-      "Hydro": 0.5089,
+      "Hydro": 0.5088,
       "Solar": 0.0903,
-      "Wind": 0.3659
+      "Wind": 0.366
     },
     "2024": {
       "Bioenergy": 0.0427,
-      "Hydro": 0.5978,
-      "Solar": 0.0741,
-      "Wind": 0.2854
+      "Hydro": 0.5977,
+      "Solar": 0.0742,
+      "Wind": 0.2855
     },
     "2025": {
-      "Bioenergy": 0.0689,
-      "Hydro": 0.5304,
-      "Solar": 0.077,
-      "Wind": 0.3237
+      "Bioenergy": 0.0607,
+      "Hydro": 0.5598,
+      "Solar": 0.0785,
+      "Wind": 0.3011
     }
   },
   "KG": {
@@ -4306,20 +4306,20 @@
     },
     "2025": {
       "Bioenergy": 0.0018,
-      "Hydro": 0.9815,
+      "Hydro": 0.9816,
       "Solar": 0.0086,
-      "Wind": 0.0081
+      "Wind": 0.0079
     }
   },
   "KH": {
     "2019": {
-      "Bioenergy": 0.0286,
-      "Hydro": 0.9054,
+      "Bioenergy": 0.0287,
+      "Hydro": 0.9053,
       "Solar": 0.0416,
       "Wind": 0.0244
     },
     "2020": {
-      "Bioenergy": 0.0294,
+      "Bioenergy": 0.0295,
       "Hydro": 0.8993,
       "Solar": 0.0445,
       "Wind": 0.0268
@@ -4332,7 +4332,7 @@
     },
     "2022": {
       "Bioenergy": 0.0312,
-      "Hydro": 0.8796,
+      "Hydro": 0.8795,
       "Solar": 0.0525,
       "Wind": 0.0367
     },
@@ -4344,15 +4344,15 @@
     },
     "2024": {
       "Bioenergy": 0.0307,
-      "Hydro": 0.8607,
+      "Hydro": 0.8606,
       "Solar": 0.0666,
       "Wind": 0.0421
     },
     "2025": {
-      "Bioenergy": 0.0304,
-      "Hydro": 0.8393,
-      "Solar": 0.078,
-      "Wind": 0.0523
+      "Bioenergy": 0.0302,
+      "Hydro": 0.8405,
+      "Solar": 0.0781,
+      "Wind": 0.0512
     }
   },
   "KI": {
@@ -4667,19 +4667,19 @@
     "2019": {
       "Bioenergy": 0,
       "Hydro": 0.9,
-      "Solar": 0.0361,
-      "Wind": 0.064
+      "Solar": 0.036,
+      "Wind": 0.0639
     },
     "2020": {
       "Bioenergy": 0,
-      "Hydro": 0.8031,
-      "Solar": 0.1044,
+      "Hydro": 0.803,
+      "Solar": 0.1045,
       "Wind": 0.0925
     },
     "2021": {
       "Bioenergy": 0,
-      "Hydro": 0.7277,
-      "Solar": 0.1326,
+      "Hydro": 0.7275,
+      "Solar": 0.1328,
       "Wind": 0.1397
     },
     "2022": {
@@ -4697,14 +4697,14 @@
     "2024": {
       "Bioenergy": 0,
       "Hydro": 0.6372,
-      "Solar": 0.1088,
+      "Solar": 0.1089,
       "Wind": 0.254
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.602,
-      "Solar": 0.1075,
-      "Wind": 0.2905
+      "Hydro": 0.6005,
+      "Solar": 0.116,
+      "Wind": 0.2835
     }
   },
   "LA": {
@@ -4930,43 +4930,43 @@
   "LS": {
     "2019": {
       "Bioenergy": 0.004,
-      "Hydro": 0.9582,
+      "Hydro": 0.9581,
       "Solar": 0.0137,
       "Wind": 0.0242
     },
     "2020": {
       "Bioenergy": 0.004,
-      "Hydro": 0.9582,
+      "Hydro": 0.9581,
       "Solar": 0.0137,
       "Wind": 0.0242
     },
     "2021": {
       "Bioenergy": 0.004,
-      "Hydro": 0.9582,
+      "Hydro": 0.9581,
       "Solar": 0.0137,
       "Wind": 0.0242
     },
     "2022": {
       "Bioenergy": 0.004,
-      "Hydro": 0.9582,
+      "Hydro": 0.9581,
       "Solar": 0.0137,
       "Wind": 0.0242
     },
     "2023": {
       "Bioenergy": 0.004,
-      "Hydro": 0.9582,
+      "Hydro": 0.9581,
       "Solar": 0.0137,
       "Wind": 0.0242
     },
     "2024": {
       "Bioenergy": 0.004,
-      "Hydro": 0.9582,
+      "Hydro": 0.9581,
       "Solar": 0.0137,
       "Wind": 0.0242
     },
     "2025": {
       "Bioenergy": 0.004,
-      "Hydro": 0.9582,
+      "Hydro": 0.9581,
       "Solar": 0.0137,
       "Wind": 0.0242
     }
@@ -4974,89 +4974,89 @@
   "LT": {
     "2019": {
       "Bioenergy": 0.1294,
-      "Hydro": 0.3679,
-      "Solar": 0.0691,
-      "Wind": 0.4336
+      "Hydro": 0.3678,
+      "Solar": 0.069,
+      "Wind": 0.4337
     },
     "2020": {
       "Bioenergy": 0.1268,
-      "Hydro": 0.3368,
+      "Hydro": 0.3367,
       "Solar": 0.0718,
       "Wind": 0.4646
     },
     "2021": {
-      "Bioenergy": 0.1299,
-      "Hydro": 0.3627,
-      "Solar": 0.0898,
-      "Wind": 0.4176
+      "Bioenergy": 0.1303,
+      "Hydro": 0.3623,
+      "Solar": 0.09,
+      "Wind": 0.4174
     },
     "2022": {
-      "Bioenergy": 0.1121,
-      "Hydro": 0.3109,
-      "Solar": 0.1394,
-      "Wind": 0.4375
+      "Bioenergy": 0.1125,
+      "Hydro": 0.3104,
+      "Solar": 0.14,
+      "Wind": 0.4371
     },
     "2023": {
       "Bioenergy": 0.0722,
-      "Hydro": 0.2526,
-      "Solar": 0.167,
-      "Wind": 0.5082
+      "Hydro": 0.2522,
+      "Solar": 0.1678,
+      "Wind": 0.5078
     },
     "2024": {
       "Bioenergy": 0.0515,
-      "Hydro": 0.1846,
-      "Solar": 0.235,
-      "Wind": 0.5289
+      "Hydro": 0.1843,
+      "Solar": 0.2358,
+      "Wind": 0.5284
     },
     "2025": {
-      "Bioenergy": 0.035,
-      "Hydro": 0.1095,
-      "Solar": 0.2802,
-      "Wind": 0.5753
+      "Bioenergy": 0.033,
+      "Hydro": 0.1039,
+      "Solar": 0.2733,
+      "Wind": 0.5898
     }
   },
   "LU": {
     "2019": {
       "Bioenergy": 0.149,
-      "Hydro": 0.3871,
+      "Hydro": 0.387,
       "Solar": 0.1305,
-      "Wind": 0.3334
+      "Wind": 0.3335
     },
     "2020": {
-      "Bioenergy": 0.1646,
-      "Hydro": 0.3499,
+      "Bioenergy": 0.1647,
+      "Hydro": 0.3498,
       "Solar": 0.1321,
       "Wind": 0.3534
     },
     "2021": {
-      "Bioenergy": 0.1845,
-      "Hydro": 0.3441,
-      "Solar": 0.1523,
-      "Wind": 0.3191
+      "Bioenergy": 0.1848,
+      "Hydro": 0.3436,
+      "Solar": 0.1526,
+      "Wind": 0.319
     },
     "2022": {
-      "Bioenergy": 0.1869,
-      "Hydro": 0.2891,
-      "Solar": 0.1949,
-      "Wind": 0.3291
+      "Bioenergy": 0.1872,
+      "Hydro": 0.2885,
+      "Solar": 0.1955,
+      "Wind": 0.3287
     },
     "2023": {
       "Bioenergy": 0.1104,
-      "Hydro": 0.2891,
-      "Solar": 0.1988,
-      "Wind": 0.4016
+      "Hydro": 0.2886,
+      "Solar": 0.1999,
+      "Wind": 0.4012
     },
     "2024": {
-      "Bioenergy": 0.1383,
-      "Hydro": 0.2937,
-      "Solar": 0.2179,
-      "Wind": 0.3501
+      "Bioenergy": 0.1382,
+      "Hydro": 0.2929,
+      "Solar": 0.2194,
+      "Wind": 0.3495
     },
     "2025": {
-      "Bioenergy": 0.1355,
-      "Hydro": 0.2477,
-      "Solar": 0.2849,
-      "Wind": 0.3319
+      "Bioenergy": 0.1352,
+      "Hydro": 0.2469,
+      "Solar": 0.2896,
+      "Wind": 0.3283
     }
   },
   "LV": {
@@ -5068,83 +5068,83 @@
     },
     "2020": {
       "Bioenergy": 0.1523,
-      "Hydro": 0.75,
+      "Hydro": 0.7499,
       "Solar": 0.0186,
-      "Wind": 0.0791
+      "Wind": 0.0792
     },
     "2021": {
-      "Bioenergy": 0.147,
-      "Hydro": 0.7508,
-      "Solar": 0.0239,
+      "Bioenergy": 0.1471,
+      "Hydro": 0.7507,
+      "Solar": 0.024,
       "Wind": 0.0783
     },
     "2022": {
-      "Bioenergy": 0.1007,
-      "Hydro": 0.7509,
-      "Solar": 0.0402,
-      "Wind": 0.1083
+      "Bioenergy": 0.1008,
+      "Hydro": 0.7506,
+      "Solar": 0.0405,
+      "Wind": 0.1082
     },
     "2023": {
       "Bioenergy": 0.0583,
-      "Hydro": 0.7759,
-      "Solar": 0.0647,
+      "Hydro": 0.7753,
+      "Solar": 0.0653,
       "Wind": 0.1011
     },
     "2024": {
       "Bioenergy": 0.0869,
-      "Hydro": 0.681,
-      "Solar": 0.1239,
+      "Hydro": 0.6806,
+      "Solar": 0.1244,
       "Wind": 0.1081
     },
     "2025": {
-      "Bioenergy": 0.0911,
-      "Hydro": 0.6796,
-      "Solar": 0.1535,
-      "Wind": 0.0759
+      "Bioenergy": 0.0845,
+      "Hydro": 0.7057,
+      "Solar": 0.1449,
+      "Wind": 0.0648
     }
   },
   "LY": {
     "2019": {
-      "Bioenergy": 0.0173,
-      "Hydro": 0.7573,
-      "Solar": 0.1212,
-      "Wind": 0.1042
+      "Bioenergy": 0.0174,
+      "Hydro": 0.756,
+      "Solar": 0.1218,
+      "Wind": 0.1048
     },
     "2020": {
-      "Bioenergy": 0.0173,
-      "Hydro": 0.7573,
-      "Solar": 0.1212,
-      "Wind": 0.1042
+      "Bioenergy": 0.0174,
+      "Hydro": 0.756,
+      "Solar": 0.1218,
+      "Wind": 0.1048
     },
     "2021": {
-      "Bioenergy": 0.0173,
-      "Hydro": 0.7573,
-      "Solar": 0.1212,
-      "Wind": 0.1042
+      "Bioenergy": 0.0174,
+      "Hydro": 0.756,
+      "Solar": 0.1218,
+      "Wind": 0.1048
     },
     "2022": {
-      "Bioenergy": 0.0173,
-      "Hydro": 0.7573,
-      "Solar": 0.1212,
-      "Wind": 0.1042
+      "Bioenergy": 0.0174,
+      "Hydro": 0.756,
+      "Solar": 0.1218,
+      "Wind": 0.1048
     },
     "2023": {
-      "Bioenergy": 0.0173,
-      "Hydro": 0.7573,
-      "Solar": 0.1212,
-      "Wind": 0.1042
+      "Bioenergy": 0.0174,
+      "Hydro": 0.756,
+      "Solar": 0.1218,
+      "Wind": 0.1048
     },
     "2024": {
-      "Bioenergy": 0.0173,
-      "Hydro": 0.7573,
-      "Solar": 0.1212,
-      "Wind": 0.1042
+      "Bioenergy": 0.0174,
+      "Hydro": 0.756,
+      "Solar": 0.1218,
+      "Wind": 0.1048
     },
     "2025": {
-      "Bioenergy": 0.0173,
-      "Hydro": 0.7573,
-      "Solar": 0.1212,
-      "Wind": 0.1042
+      "Bioenergy": 0.0174,
+      "Hydro": 0.756,
+      "Solar": 0.1218,
+      "Wind": 0.1048
     }
   },
   "MA": {
@@ -5156,9 +5156,9 @@
     },
     "2020": {
       "Bioenergy": 0.0002,
-      "Hydro": 0.183,
+      "Hydro": 0.1829,
       "Solar": 0.2051,
-      "Wind": 0.6117
+      "Wind": 0.6118
     },
     "2021": {
       "Bioenergy": 0.0001,
@@ -5168,21 +5168,21 @@
     },
     "2022": {
       "Bioenergy": 0.0007,
-      "Hydro": 0.12,
+      "Hydro": 0.1198,
       "Solar": 0.193,
-      "Wind": 0.6863
+      "Wind": 0.6865
     },
     "2023": {
       "Bioenergy": 0.0007,
-      "Hydro": 0.087,
-      "Solar": 0.2288,
-      "Wind": 0.6835
+      "Hydro": 0.0868,
+      "Solar": 0.2289,
+      "Wind": 0.6836
     },
     "2024": {
       "Bioenergy": 0.0008,
-      "Hydro": 0.0912,
+      "Hydro": 0.091,
       "Solar": 0.1381,
-      "Wind": 0.7699
+      "Wind": 0.7701
     },
     "2025": {
       "Bioenergy": 0,
@@ -5194,45 +5194,45 @@
   "MD": {
     "2019": {
       "Bioenergy": 0.0836,
-      "Hydro": 0.7091,
+      "Hydro": 0.7092,
       "Solar": 0.0349,
       "Wind": 0.1723
     },
     "2020": {
       "Bioenergy": 0.0132,
-      "Hydro": 0.9171,
+      "Hydro": 0.9173,
       "Solar": 0.0099,
-      "Wind": 0.0598
+      "Wind": 0.0596
     },
     "2021": {
-      "Bioenergy": 0.014,
-      "Hydro": 0.9154,
-      "Solar": 0.0269,
+      "Bioenergy": 0.0141,
+      "Hydro": 0.9152,
+      "Solar": 0.027,
       "Wind": 0.0437
     },
     "2022": {
-      "Bioenergy": 0.0471,
-      "Hydro": 0.6986,
-      "Solar": 0.0766,
-      "Wind": 0.1777
+      "Bioenergy": 0.0475,
+      "Hydro": 0.6978,
+      "Solar": 0.0773,
+      "Wind": 0.1774
     },
     "2023": {
-      "Bioenergy": 0.0112,
-      "Hydro": 0.8464,
-      "Solar": 0.0156,
-      "Wind": 0.1268
+      "Bioenergy": 0.0113,
+      "Hydro": 0.8463,
+      "Solar": 0.0157,
+      "Wind": 0.1267
     },
     "2024": {
       "Bioenergy": 0.0123,
-      "Hydro": 0.6423,
-      "Solar": 0.1677,
-      "Wind": 0.1776
+      "Hydro": 0.642,
+      "Solar": 0.1681,
+      "Wind": 0.1775
     },
     "2025": {
-      "Bioenergy": 0.0085,
-      "Hydro": 0.6366,
-      "Solar": 0.3197,
-      "Wind": 0.0352
+      "Bioenergy": 0.0082,
+      "Hydro": 0.6361,
+      "Solar": 0.3203,
+      "Wind": 0.0355
     }
   },
   "ME": {
@@ -5244,39 +5244,39 @@
     },
     "2020": {
       "Bioenergy": 0.0143,
-      "Hydro": 0.7522,
+      "Hydro": 0.7523,
       "Solar": 0.0175,
-      "Wind": 0.2159
+      "Wind": 0.2158
     },
     "2021": {
       "Bioenergy": 0.0075,
-      "Hydro": 0.8138,
-      "Solar": 0.0152,
+      "Hydro": 0.8137,
+      "Solar": 0.0153,
       "Wind": 0.1635
     },
     "2022": {
-      "Bioenergy": 0.0016,
+      "Bioenergy": 0.0017,
       "Hydro": 0.7949,
       "Solar": 0.0025,
       "Wind": 0.201
     },
     "2023": {
       "Bioenergy": 0.0013,
-      "Hydro": 0.8432,
-      "Solar": 0.0048,
+      "Hydro": 0.8431,
+      "Solar": 0.0049,
       "Wind": 0.1507
     },
     "2024": {
       "Bioenergy": 0.0069,
-      "Hydro": 0.7728,
-      "Solar": 0.0565,
+      "Hydro": 0.7724,
+      "Solar": 0.0569,
       "Wind": 0.1638
     },
     "2025": {
-      "Bioenergy": 0.0206,
-      "Hydro": 0.6703,
-      "Solar": 0.0785,
-      "Wind": 0.2306
+      "Bioenergy": 0.0201,
+      "Hydro": 0.6697,
+      "Solar": 0.0847,
+      "Wind": 0.2255
     }
   },
   "MG": {
@@ -5328,43 +5328,43 @@
       "Bioenergy": 0.0676,
       "Hydro": 0.7699,
       "Solar": 0.0192,
-      "Wind": 0.1433
+      "Wind": 0.1432
     },
     "2020": {
       "Bioenergy": 0.0715,
-      "Hydro": 0.7498,
+      "Hydro": 0.7499,
       "Solar": 0.0264,
-      "Wind": 0.1522
+      "Wind": 0.1521
     },
     "2021": {
-      "Bioenergy": 0.0647,
-      "Hydro": 0.7682,
-      "Solar": 0.0304,
-      "Wind": 0.1368
+      "Bioenergy": 0.0648,
+      "Hydro": 0.768,
+      "Solar": 0.0305,
+      "Wind": 0.1367
     },
     "2022": {
-      "Bioenergy": 0.042,
-      "Hydro": 0.7827,
-      "Solar": 0.0419,
-      "Wind": 0.1333
+      "Bioenergy": 0.0422,
+      "Hydro": 0.7824,
+      "Solar": 0.0422,
+      "Wind": 0.1332
     },
     "2023": {
-      "Bioenergy": 0.0467,
+      "Bioenergy": 0.0466,
       "Hydro": 0.7213,
       "Solar": 0.1466,
       "Wind": 0.0855
     },
     "2024": {
-      "Bioenergy": 0.0541,
-      "Hydro": 0.6827,
-      "Solar": 0.1419,
-      "Wind": 0.1213
+      "Bioenergy": 0.054,
+      "Hydro": 0.6826,
+      "Solar": 0.1421,
+      "Wind": 0.1212
     },
     "2025": {
-      "Bioenergy": 0.0314,
-      "Hydro": 0.6212,
-      "Solar": 0.1597,
-      "Wind": 0.1877
+      "Bioenergy": 0.0303,
+      "Hydro": 0.6198,
+      "Solar": 0.1614,
+      "Wind": 0.1885
     }
   },
   "ML": {
@@ -5501,46 +5501,46 @@
   },
   "MO": {
     "2019": {
-      "Bioenergy": 0.2208,
-      "Hydro": 0.5131,
+      "Bioenergy": 0.221,
+      "Hydro": 0.5129,
       "Solar": 0.1138,
       "Wind": 0.1523
     },
     "2020": {
-      "Bioenergy": 0.2157,
-      "Hydro": 0.4971,
-      "Solar": 0.1276,
-      "Wind": 0.1597
+      "Bioenergy": 0.2158,
+      "Hydro": 0.497,
+      "Solar": 0.1275,
+      "Wind": 0.1596
     },
     "2021": {
-      "Bioenergy": 0.2164,
-      "Hydro": 0.4462,
-      "Solar": 0.1432,
+      "Bioenergy": 0.2166,
+      "Hydro": 0.4461,
+      "Solar": 0.1431,
       "Wind": 0.1942
     },
     "2022": {
-      "Bioenergy": 0.2098,
-      "Hydro": 0.4209,
+      "Bioenergy": 0.21,
+      "Hydro": 0.4208,
       "Solar": 0.1651,
-      "Wind": 0.2042
+      "Wind": 0.2041
     },
     "2023": {
-      "Bioenergy": 0.2098,
-      "Hydro": 0.3708,
+      "Bioenergy": 0.2099,
+      "Hydro": 0.3707,
       "Solar": 0.1962,
-      "Wind": 0.2232
+      "Wind": 0.2231
     },
     "2024": {
-      "Bioenergy": 0.1936,
-      "Hydro": 0.3579,
-      "Solar": 0.2295,
-      "Wind": 0.2189
+      "Bioenergy": 0.1937,
+      "Hydro": 0.3581,
+      "Solar": 0.2294,
+      "Wind": 0.2188
     },
     "2025": {
-      "Bioenergy": 0.1864,
-      "Hydro": 0.2674,
-      "Solar": 0.2817,
-      "Wind": 0.2644
+      "Bioenergy": 0.1827,
+      "Hydro": 0.284,
+      "Solar": 0.2784,
+      "Wind": 0.2549
     }
   },
   "MQ": {
@@ -5590,45 +5590,45 @@
   "MR": {
     "2019": {
       "Bioenergy": 0.0015,
-      "Hydro": 0.4557,
-      "Solar": 0.2989,
-      "Wind": 0.2439
+      "Hydro": 0.4555,
+      "Solar": 0.299,
+      "Wind": 0.244
     },
     "2020": {
       "Bioenergy": 0.0015,
-      "Hydro": 0.4557,
-      "Solar": 0.2989,
-      "Wind": 0.2439
+      "Hydro": 0.4555,
+      "Solar": 0.299,
+      "Wind": 0.244
     },
     "2021": {
       "Bioenergy": 0.0015,
-      "Hydro": 0.4557,
-      "Solar": 0.2989,
-      "Wind": 0.2439
+      "Hydro": 0.4555,
+      "Solar": 0.299,
+      "Wind": 0.244
     },
     "2022": {
       "Bioenergy": 0.0015,
-      "Hydro": 0.4557,
-      "Solar": 0.2989,
-      "Wind": 0.2439
+      "Hydro": 0.4555,
+      "Solar": 0.299,
+      "Wind": 0.244
     },
     "2023": {
       "Bioenergy": 0.0015,
-      "Hydro": 0.4557,
-      "Solar": 0.2989,
-      "Wind": 0.2439
+      "Hydro": 0.4555,
+      "Solar": 0.299,
+      "Wind": 0.244
     },
     "2024": {
       "Bioenergy": 0.0015,
-      "Hydro": 0.4557,
-      "Solar": 0.2989,
-      "Wind": 0.2439
+      "Hydro": 0.4555,
+      "Solar": 0.299,
+      "Wind": 0.244
     },
     "2025": {
       "Bioenergy": 0.0015,
-      "Hydro": 0.4557,
-      "Solar": 0.2989,
-      "Wind": 0.2439
+      "Hydro": 0.4555,
+      "Solar": 0.299,
+      "Wind": 0.244
     }
   },
   "MS": {
@@ -5678,9 +5678,9 @@
   "MT": {
     "2019": {
       "Bioenergy": 0.0877,
-      "Hydro": 0.5231,
+      "Hydro": 0.523,
       "Solar": 0.1022,
-      "Wind": 0.287
+      "Wind": 0.2871
     },
     "2020": {
       "Bioenergy": 0.0851,
@@ -5689,34 +5689,34 @@
       "Wind": 0.3004
     },
     "2021": {
-      "Bioenergy": 0.0898,
-      "Hydro": 0.498,
-      "Solar": 0.1108,
-      "Wind": 0.3015
+      "Bioenergy": 0.0903,
+      "Hydro": 0.4973,
+      "Solar": 0.1113,
+      "Wind": 0.3011
     },
     "2022": {
-      "Bioenergy": 0.0561,
-      "Hydro": 0.2886,
-      "Solar": 0.4497,
-      "Wind": 0.2057
+      "Bioenergy": 0.0565,
+      "Hydro": 0.2879,
+      "Solar": 0.4502,
+      "Wind": 0.2053
     },
     "2023": {
       "Bioenergy": 0.0248,
-      "Hydro": 0.1545,
-      "Solar": 0.7046,
-      "Wind": 0.1162
+      "Hydro": 0.1543,
+      "Solar": 0.7048,
+      "Wind": 0.1161
     },
     "2024": {
       "Bioenergy": 0.0299,
-      "Hydro": 0.1922,
-      "Solar": 0.6447,
-      "Wind": 0.1332
+      "Hydro": 0.1917,
+      "Solar": 0.6453,
+      "Wind": 0.1331
     },
     "2025": {
-      "Bioenergy": 0.0319,
-      "Hydro": 0.1888,
-      "Solar": 0.6475,
-      "Wind": 0.1317
+      "Bioenergy": 0.0305,
+      "Hydro": 0.1868,
+      "Solar": 0.6499,
+      "Wind": 0.1328
     }
   },
   "MU": {
@@ -5889,10 +5889,10 @@
       "Wind": 0.3199
     },
     "2025": {
-      "Bioenergy": 0.002,
-      "Hydro": 0.3162,
-      "Solar": 0.3019,
-      "Wind": 0.38
+      "Bioenergy": 0.0021,
+      "Hydro": 0.3453,
+      "Solar": 0.3083,
+      "Wind": 0.3443
     }
   },
   "MY": {
@@ -5927,15 +5927,15 @@
       "Wind": 0.0001
     },
     "2024": {
-      "Bioenergy": 0.11,
-      "Hydro": 0.8136,
-      "Solar": 0.0763,
+      "Bioenergy": 0.1109,
+      "Hydro": 0.8164,
+      "Solar": 0.0726,
       "Wind": 0.0001
     },
     "2025": {
-      "Bioenergy": 0.1084,
-      "Hydro": 0.8071,
-      "Solar": 0.0845,
+      "Bioenergy": 0.1096,
+      "Hydro": 0.8084,
+      "Solar": 0.082,
       "Wind": 0
     }
   },
@@ -5986,44 +5986,44 @@
   "NA": {
     "2019": {
       "Bioenergy": 0.0058,
-      "Hydro": 0.7436,
-      "Solar": 0.2053,
+      "Hydro": 0.7432,
+      "Solar": 0.2057,
       "Wind": 0.0453
     },
     "2020": {
       "Bioenergy": 0.0058,
-      "Hydro": 0.7436,
-      "Solar": 0.2053,
+      "Hydro": 0.7432,
+      "Solar": 0.2057,
       "Wind": 0.0453
     },
     "2021": {
       "Bioenergy": 0.0058,
-      "Hydro": 0.7436,
-      "Solar": 0.2053,
+      "Hydro": 0.7432,
+      "Solar": 0.2057,
       "Wind": 0.0453
     },
     "2022": {
       "Bioenergy": 0.0058,
-      "Hydro": 0.7436,
-      "Solar": 0.2053,
+      "Hydro": 0.7432,
+      "Solar": 0.2057,
       "Wind": 0.0453
     },
     "2023": {
       "Bioenergy": 0.0058,
-      "Hydro": 0.7436,
-      "Solar": 0.2053,
+      "Hydro": 0.7432,
+      "Solar": 0.2057,
       "Wind": 0.0453
     },
     "2024": {
       "Bioenergy": 0.0058,
-      "Hydro": 0.7436,
-      "Solar": 0.2053,
+      "Hydro": 0.7432,
+      "Solar": 0.2057,
       "Wind": 0.0453
     },
     "2025": {
       "Bioenergy": 0.0058,
-      "Hydro": 0.7436,
-      "Solar": 0.2053,
+      "Hydro": 0.7432,
+      "Solar": 0.2057,
       "Wind": 0.0453
     }
   },
@@ -6074,45 +6074,45 @@
   "NE": {
     "2019": {
       "Bioenergy": 0.0169,
-      "Hydro": 0.738,
-      "Solar": 0.1435,
-      "Wind": 0.1016
+      "Hydro": 0.7367,
+      "Solar": 0.1442,
+      "Wind": 0.1021
     },
     "2020": {
       "Bioenergy": 0.0169,
-      "Hydro": 0.738,
-      "Solar": 0.1435,
-      "Wind": 0.1016
+      "Hydro": 0.7367,
+      "Solar": 0.1442,
+      "Wind": 0.1021
     },
     "2021": {
       "Bioenergy": 0.0169,
-      "Hydro": 0.738,
-      "Solar": 0.1435,
-      "Wind": 0.1016
+      "Hydro": 0.7367,
+      "Solar": 0.1442,
+      "Wind": 0.1021
     },
     "2022": {
       "Bioenergy": 0.0169,
-      "Hydro": 0.738,
-      "Solar": 0.1435,
-      "Wind": 0.1016
+      "Hydro": 0.7367,
+      "Solar": 0.1442,
+      "Wind": 0.1021
     },
     "2023": {
       "Bioenergy": 0.0169,
-      "Hydro": 0.738,
-      "Solar": 0.1435,
-      "Wind": 0.1016
+      "Hydro": 0.7367,
+      "Solar": 0.1442,
+      "Wind": 0.1021
     },
     "2024": {
       "Bioenergy": 0.0169,
-      "Hydro": 0.738,
-      "Solar": 0.1435,
-      "Wind": 0.1016
+      "Hydro": 0.7367,
+      "Solar": 0.1442,
+      "Wind": 0.1021
     },
     "2025": {
       "Bioenergy": 0.0169,
-      "Hydro": 0.738,
-      "Solar": 0.1435,
-      "Wind": 0.1016
+      "Hydro": 0.7367,
+      "Solar": 0.1442,
+      "Wind": 0.1021
     }
   },
   "NG": {
@@ -6186,65 +6186,65 @@
     },
     "2023": {
       "Bioenergy": 0.4022,
-      "Hydro": 0.2051,
+      "Hydro": 0.2052,
       "Solar": 0.0263,
-      "Wind": 0.3664
+      "Wind": 0.3663
     },
     "2024": {
       "Bioenergy": 0.4021,
       "Hydro": 0.201,
       "Solar": 0.0294,
-      "Wind": 0.3676
+      "Wind": 0.3675
     },
     "2025": {
-      "Bioenergy": 0.3987,
-      "Hydro": 0.2065,
-      "Solar": 0.0315,
-      "Wind": 0.3634
+      "Bioenergy": 0.3995,
+      "Hydro": 0.2045,
+      "Solar": 0.031,
+      "Wind": 0.3651
     }
   },
   "NL": {
     "2019": {
       "Bioenergy": 0.2235,
-      "Hydro": 0.0257,
+      "Hydro": 0.0255,
       "Solar": 0.2425,
-      "Wind": 0.5084
+      "Wind": 0.5085
     },
     "2020": {
-      "Bioenergy": 0.2457,
-      "Hydro": 0.0079,
-      "Solar": 0.2638,
-      "Wind": 0.4827
+      "Bioenergy": 0.2456,
+      "Hydro": 0.0078,
+      "Solar": 0.2639,
+      "Wind": 0.4826
     },
     "2021": {
-      "Bioenergy": 0.248,
-      "Hydro": 0.0162,
-      "Solar": 0.2893,
-      "Wind": 0.4464
+      "Bioenergy": 0.2575,
+      "Hydro": 0.0153,
+      "Solar": 0.2974,
+      "Wind": 0.4298
     },
     "2022": {
-      "Bioenergy": 0.1866,
-      "Hydro": 0.0035,
-      "Solar": 0.3536,
-      "Wind": 0.4563
+      "Bioenergy": 0.2057,
+      "Hydro": 0.0033,
+      "Solar": 0.3656,
+      "Wind": 0.4254
     },
     "2023": {
-      "Bioenergy": 0.122,
-      "Hydro": 0.0026,
-      "Solar": 0.3466,
-      "Wind": 0.5288
+      "Bioenergy": 0.123,
+      "Hydro": 0.0025,
+      "Solar": 0.3673,
+      "Wind": 0.5073
     },
     "2024": {
-      "Bioenergy": 0.0975,
-      "Hydro": 0.0035,
-      "Solar": 0.3575,
-      "Wind": 0.5415
+      "Bioenergy": 0.0978,
+      "Hydro": 0.0033,
+      "Solar": 0.3857,
+      "Wind": 0.5132
     },
     "2025": {
-      "Bioenergy": 0.1273,
-      "Hydro": 0.0018,
-      "Solar": 0.4306,
-      "Wind": 0.4404
+      "Bioenergy": 0.0958,
+      "Hydro": 0.0008,
+      "Solar": 0.4896,
+      "Wind": 0.4138
     }
   },
   "NO": {
@@ -6286,9 +6286,9 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.9151,
+      "Hydro": 0.9159,
       "Solar": 0,
-      "Wind": 0.0849
+      "Wind": 0.0841
     }
   },
   "NP": {
@@ -6305,19 +6305,19 @@
       "Wind": 0.0128
     },
     "2021": {
-      "Bioenergy": 0.0047,
+      "Bioenergy": 0.0048,
       "Hydro": 0.9571,
       "Solar": 0.0226,
       "Wind": 0.0156
     },
     "2022": {
-      "Bioenergy": 0.0051,
+      "Bioenergy": 0.0052,
       "Hydro": 0.953,
       "Solar": 0.0248,
       "Wind": 0.0171
     },
     "2023": {
-      "Bioenergy": 0.0053,
+      "Bioenergy": 0.0054,
       "Hydro": 0.9486,
       "Solar": 0.0273,
       "Wind": 0.0187
@@ -6325,14 +6325,14 @@
     "2024": {
       "Bioenergy": 0.0051,
       "Hydro": 0.9444,
-      "Solar": 0.031,
+      "Solar": 0.0309,
       "Wind": 0.0195
     },
     "2025": {
-      "Bioenergy": 0.0051,
-      "Hydro": 0.935,
-      "Solar": 0.036,
-      "Wind": 0.024
+      "Bioenergy": 0.005,
+      "Hydro": 0.9354,
+      "Solar": 0.0361,
+      "Wind": 0.0235
     }
   },
   "NR": {
@@ -6725,10 +6725,10 @@
       "Wind": 0.0721
     },
     "2025": {
-      "Bioenergy": 0.0764,
-      "Hydro": 0.597,
-      "Solar": 0.2647,
-      "Wind": 0.0619
+      "Bioenergy": 0.0743,
+      "Hydro": 0.6201,
+      "Solar": 0.2515,
+      "Wind": 0.0541
     }
   },
   "PK": {
@@ -6769,18 +6769,18 @@
       "Wind": 0.055
     },
     "2025": {
-      "Bioenergy": 0.0114,
-      "Hydro": 0.3548,
-      "Solar": 0.5677,
-      "Wind": 0.0661
+      "Bioenergy": 0.0093,
+      "Hydro": 0.4511,
+      "Solar": 0.4848,
+      "Wind": 0.0548
     }
   },
   "PL": {
     "2019": {
       "Bioenergy": 0.1058,
-      "Hydro": 0.1469,
+      "Hydro": 0.1468,
       "Solar": 0.0478,
-      "Wind": 0.6995
+      "Wind": 0.6996
     },
     "2020": {
       "Bioenergy": 0.0963,
@@ -6803,8 +6803,8 @@
     "2023": {
       "Bioenergy": 0.0544,
       "Hydro": 0.0656,
-      "Solar": 0.331,
-      "Wind": 0.549
+      "Solar": 0.3311,
+      "Wind": 0.5489
     },
     "2024": {
       "Bioenergy": 0.052,
@@ -6813,10 +6813,10 @@
       "Wind": 0.5179
     },
     "2025": {
-      "Bioenergy": 0.0675,
-      "Hydro": 0.0392,
-      "Solar": 0.435,
-      "Wind": 0.4583
+      "Bioenergy": 0.0646,
+      "Hydro": 0.0357,
+      "Solar": 0.4291,
+      "Wind": 0.4706
     }
   },
   "PM": {
@@ -6903,8 +6903,8 @@
     "2025": {
       "Bioenergy": 0,
       "Hydro": 0,
-      "Solar": 0.5787,
-      "Wind": 0.4213
+      "Solar": 0.4998,
+      "Wind": 0.5002
     }
   },
   "PS": {
@@ -6956,7 +6956,7 @@
       "Bioenergy": 0.1108,
       "Hydro": 0.3007,
       "Solar": 0.0478,
-      "Wind": 0.5407
+      "Wind": 0.5408
     },
     "2020": {
       "Bioenergy": 0.1187,
@@ -6965,34 +6965,34 @@
       "Wind": 0.4376
     },
     "2021": {
-      "Bioenergy": 0.1225,
+      "Bioenergy": 0.1226,
       "Hydro": 0.3554,
-      "Solar": 0.068,
+      "Solar": 0.0681,
       "Wind": 0.454
     },
     "2022": {
-      "Bioenergy": 0.1292,
-      "Hydro": 0.2462,
-      "Solar": 0.1205,
+      "Bioenergy": 0.1293,
+      "Hydro": 0.2461,
+      "Solar": 0.1206,
       "Wind": 0.5041
     },
     "2023": {
       "Bioenergy": 0.0942,
-      "Hydro": 0.3452,
-      "Solar": 0.1427,
-      "Wind": 0.4179
+      "Hydro": 0.345,
+      "Solar": 0.1431,
+      "Wind": 0.4177
     },
     "2024": {
       "Bioenergy": 0.0861,
-      "Hydro": 0.3543,
-      "Solar": 0.1675,
-      "Wind": 0.3921
+      "Hydro": 0.3541,
+      "Solar": 0.1678,
+      "Wind": 0.392
     },
     "2025": {
-      "Bioenergy": 0.0672,
-      "Hydro": 0.4404,
-      "Solar": 0.1591,
-      "Wind": 0.3333
+      "Bioenergy": 0.069,
+      "Hydro": 0.4192,
+      "Solar": 0.1689,
+      "Wind": 0.3428
     }
   },
   "PY": {
@@ -7155,20 +7155,20 @@
     "2023": {
       "Bioenergy": 0.0132,
       "Hydro": 0.6463,
-      "Solar": 0.0765,
+      "Solar": 0.0766,
       "Wind": 0.264
     },
     "2024": {
-      "Bioenergy": 0.0206,
-      "Hydro": 0.5592,
-      "Solar": 0.1665,
+      "Bioenergy": 0.0205,
+      "Hydro": 0.559,
+      "Solar": 0.1667,
       "Wind": 0.2537
     },
     "2025": {
-      "Bioenergy": 0.022,
-      "Hydro": 0.5131,
-      "Solar": 0.2084,
-      "Wind": 0.2565
+      "Bioenergy": 0.0218,
+      "Hydro": 0.5038,
+      "Solar": 0.2256,
+      "Wind": 0.2488
     }
   },
   "RS": {
@@ -7182,19 +7182,19 @@
       "Bioenergy": 0.0156,
       "Hydro": 0.881,
       "Solar": 0.0009,
-      "Wind": 0.1026
+      "Wind": 0.1025
     },
     "2021": {
       "Bioenergy": 0.0246,
       "Hydro": 0.8693,
-      "Solar": 0.0049,
-      "Wind": 0.1012
+      "Solar": 0.005,
+      "Wind": 0.1011
     },
     "2022": {
       "Bioenergy": 0.0318,
-      "Hydro": 0.8243,
-      "Solar": 0.0176,
-      "Wind": 0.1264
+      "Hydro": 0.8241,
+      "Solar": 0.0177,
+      "Wind": 0.1263
     },
     "2023": {
       "Bioenergy": 0.0184,
@@ -7204,15 +7204,15 @@
     },
     "2024": {
       "Bioenergy": 0.0252,
-      "Hydro": 0.8486,
-      "Solar": 0.0162,
+      "Hydro": 0.8483,
+      "Solar": 0.0164,
       "Wind": 0.11
     },
     "2025": {
-      "Bioenergy": 0.0246,
-      "Hydro": 0.8358,
-      "Solar": 0.0135,
-      "Wind": 0.1261
+      "Bioenergy": 0.0268,
+      "Hydro": 0.8321,
+      "Solar": 0.0124,
+      "Wind": 0.1287
     }
   },
   "RU": {
@@ -7253,10 +7253,10 @@
       "Wind": 0.0243
     },
     "2025": {
-      "Bioenergy": 0.0052,
-      "Hydro": 0.962,
+      "Bioenergy": 0.0044,
+      "Hydro": 0.9632,
       "Solar": 0.0103,
-      "Wind": 0.0226
+      "Wind": 0.0222
     }
   },
   "RW": {
@@ -7517,10 +7517,10 @@
       "Wind": 0.358
     },
     "2025": {
-      "Bioenergy": 0.0577,
-      "Hydro": 0.5591,
-      "Solar": 0.0192,
-      "Wind": 0.3641
+      "Bioenergy": 0.0554,
+      "Hydro": 0.5654,
+      "Solar": 0.0203,
+      "Wind": 0.3589
     }
   },
   "SG": {
@@ -7543,13 +7543,13 @@
       "Wind": 0
     },
     "2022": {
-      "Bioenergy": 0.005,
+      "Bioenergy": 0.0051,
       "Hydro": 0.0376,
-      "Solar": 0.9442,
+      "Solar": 0.9441,
       "Wind": 0.0132
     },
     "2023": {
-      "Bioenergy": 0.0019,
+      "Bioenergy": 0.002,
       "Hydro": 0.0077,
       "Solar": 0.9842,
       "Wind": 0.0062
@@ -7562,9 +7562,9 @@
     },
     "2025": {
       "Bioenergy": 0.0034,
-      "Hydro": 0.0154,
-      "Solar": 0.9659,
-      "Wind": 0.0152
+      "Hydro": 0.0167,
+      "Solar": 0.965,
+      "Wind": 0.0149
     }
   },
   "SH": {
@@ -7620,21 +7620,21 @@
     },
     "2020": {
       "Bioenergy": 0.0255,
-      "Hydro": 0.9106,
+      "Hydro": 0.9107,
       "Solar": 0.0525,
-      "Wind": 0.0114
+      "Wind": 0.0113
     },
     "2021": {
-      "Bioenergy": 0.0158,
+      "Bioenergy": 0.0159,
       "Hydro": 0.9108,
       "Solar": 0.0603,
       "Wind": 0.0131
     },
     "2022": {
-      "Bioenergy": 0.0298,
-      "Hydro": 0.8047,
-      "Solar": 0.1212,
-      "Wind": 0.0443
+      "Bioenergy": 0.0299,
+      "Hydro": 0.8046,
+      "Solar": 0.1214,
+      "Wind": 0.0442
     },
     "2023": {
       "Bioenergy": 0.0133,
@@ -7644,14 +7644,14 @@
     },
     "2024": {
       "Bioenergy": 0.0198,
-      "Hydro": 0.7927,
-      "Solar": 0.1822,
+      "Hydro": 0.7926,
+      "Solar": 0.1823,
       "Wind": 0.0053
     },
     "2025": {
-      "Bioenergy": 0.0186,
-      "Hydro": 0.6826,
-      "Solar": 0.2976,
+      "Bioenergy": 0.0191,
+      "Hydro": 0.6604,
+      "Solar": 0.3194,
       "Wind": 0.0012
     }
   },
@@ -7670,14 +7670,14 @@
     },
     "2021": {
       "Bioenergy": 0.1554,
-      "Hydro": 0.7356,
+      "Hydro": 0.7355,
       "Solar": 0.0909,
       "Wind": 0.0182
     },
     "2022": {
       "Bioenergy": 0.1474,
-      "Hydro": 0.712,
-      "Solar": 0.1129,
+      "Hydro": 0.7119,
+      "Solar": 0.113,
       "Wind": 0.0277
     },
     "2023": {
@@ -7693,9 +7693,9 @@
       "Wind": 0.0002
     },
     "2025": {
-      "Bioenergy": 0.2189,
-      "Hydro": 0.6408,
-      "Solar": 0.1402,
+      "Bioenergy": 0.21,
+      "Hydro": 0.646,
+      "Solar": 0.144,
       "Wind": 0
     }
   },
@@ -7745,45 +7745,45 @@
   },
   "SN": {
     "2019": {
-      "Bioenergy": 0.1434,
-      "Hydro": 0.4289,
-      "Solar": 0.3957,
+      "Bioenergy": 0.1435,
+      "Hydro": 0.4287,
+      "Solar": 0.3959,
       "Wind": 0.0319
     },
     "2020": {
-      "Bioenergy": 0.1434,
-      "Hydro": 0.4289,
-      "Solar": 0.3957,
+      "Bioenergy": 0.1435,
+      "Hydro": 0.4287,
+      "Solar": 0.3959,
       "Wind": 0.0319
     },
     "2021": {
-      "Bioenergy": 0.1434,
-      "Hydro": 0.4289,
-      "Solar": 0.3957,
+      "Bioenergy": 0.1435,
+      "Hydro": 0.4287,
+      "Solar": 0.3959,
       "Wind": 0.0319
     },
     "2022": {
-      "Bioenergy": 0.1434,
-      "Hydro": 0.4289,
-      "Solar": 0.3957,
+      "Bioenergy": 0.1435,
+      "Hydro": 0.4287,
+      "Solar": 0.3959,
       "Wind": 0.0319
     },
     "2023": {
-      "Bioenergy": 0.1434,
-      "Hydro": 0.4289,
-      "Solar": 0.3957,
+      "Bioenergy": 0.1435,
+      "Hydro": 0.4287,
+      "Solar": 0.3959,
       "Wind": 0.0319
     },
     "2024": {
-      "Bioenergy": 0.1434,
-      "Hydro": 0.4289,
-      "Solar": 0.3957,
+      "Bioenergy": 0.1435,
+      "Hydro": 0.4287,
+      "Solar": 0.3959,
       "Wind": 0.0319
     },
     "2025": {
-      "Bioenergy": 0.1434,
-      "Hydro": 0.4289,
-      "Solar": 0.3957,
+      "Bioenergy": 0.1435,
+      "Hydro": 0.4287,
+      "Solar": 0.3959,
       "Wind": 0.0319
     }
   },
@@ -7995,16 +7995,16 @@
       "Wind": 0.0501
     },
     "2024": {
-      "Bioenergy": 0.0986,
-      "Hydro": 0.5892,
-      "Solar": 0.2943,
-      "Wind": 0.0179
+      "Bioenergy": 0.1322,
+      "Hydro": 0.533,
+      "Solar": 0.2982,
+      "Wind": 0.0366
     },
     "2025": {
-      "Bioenergy": 0,
-      "Hydro": 0.7408,
-      "Solar": 0.2592,
-      "Wind": 0
+      "Bioenergy": 0.2817,
+      "Hydro": 0.3335,
+      "Solar": 0.2899,
+      "Wind": 0.0949
     }
   },
   "SY": {
@@ -8053,46 +8053,46 @@
   },
   "SZ": {
     "2019": {
-      "Bioenergy": 0.3399,
-      "Hydro": 0.605,
+      "Bioenergy": 0.3405,
+      "Hydro": 0.6043,
       "Solar": 0.0199,
-      "Wind": 0.0352
+      "Wind": 0.0353
     },
     "2020": {
-      "Bioenergy": 0.3399,
-      "Hydro": 0.605,
+      "Bioenergy": 0.3405,
+      "Hydro": 0.6043,
       "Solar": 0.0199,
-      "Wind": 0.0352
+      "Wind": 0.0353
     },
     "2021": {
-      "Bioenergy": 0.3399,
-      "Hydro": 0.605,
+      "Bioenergy": 0.3405,
+      "Hydro": 0.6043,
       "Solar": 0.0199,
-      "Wind": 0.0352
+      "Wind": 0.0353
     },
     "2022": {
-      "Bioenergy": 0.3399,
-      "Hydro": 0.605,
+      "Bioenergy": 0.3405,
+      "Hydro": 0.6043,
       "Solar": 0.0199,
-      "Wind": 0.0352
+      "Wind": 0.0353
     },
     "2023": {
-      "Bioenergy": 0.3399,
-      "Hydro": 0.605,
+      "Bioenergy": 0.3405,
+      "Hydro": 0.6043,
       "Solar": 0.0199,
-      "Wind": 0.0352
+      "Wind": 0.0353
     },
     "2024": {
-      "Bioenergy": 0.3399,
-      "Hydro": 0.605,
+      "Bioenergy": 0.3405,
+      "Hydro": 0.6043,
       "Solar": 0.0199,
-      "Wind": 0.0352
+      "Wind": 0.0353
     },
     "2025": {
-      "Bioenergy": 0.3399,
-      "Hydro": 0.605,
+      "Bioenergy": 0.3405,
+      "Hydro": 0.6043,
       "Solar": 0.0199,
-      "Wind": 0.0352
+      "Wind": 0.0353
     }
   },
   "TC": {
@@ -8186,45 +8186,45 @@
   "TG": {
     "2019": {
       "Bioenergy": 0.0104,
-      "Hydro": 0.8579,
-      "Solar": 0.069,
-      "Wind": 0.0628
+      "Hydro": 0.8574,
+      "Solar": 0.0692,
+      "Wind": 0.0629
     },
     "2020": {
       "Bioenergy": 0.0104,
-      "Hydro": 0.8579,
-      "Solar": 0.069,
-      "Wind": 0.0628
+      "Hydro": 0.8574,
+      "Solar": 0.0692,
+      "Wind": 0.0629
     },
     "2021": {
       "Bioenergy": 0.0104,
-      "Hydro": 0.8579,
-      "Solar": 0.069,
-      "Wind": 0.0628
+      "Hydro": 0.8574,
+      "Solar": 0.0692,
+      "Wind": 0.0629
     },
     "2022": {
       "Bioenergy": 0.0104,
-      "Hydro": 0.8579,
-      "Solar": 0.069,
-      "Wind": 0.0628
+      "Hydro": 0.8574,
+      "Solar": 0.0692,
+      "Wind": 0.0629
     },
     "2023": {
       "Bioenergy": 0.0104,
-      "Hydro": 0.8579,
-      "Solar": 0.069,
-      "Wind": 0.0628
+      "Hydro": 0.8574,
+      "Solar": 0.0692,
+      "Wind": 0.0629
     },
     "2024": {
       "Bioenergy": 0.0104,
-      "Hydro": 0.8579,
-      "Solar": 0.069,
-      "Wind": 0.0628
+      "Hydro": 0.8574,
+      "Solar": 0.0692,
+      "Wind": 0.0629
     },
     "2025": {
       "Bioenergy": 0.0104,
-      "Hydro": 0.8579,
-      "Solar": 0.069,
-      "Wind": 0.0628
+      "Hydro": 0.8574,
+      "Solar": 0.0692,
+      "Wind": 0.0629
     }
   },
   "TH": {
@@ -8236,21 +8236,21 @@
     },
     "2020": {
       "Bioenergy": 0.4077,
-      "Hydro": 0.264,
+      "Hydro": 0.2639,
       "Solar": 0.1878,
       "Wind": 0.1406
     },
     "2021": {
       "Bioenergy": 0.4041,
       "Hydro": 0.2572,
-      "Solar": 0.1635,
+      "Solar": 0.1634,
       "Wind": 0.1752
     },
     "2022": {
       "Bioenergy": 0.3871,
       "Hydro": 0.2971,
-      "Solar": 0.1806,
-      "Wind": 0.1353
+      "Solar": 0.1805,
+      "Wind": 0.1352
     },
     "2023": {
       "Bioenergy": 0.392,
@@ -8265,10 +8265,10 @@
       "Wind": 0.1575
     },
     "2025": {
-      "Bioenergy": 0.3433,
-      "Hydro": 0.27,
-      "Solar": 0.2523,
-      "Wind": 0.1343
+      "Bioenergy": 0.3071,
+      "Hydro": 0.2584,
+      "Solar": 0.296,
+      "Wind": 0.1386
     }
   },
   "TJ": {
@@ -8312,7 +8312,7 @@
       "Bioenergy": 0.0004,
       "Hydro": 0.996,
       "Solar": 0.0019,
-      "Wind": 0.0018
+      "Wind": 0.0017
     }
   },
   "TL": {
@@ -8529,10 +8529,10 @@
       "Wind": 0.2511
     },
     "2025": {
-      "Bioenergy": 0.0563,
-      "Hydro": 0.4816,
-      "Solar": 0.2275,
-      "Wind": 0.2345
+      "Bioenergy": 0.0567,
+      "Hydro": 0.4531,
+      "Solar": 0.2388,
+      "Wind": 0.2515
     }
   },
   "TT": {
@@ -8617,10 +8617,10 @@
       "Wind": 0.3484
     },
     "2025": {
-      "Bioenergy": 0.0076,
-      "Hydro": 0.1448,
-      "Solar": 0.4219,
-      "Wind": 0.4258
+      "Bioenergy": 0.0074,
+      "Hydro": 0.1622,
+      "Solar": 0.4296,
+      "Wind": 0.4008
     }
   },
   "TZ": {
@@ -8683,13 +8683,13 @@
     "2021": {
       "Bioenergy": 0.0014,
       "Hydro": 0.479,
-      "Solar": 0.0008,
+      "Solar": 0.0009,
       "Wind": 0.5187
     },
     "2022": {
       "Bioenergy": 0.0007,
       "Hydro": 0.5636,
-      "Solar": 0.0006,
+      "Solar": 0.0007,
       "Wind": 0.4351
     },
     "2023": {
@@ -8794,9 +8794,9 @@
     },
     "2025": {
       "Bioenergy": 0.0377,
-      "Hydro": 0.222,
-      "Solar": 0.3138,
-      "Wind": 0.4265
+      "Hydro": 0.2221,
+      "Solar": 0.3156,
+      "Wind": 0.4246
     }
   },
   "UY": {
@@ -8837,10 +8837,10 @@
       "Wind": 0.3343
     },
     "2025": {
-      "Bioenergy": 0.1501,
-      "Hydro": 0.445,
-      "Solar": 0.0458,
-      "Wind": 0.359
+      "Bioenergy": 0.1462,
+      "Hydro": 0.4631,
+      "Solar": 0.0441,
+      "Wind": 0.3466
     }
   },
   "UZ": {
@@ -8859,7 +8859,7 @@
     "2021": {
       "Bioenergy": 0.0037,
       "Hydro": 0.9754,
-      "Solar": 0.01,
+      "Solar": 0.0099,
       "Wind": 0.011
     },
     "2022": {
@@ -8881,10 +8881,10 @@
       "Wind": 0.0141
     },
     "2025": {
-      "Bioenergy": 0.004,
-      "Hydro": 0.9579,
-      "Solar": 0.0206,
-      "Wind": 0.0176
+      "Bioenergy": 0.0039,
+      "Hydro": 0.9582,
+      "Solar": 0.0207,
+      "Wind": 0.0172
     }
   },
   "VC": {
@@ -9215,28 +9215,28 @@
       "Wind": 0.2904
     },
     "2022": {
-      "Bioenergy": 0.0263,
-      "Hydro": 0.331,
-      "Solar": 0.0178,
-      "Wind": 0.6249
+      "Bioenergy": 0.0265,
+      "Hydro": 0.3308,
+      "Solar": 0.0181,
+      "Wind": 0.6246
     },
     "2023": {
-      "Bioenergy": 0.0235,
-      "Hydro": 0.4719,
-      "Solar": 0.0402,
-      "Wind": 0.4644
+      "Bioenergy": 0.0236,
+      "Hydro": 0.4717,
+      "Solar": 0.0406,
+      "Wind": 0.4642
     },
     "2024": {
-      "Bioenergy": 0.0281,
-      "Hydro": 0.3922,
-      "Solar": 0.0418,
-      "Wind": 0.538
+      "Bioenergy": 0.0279,
+      "Hydro": 0.3917,
+      "Solar": 0.043,
+      "Wind": 0.5374
     },
     "2025": {
-      "Bioenergy": 0.0374,
-      "Hydro": 0.4719,
-      "Solar": 0.1058,
-      "Wind": 0.385
+      "Bioenergy": 0.0358,
+      "Hydro": 0.4698,
+      "Solar": 0.1083,
+      "Wind": 0.3861
     }
   },
   "YE": {
@@ -9316,7 +9316,7 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Hydro": 0.0344,
+      "Hydro": 0.0343,
       "Solar": 0.6221,
       "Wind": 0.3435
     },