npm - @digital4better/data - Versions diffs - 1.3.31 → 1.3.32 - Mend

@digital4better/data 1.3.31 → 1.3.32

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 (71) hide show

package/data/country/region-to-region-distances.csv +627 -0
package/data/country/region-to-region-distances.json +627 -0
package/data/country/regions.csv +1 -0
package/data/country/regions.json +11 -1
package/data/country/user-to-datacenter-distances.csv +1 -0
package/data/country/user-to-datacenter-distances.json +1 -0
package/data/factor/continent-monthly-green.csv +355 -349
package/data/factor/continent-monthly-green.json +3201 -3135
package/data/factor/continent-monthly.csv +355 -349
package/data/factor/continent-monthly.json +3197 -3131
package/data/factor/continent-yearly-green.csv +36 -36
package/data/factor/continent-yearly-green.json +324 -324
package/data/factor/continent-yearly.csv +36 -36
package/data/factor/continent-yearly.json +324 -324
package/data/factor/country-monthly-green.csv +3650 -3436
package/data/factor/country-monthly-green.json +31519 -29165
package/data/factor/country-monthly.csv +3842 -3628
package/data/factor/country-monthly.json +28634 -26280
package/data/factor/country-yearly-green.csv +511 -511
package/data/factor/country-yearly-green.json +4333 -4333
package/data/factor/country-yearly.csv +504 -504
package/data/factor/country-yearly.json +3805 -3805
package/data/factor/subdivision-monthly-green.csv +838 -689
package/data/factor/subdivision-monthly-green.json +7735 -6094
package/data/factor/subdivision-monthly.csv +838 -689
package/data/factor/subdivision-monthly.json +7606 -5965
package/data/factor/subdivision-yearly-green.csv +134 -126
package/data/factor/subdivision-yearly-green.json +1224 -1134
package/data/factor/subdivision-yearly.csv +134 -126
package/data/factor/subdivision-yearly.json +1224 -1134
package/data/factor/world-monthly-green.csv +86 -85
package/data/factor/world-monthly-green.json +776 -765
package/data/factor/world-monthly.csv +86 -85
package/data/factor/world-monthly.json +776 -765
package/data/factor/world-yearly-green.csv +8 -8
package/data/factor/world-yearly-green.json +72 -72
package/data/factor/world-yearly.csv +8 -8
package/data/factor/world-yearly.json +72 -72
package/data/mix/continent-monthly-green.csv +351 -345
package/data/mix/continent-monthly-green.json +1196 -1160
package/data/mix/continent-monthly.csv +351 -345
package/data/mix/continent-monthly.json +1793 -1727
package/data/mix/continent-yearly-green.csv +35 -35
package/data/mix/continent-yearly-green.json +119 -119
package/data/mix/continent-yearly.csv +35 -35
package/data/mix/continent-yearly.json +198 -198
package/data/mix/country-monthly-green.csv +2661 -2447
package/data/mix/country-monthly-green.json +9257 -7973
package/data/mix/country-monthly.csv +2661 -2447
package/data/mix/country-monthly.json +12965 -10611
package/data/mix/country-yearly-green.csv +324 -324
package/data/mix/country-yearly-green.json +1068 -1068
package/data/mix/country-yearly.csv +324 -324
package/data/mix/country-yearly.json +1638 -1638
package/data/mix/subdivision-monthly-green.csv +692 -543
package/data/mix/subdivision-monthly-green.json +2606 -1710
package/data/mix/subdivision-monthly.csv +692 -543
package/data/mix/subdivision-monthly.json +3968 -2327
package/data/mix/subdivision-yearly-green.csv +134 -126
package/data/mix/subdivision-yearly-green.json +480 -430
package/data/mix/subdivision-yearly.csv +134 -126
package/data/mix/subdivision-yearly.json +874 -784
package/data/mix/world-monthly-green.csv +86 -85
package/data/mix/world-monthly-green.json +338 -332
package/data/mix/world-monthly.csv +86 -85
package/data/mix/world-monthly.json +644 -633
package/data/mix/world-yearly-green.csv +8 -8
package/data/mix/world-yearly-green.json +32 -32
package/data/mix/world-yearly.csv +8 -8
package/data/mix/world-yearly.json +60 -60
package/package.json +1 -1

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

@@ -52,51 +52,51 @@
   "AF": {
     "2019": {
       "Bioenergy": 0.0318,
-      "Hydro": 0.7953,
-      "Solar": 0.0883,
-      "Wind": 0.0846
+      "Hydro": 0.7952,
+      "Solar": 0.0885,
+      "Wind": 0.0845
     },
     "2020": {
-      "Bioenergy": 0.0344,
-      "Hydro": 0.7781,
-      "Solar": 0.0968,
-      "Wind": 0.0907
+      "Bioenergy": 0.0343,
+      "Hydro": 0.7776,
+      "Solar": 0.0975,
+      "Wind": 0.0906
     },
     "2021": {
-      "Bioenergy": 0.0378,
-      "Hydro": 0.7443,
-      "Solar": 0.1062,
-      "Wind": 0.1116
+      "Bioenergy": 0.0377,
+      "Hydro": 0.7435,
+      "Solar": 0.1073,
+      "Wind": 0.1115
     },
     "2022": {
-      "Bioenergy": 0.0399,
-      "Hydro": 0.7195,
-      "Solar": 0.1204,
-      "Wind": 0.1202
+      "Bioenergy": 0.0398,
+      "Hydro": 0.7185,
+      "Solar": 0.1217,
+      "Wind": 0.12
     },
     "2023": {
-      "Bioenergy": 0.0411,
-      "Hydro": 0.6876,
-      "Solar": 0.1392,
-      "Wind": 0.1321
+      "Bioenergy": 0.041,
+      "Hydro": 0.6867,
+      "Solar": 0.1405,
+      "Wind": 0.1318
     },
     "2024": {
-      "Bioenergy": 0.0378,
-      "Hydro": 0.6673,
-      "Solar": 0.1617,
-      "Wind": 0.1332
+      "Bioenergy": 0.0377,
+      "Hydro": 0.6659,
+      "Solar": 0.1636,
+      "Wind": 0.1328
     },
     "2025": {
-      "Bioenergy": 0.0353,
-      "Hydro": 0.6321,
-      "Solar": 0.1931,
-      "Wind": 0.1395
+      "Bioenergy": 0.0354,
+      "Hydro": 0.6307,
+      "Solar": 0.1949,
+      "Wind": 0.139
     },
     "2026": {
-      "Bioenergy": 0.0367,
-      "Hydro": 0.6099,
-      "Solar": 0.1862,
-      "Wind": 0.1673
+      "Bioenergy": 0.041,
+      "Hydro": 0.6139,
+      "Solar": 0.1794,
+      "Wind": 0.1658
     }
   },
   "AG": {
@@ -152,20 +152,20 @@
   "AL": {
     "2019": {
       "Bioenergy": 0.0112,
-      "Hydro": 0.9357,
+      "Hydro": 0.9358,
       "Solar": 0.0159,
       "Wind": 0.0371
     },
     "2020": {
-      "Bioenergy": 0.0117,
-      "Hydro": 0.9277,
+      "Bioenergy": 0.0116,
+      "Hydro": 0.9278,
       "Solar": 0.0185,
-      "Wind": 0.0421
+      "Wind": 0.042
     },
     "2021": {
       "Bioenergy": 0.012,
       "Hydro": 0.9285,
-      "Solar": 0.0196,
+      "Solar": 0.0197,
       "Wind": 0.0398
     },
     "2022": {
@@ -182,21 +182,21 @@
     },
     "2024": {
       "Bioenergy": 0.0109,
-      "Hydro": 0.9064,
+      "Hydro": 0.9063,
       "Solar": 0.0331,
       "Wind": 0.0497
     },
     "2025": {
-      "Bioenergy": 0.0108,
-      "Hydro": 0.9001,
-      "Solar": 0.0397,
-      "Wind": 0.0494
+      "Bioenergy": 0.0109,
+      "Hydro": 0.9002,
+      "Solar": 0.0396,
+      "Wind": 0.0493
     },
     "2026": {
-      "Bioenergy": 0.0112,
-      "Hydro": 0.9143,
-      "Solar": 0.0153,
-      "Wind": 0.0592
+      "Bioenergy": 0.0109,
+      "Hydro": 0.9128,
+      "Solar": 0.0149,
+      "Wind": 0.0614
     }
   },
   "AM": {
@@ -220,26 +220,26 @@
     },
     "2022": {
       "Bioenergy": 0.0006,
-      "Hydro": 0.8855,
+      "Hydro": 0.8854,
       "Solar": 0.1117,
       "Wind": 0.0022
     },
     "2023": {
       "Bioenergy": 0.0008,
-      "Hydro": 0.8075,
-      "Solar": 0.1887,
+      "Hydro": 0.8074,
+      "Solar": 0.1888,
       "Wind": 0.003
     },
     "2024": {
       "Bioenergy": 0.0012,
       "Hydro": 0.7893,
-      "Solar": 0.2049,
+      "Solar": 0.205,
       "Wind": 0.0045
     },
     "2025": {
       "Bioenergy": 0.0003,
       "Hydro": 0.8255,
-      "Solar": 0.173,
+      "Solar": 0.1731,
       "Wind": 0.0012
     },
     "2026": {
@@ -301,52 +301,52 @@
   },
   "AR": {
     "2019": {
-      "Bioenergy": 0.0131,
-      "Hydro": 0.8528,
-      "Solar": 0.0189,
-      "Wind": 0.1153
+      "Bioenergy": 0.0147,
+      "Hydro": 0.8514,
+      "Solar": 0.0188,
+      "Wind": 0.1151
     },
     "2020": {
-      "Bioenergy": 0.0176,
-      "Hydro": 0.7277,
+      "Bioenergy": 0.0182,
+      "Hydro": 0.7272,
       "Solar": 0.0319,
-      "Wind": 0.2228
+      "Wind": 0.2227
     },
     "2021": {
-      "Bioenergy": 0.0267,
-      "Hydro": 0.6088,
+      "Bioenergy": 0.0268,
+      "Hydro": 0.6087,
       "Solar": 0.0529,
       "Wind": 0.3116
     },
     "2022": {
-      "Bioenergy": 0.0231,
-      "Hydro": 0.6413,
-      "Solar": 0.0601,
-      "Wind": 0.2754
+      "Bioenergy": 0.0269,
+      "Hydro": 0.6386,
+      "Solar": 0.0599,
+      "Wind": 0.2746
     },
     "2023": {
-      "Bioenergy": 0.0191,
-      "Hydro": 0.6869,
-      "Solar": 0.0566,
-      "Wind": 0.2375
+      "Bioenergy": 0.0218,
+      "Hydro": 0.6848,
+      "Solar": 0.0564,
+      "Wind": 0.237
     },
     "2024": {
-      "Bioenergy": 0.0219,
-      "Hydro": 0.6236,
-      "Solar": 0.0717,
-      "Wind": 0.2828
+      "Bioenergy": 0.024,
+      "Hydro": 0.6221,
+      "Solar": 0.0715,
+      "Wind": 0.2823
     },
     "2025": {
-      "Bioenergy": 0.027,
-      "Hydro": 0.5638,
-      "Solar": 0.0902,
-      "Wind": 0.319
+      "Bioenergy": 0.029,
+      "Hydro": 0.5585,
+      "Solar": 0.0911,
+      "Wind": 0.3214
     },
     "2026": {
-      "Bioenergy": 0.0252,
-      "Hydro": 0.57,
-      "Solar": 0.1066,
-      "Wind": 0.2983
+      "Bioenergy": 0.0255,
+      "Hydro": 0.5235,
+      "Solar": 0.1196,
+      "Wind": 0.3314
     }
   },
   "AS": {
@@ -416,7 +416,7 @@
       "Bioenergy": 0.0331,
       "Hydro": 0.765,
       "Solar": 0.0507,
-      "Wind": 0.1513
+      "Wind": 0.1512
     },
     "2022": {
       "Bioenergy": 0.0538,
@@ -444,9 +444,9 @@
     },
     "2026": {
       "Bioenergy": 0.0288,
-      "Hydro": 0.6724,
-      "Solar": 0.1806,
-      "Wind": 0.1182
+      "Hydro": 0.6723,
+      "Solar": 0.1805,
+      "Wind": 0.1183
     }
   },
   "AU": {
@@ -493,10 +493,10 @@
       "Wind": 0.3676
     },
     "2026": {
-      "Bioenergy": 0.0047,
-      "Hydro": 0.0916,
-      "Solar": 0.5997,
-      "Wind": 0.304
+      "Bioenergy": 0.0064,
+      "Hydro": 0.0919,
+      "Solar": 0.5818,
+      "Wind": 0.3198
     }
   },
   "AW": {
@@ -576,8 +576,8 @@
     },
     "2023": {
       "Bioenergy": 0.0011,
-      "Hydro": 0.9576,
-      "Solar": 0.038,
+      "Hydro": 0.9575,
+      "Solar": 0.0381,
       "Wind": 0.0033
     },
     "2024": {
@@ -638,15 +638,15 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.848,
-      "Solar": 0.1151,
-      "Wind": 0.0369
+      "Hydro": 0.8518,
+      "Solar": 0.1111,
+      "Wind": 0.0371
     },
     "2026": {
       "Bioenergy": 0,
-      "Hydro": 0.9091,
-      "Solar": 0.0727,
-      "Wind": 0.0182
+      "Hydro": 0.9243,
+      "Solar": 0.0455,
+      "Wind": 0.0303
     }
   },
   "BB": {
@@ -702,51 +702,51 @@
   "BD": {
     "2019": {
       "Bioenergy": 0.0437,
-      "Hydro": 0.7392,
-      "Solar": 0.0996,
+      "Hydro": 0.739,
+      "Solar": 0.0999,
       "Wind": 0.1175
     },
     "2020": {
-      "Bioenergy": 0.0466,
-      "Hydro": 0.7043,
-      "Solar": 0.1262,
-      "Wind": 0.1229
+      "Bioenergy": 0.0465,
+      "Hydro": 0.7037,
+      "Solar": 0.1271,
+      "Wind": 0.1228
     },
     "2021": {
-      "Bioenergy": 0.0504,
-      "Hydro": 0.6002,
-      "Solar": 0.2001,
-      "Wind": 0.1493
+      "Bioenergy": 0.0503,
+      "Hydro": 0.5993,
+      "Solar": 0.2014,
+      "Wind": 0.1491
     },
     "2022": {
-      "Bioenergy": 0.0504,
-      "Hydro": 0.5478,
-      "Solar": 0.2484,
-      "Wind": 0.1534
+      "Bioenergy": 0.0503,
+      "Hydro": 0.5467,
+      "Solar": 0.2499,
+      "Wind": 0.1531
     },
     "2023": {
-      "Bioenergy": 0.0485,
-      "Hydro": 0.4579,
-      "Solar": 0.3359,
-      "Wind": 0.1577
+      "Bioenergy": 0.0484,
+      "Hydro": 0.4571,
+      "Solar": 0.3372,
+      "Wind": 0.1573
     },
     "2024": {
-      "Bioenergy": 0.0436,
-      "Hydro": 0.4342,
-      "Solar": 0.3521,
-      "Wind": 0.1701
+      "Bioenergy": 0.0434,
+      "Hydro": 0.4331,
+      "Solar": 0.3538,
+      "Wind": 0.1696
     },
     "2025": {
-      "Bioenergy": 0.0436,
-      "Hydro": 0.3815,
-      "Solar": 0.3974,
-      "Wind": 0.1774
+      "Bioenergy": 0.044,
+      "Hydro": 0.3768,
+      "Solar": 0.4008,
+      "Wind": 0.1783
     },
     "2026": {
-      "Bioenergy": 0.0461,
-      "Hydro": 0.3495,
-      "Solar": 0.3942,
-      "Wind": 0.2102
+      "Bioenergy": 0.0581,
+      "Hydro": 0.2963,
+      "Solar": 0.4103,
+      "Wind": 0.2352
     }
   },
   "BE": {
@@ -784,19 +784,19 @@
       "Bioenergy": 0.0374,
       "Hydro": 0.0803,
       "Solar": 0.3399,
-      "Wind": 0.5425
+      "Wind": 0.5424
     },
     "2025": {
-      "Bioenergy": 0.0419,
+      "Bioenergy": 0.042,
       "Hydro": 0.081,
-      "Solar": 0.3875,
+      "Solar": 0.3874,
       "Wind": 0.4896
     },
     "2026": {
-      "Bioenergy": 0.0385,
-      "Hydro": 0.0885,
-      "Solar": 0.1074,
-      "Wind": 0.7656
+      "Bioenergy": 0.0457,
+      "Hydro": 0.0923,
+      "Solar": 0.1219,
+      "Wind": 0.74
     }
   },
   "BF": {
@@ -876,7 +876,7 @@
     },
     "2023": {
       "Bioenergy": 0.0234,
-      "Hydro": 0.3931,
+      "Hydro": 0.3932,
       "Solar": 0.3897,
       "Wind": 0.1937
     },
@@ -889,14 +889,14 @@
     "2025": {
       "Bioenergy": 0.0136,
       "Hydro": 0.2625,
-      "Solar": 0.5941,
+      "Solar": 0.594,
       "Wind": 0.1298
     },
     "2026": {
-      "Bioenergy": 0.0191,
-      "Hydro": 0.4229,
-      "Solar": 0.3561,
-      "Wind": 0.202
+      "Bioenergy": 0.018,
+      "Hydro": 0.4611,
+      "Solar": 0.3044,
+      "Wind": 0.2165
     }
   },
   "BH": {
@@ -1201,52 +1201,52 @@
   },
   "BR": {
     "2019": {
-      "Bioenergy": 0.0196,
-      "Hydro": 0.855,
-      "Solar": 0.0139,
-      "Wind": 0.1115
+      "Bioenergy": 0.1047,
+      "Hydro": 0.7809,
+      "Solar": 0.0127,
+      "Wind": 0.1018
     },
     "2020": {
-      "Bioenergy": 0.0209,
-      "Hydro": 0.8441,
-      "Solar": 0.0224,
-      "Wind": 0.1125
+      "Bioenergy": 0.1112,
+      "Hydro": 0.7663,
+      "Solar": 0.0204,
+      "Wind": 0.1021
     },
     "2021": {
-      "Bioenergy": 0.0174,
-      "Hydro": 0.7952,
-      "Solar": 0.0358,
-      "Wind": 0.1516
+      "Bioenergy": 0.1108,
+      "Hydro": 0.7196,
+      "Solar": 0.0324,
+      "Wind": 0.1372
     },
     "2022": {
-      "Bioenergy": 0.0143,
-      "Hydro": 0.7882,
-      "Solar": 0.0542,
-      "Wind": 0.1432
+      "Bioenergy": 0.0913,
+      "Hydro": 0.7267,
+      "Solar": 0.05,
+      "Wind": 0.132
     },
     "2023": {
-      "Bioenergy": 0.0149,
-      "Hydro": 0.7412,
-      "Solar": 0.0867,
-      "Wind": 0.1571
+      "Bioenergy": 0.0895,
+      "Hydro": 0.6852,
+      "Solar": 0.0802,
+      "Wind": 0.1452
     },
     "2024": {
-      "Bioenergy": 0.0151,
-      "Hydro": 0.6924,
-      "Solar": 0.12,
-      "Wind": 0.1724
+      "Bioenergy": 0.0873,
+      "Hydro": 0.6417,
+      "Solar": 0.1123,
+      "Wind": 0.1588
     },
     "2025": {
-      "Bioenergy": 0.0103,
-      "Hydro": 0.6508,
-      "Solar": 0.1495,
-      "Wind": 0.1894
+      "Bioenergy": 0.0828,
+      "Hydro": 0.606,
+      "Solar": 0.1385,
+      "Wind": 0.1727
     },
     "2026": {
-      "Bioenergy": 0.0046,
-      "Hydro": 0.62,
-      "Solar": 0.1863,
-      "Wind": 0.1892
+      "Bioenergy": 0.0635,
+      "Hydro": 0.633,
+      "Solar": 0.1564,
+      "Wind": 0.147
     }
   },
   "BS": {
@@ -1402,7 +1402,7 @@
   "BY": {
     "2019": {
       "Bioenergy": 0.1403,
-      "Hydro": 0.4246,
+      "Hydro": 0.4247,
       "Solar": 0.2242,
       "Wind": 0.2108
     },
@@ -1451,52 +1451,52 @@
   },
   "BZ": {
     "2019": {
-      "Bioenergy": 0.2316,
-      "Hydro": 0.7094,
-      "Solar": 0.0249,
-      "Wind": 0.034
+      "Bioenergy": 0.2479,
+      "Hydro": 0.6952,
+      "Solar": 0.0244,
+      "Wind": 0.0324
     },
     "2020": {
-      "Bioenergy": 0.2288,
-      "Hydro": 0.7043,
-      "Solar": 0.0292,
-      "Wind": 0.0377
+      "Bioenergy": 0.2468,
+      "Hydro": 0.6892,
+      "Solar": 0.0284,
+      "Wind": 0.0357
     },
     "2021": {
-      "Bioenergy": 0.23,
-      "Hydro": 0.6913,
-      "Solar": 0.0339,
-      "Wind": 0.0447
+      "Bioenergy": 0.2471,
+      "Hydro": 0.6773,
+      "Solar": 0.033,
+      "Wind": 0.0427
     },
     "2022": {
-      "Bioenergy": 0.2233,
-      "Hydro": 0.6922,
-      "Solar": 0.0386,
-      "Wind": 0.0459
+      "Bioenergy": 0.2385,
+      "Hydro": 0.6797,
+      "Solar": 0.0376,
+      "Wind": 0.0442
     },
     "2023": {
-      "Bioenergy": 0.2236,
-      "Hydro": 0.6801,
-      "Solar": 0.0466,
-      "Wind": 0.0498
+      "Bioenergy": 0.2386,
+      "Hydro": 0.668,
+      "Solar": 0.0453,
+      "Wind": 0.048
     },
     "2024": {
-      "Bioenergy": 0.2235,
-      "Hydro": 0.6679,
-      "Solar": 0.0548,
-      "Wind": 0.0539
+      "Bioenergy": 0.2382,
+      "Hydro": 0.6565,
+      "Solar": 0.0535,
+      "Wind": 0.0517
     },
     "2025": {
-      "Bioenergy": 0.2216,
-      "Hydro": 0.6587,
-      "Solar": 0.0619,
-      "Wind": 0.0579
+      "Bioenergy": 0.2362,
+      "Hydro": 0.6481,
+      "Solar": 0.0603,
+      "Wind": 0.0554
     },
     "2026": {
-      "Bioenergy": 0.2211,
-      "Hydro": 0.6491,
-      "Solar": 0.071,
-      "Wind": 0.0589
+      "Bioenergy": 0.2347,
+      "Hydro": 0.6444,
+      "Solar": 0.0681,
+      "Wind": 0.0529
     }
   },
   "CA": {
@@ -1537,16 +1537,16 @@
       "Wind": 0.1145
     },
     "2025": {
-      "Bioenergy": 0.0276,
-      "Hydro": 0.8314,
-      "Solar": 0.0169,
-      "Wind": 0.1241
+      "Bioenergy": 0.0272,
+      "Hydro": 0.8327,
+      "Solar": 0.0155,
+      "Wind": 0.1246
     },
     "2026": {
-      "Bioenergy": 0.0321,
-      "Hydro": 0.7972,
-      "Solar": 0.0168,
-      "Wind": 0.1539
+      "Bioenergy": 0.0289,
+      "Hydro": 0.8101,
+      "Solar": 0.0086,
+      "Wind": 0.1524
     }
   },
   "CD": {
@@ -1732,21 +1732,21 @@
     },
     "2024": {
       "Bioenergy": 0.0006,
-      "Hydro": 0.8881,
+      "Hydro": 0.8882,
       "Solar": 0.1044,
       "Wind": 0.0069
     },
     "2025": {
       "Bioenergy": 0.0039,
-      "Hydro": 0.7987,
-      "Solar": 0.1748,
-      "Wind": 0.0226
+      "Hydro": 0.7995,
+      "Solar": 0.174,
+      "Wind": 0.0225
     },
     "2026": {
-      "Bioenergy": 0.016,
-      "Hydro": 0.8026,
-      "Solar": 0.0936,
-      "Wind": 0.0878
+      "Bioenergy": 0.0147,
+      "Hydro": 0.803,
+      "Solar": 0.0967,
+      "Wind": 0.0856
     }
   },
   "CI": {
@@ -1864,39 +1864,39 @@
     },
     "2021": {
       "Bioenergy": 0.0553,
-      "Hydro": 0.4513,
-      "Solar": 0.2951,
+      "Hydro": 0.4512,
+      "Solar": 0.2952,
       "Wind": 0.1983
     },
     "2022": {
       "Bioenergy": 0.0421,
-      "Hydro": 0.445,
-      "Solar": 0.3185,
-      "Wind": 0.1944
+      "Hydro": 0.4453,
+      "Solar": 0.3186,
+      "Wind": 0.194
     },
     "2023": {
-      "Bioenergy": 0.0374,
-      "Hydro": 0.456,
-      "Solar": 0.3175,
-      "Wind": 0.1891
+      "Bioenergy": 0.0373,
+      "Hydro": 0.4559,
+      "Solar": 0.3185,
+      "Wind": 0.1882
     },
     "2024": {
-      "Bioenergy": 0.033,
-      "Hydro": 0.462,
-      "Solar": 0.3163,
-      "Wind": 0.1887
+      "Bioenergy": 0.0329,
+      "Hydro": 0.4597,
+      "Solar": 0.3199,
+      "Wind": 0.1874
     },
     "2025": {
-      "Bioenergy": 0.0357,
-      "Hydro": 0.375,
-      "Solar": 0.3694,
-      "Wind": 0.22
+      "Bioenergy": 0.0353,
+      "Hydro": 0.3724,
+      "Solar": 0.3737,
+      "Wind": 0.2186
     },
     "2026": {
-      "Bioenergy": 0.0244,
-      "Hydro": 0.3233,
-      "Solar": 0.4399,
-      "Wind": 0.2125
+      "Bioenergy": 0.0286,
+      "Hydro": 0.3333,
+      "Solar": 0.4494,
+      "Wind": 0.1886
     }
   },
   "CM": {
@@ -1982,83 +1982,83 @@
     },
     "2024": {
       "Bioenergy": 0.06,
-      "Hydro": 0.3873,
+      "Hydro": 0.3874,
       "Solar": 0.2525,
       "Wind": 0.3002
     },
     "2025": {
-      "Bioenergy": 0.0528,
-      "Hydro": 0.3447,
-      "Solar": 0.3095,
-      "Wind": 0.293
+      "Bioenergy": 0.053,
+      "Hydro": 0.346,
+      "Solar": 0.3057,
+      "Wind": 0.2952
     },
     "2026": {
-      "Bioenergy": 0.0604,
-      "Hydro": 0.2796,
-      "Solar": 0.2926,
-      "Wind": 0.3675
+      "Bioenergy": 0.061,
+      "Hydro": 0.2821,
+      "Solar": 0.2767,
+      "Wind": 0.3802
     }
   },
   "CO": {
     "2019": {
-      "Bioenergy": 0.0021,
-      "Hydro": 0.991,
-      "Solar": 0.0028,
-      "Wind": 0.0042
+      "Bioenergy": 0.0035,
+      "Hydro": 0.9897,
+      "Solar": 0.0027,
+      "Wind": 0.004
     },
     "2020": {
-      "Bioenergy": 0.0036,
-      "Hydro": 0.9849,
-      "Solar": 0.006,
-      "Wind": 0.0055
+      "Bioenergy": 0.0065,
+      "Hydro": 0.9824,
+      "Solar": 0.0059,
+      "Wind": 0.0052
     },
     "2021": {
-      "Bioenergy": 0.0003,
-      "Hydro": 0.9894,
-      "Solar": 0.0066,
-      "Wind": 0.0038
+      "Bioenergy": 0.0015,
+      "Hydro": 0.9883,
+      "Solar": 0.0065,
+      "Wind": 0.0037
     },
     "2022": {
-      "Bioenergy": 0.0002,
-      "Hydro": 0.9888,
+      "Bioenergy": 0.0007,
+      "Hydro": 0.9883,
       "Solar": 0.0084,
       "Wind": 0.0026
     },
     "2023": {
-      "Bioenergy": 0.0007,
-      "Hydro": 0.967,
-      "Solar": 0.0229,
-      "Wind": 0.0094
+      "Bioenergy": 0.0027,
+      "Hydro": 0.9653,
+      "Solar": 0.0228,
+      "Wind": 0.0092
     },
     "2024": {
-      "Bioenergy": 0.0014,
-      "Hydro": 0.9198,
-      "Solar": 0.0625,
-      "Wind": 0.0162
+      "Bioenergy": 0.0056,
+      "Hydro": 0.9165,
+      "Solar": 0.0622,
+      "Wind": 0.0157
     },
     "2025": {
-      "Bioenergy": 0.0001,
-      "Hydro": 0.9383,
+      "Bioenergy": 0.0003,
+      "Hydro": 0.9381,
       "Solar": 0.0583,
       "Wind": 0.0033
     },
     "2026": {
-      "Bioenergy": 0,
-      "Hydro": 0.939,
-      "Solar": 0.0576,
+      "Bioenergy": 0.0001,
+      "Hydro": 0.9389,
+      "Solar": 0.0575,
       "Wind": 0.0034
     }
   },
   "CR": {
     "2019": {
-      "Bioenergy": 0.0074,
-      "Hydro": 0.8095,
-      "Solar": 0.0005,
-      "Wind": 0.1827
+      "Bioenergy": 0.0082,
+      "Hydro": 0.8087,
+      "Solar": 0.0004,
+      "Wind": 0.1826
     },
     "2020": {
-      "Bioenergy": 0.0063,
-      "Hydro": 0.8428,
+      "Bioenergy": 0.0067,
+      "Hydro": 0.8425,
       "Solar": 0.0003,
       "Wind": 0.1505
     },
@@ -2075,28 +2075,28 @@
       "Wind": 0.1308
     },
     "2023": {
-      "Bioenergy": 0.0053,
-      "Hydro": 0.8432,
+      "Bioenergy": 0.0065,
+      "Hydro": 0.8424,
       "Solar": 0.0021,
-      "Wind": 0.1493
+      "Wind": 0.1491
     },
     "2024": {
-      "Bioenergy": 0.0054,
-      "Hydro": 0.8647,
+      "Bioenergy": 0.0063,
+      "Hydro": 0.8639,
       "Solar": 0.0024,
-      "Wind": 0.1275
+      "Wind": 0.1274
     },
     "2025": {
-      "Bioenergy": 0.0044,
-      "Hydro": 0.8612,
+      "Bioenergy": 0.0048,
+      "Hydro": 0.861,
       "Solar": 0.0012,
-      "Wind": 0.1332
+      "Wind": 0.1331
     },
     "2026": {
-      "Bioenergy": 0.0111,
-      "Hydro": 0.808,
-      "Solar": 0.0033,
-      "Wind": 0.1776
+      "Bioenergy": 0.0116,
+      "Hydro": 0.7675,
+      "Solar": 0.0021,
+      "Wind": 0.2188
     }
   },
   "CU": {
@@ -2239,14 +2239,14 @@
     "2025": {
       "Bioenergy": 0,
       "Hydro": 0,
-      "Solar": 0.8729,
-      "Wind": 0.1271
+      "Solar": 0.873,
+      "Wind": 0.127
     },
     "2026": {
       "Bioenergy": 0,
       "Hydro": 0,
-      "Solar": 0.857,
-      "Wind": 0.143
+      "Solar": 0.8571,
+      "Wind": 0.1429
     }
   },
   "CZ": {
@@ -2293,10 +2293,10 @@
       "Wind": 0.0648
     },
     "2026": {
-      "Bioenergy": 0.4702,
-      "Hydro": 0.2357,
-      "Solar": 0.1563,
-      "Wind": 0.1377
+      "Bioenergy": 0.4716,
+      "Hydro": 0.1886,
+      "Solar": 0.208,
+      "Wind": 0.1318
     }
   },
   "DE": {
@@ -2343,10 +2343,10 @@
       "Wind": 0.4668
     },
     "2026": {
-      "Bioenergy": 0.1653,
-      "Hydro": 0.0575,
-      "Solar": 0.0824,
-      "Wind": 0.6948
+      "Bioenergy": 0.1592,
+      "Hydro": 0.0443,
+      "Solar": 0.083,
+      "Wind": 0.7135
     }
   },
   "DJ": {
@@ -2437,16 +2437,16 @@
       "Wind": 0.7017
     },
     "2025": {
-      "Bioenergy": 0.1259,
-      "Hydro": 0.0407,
-      "Solar": 0.1675,
+      "Bioenergy": 0.126,
+      "Hydro": 0.0408,
+      "Solar": 0.1674,
       "Wind": 0.6659
     },
     "2026": {
-      "Bioenergy": 0.1551,
-      "Hydro": 0.0263,
-      "Solar": 0.0232,
-      "Wind": 0.7953
+      "Bioenergy": 0.1642,
+      "Hydro": 0.0138,
+      "Solar": 0.0182,
+      "Wind": 0.8038
     }
   },
   "DM": {
@@ -2537,16 +2537,16 @@
       "Wind": 0.2476
     },
     "2025": {
-      "Bioenergy": 0.0394,
-      "Hydro": 0.2979,
-      "Solar": 0.4478,
-      "Wind": 0.215
+      "Bioenergy": 0.0413,
+      "Hydro": 0.3051,
+      "Solar": 0.4252,
+      "Wind": 0.2283
     },
     "2026": {
-      "Bioenergy": 0.0249,
-      "Hydro": 0.2751,
-      "Solar": 0.5751,
-      "Wind": 0.1249
+      "Bioenergy": 0.0528,
+      "Hydro": 0.2894,
+      "Solar": 0.4472,
+      "Wind": 0.2106
     }
   },
   "DZ": {
@@ -2607,54 +2607,54 @@
       "Wind": 0.0036
     },
     "2020": {
-      "Bioenergy": 0.0185,
-      "Hydro": 0.9769,
+      "Bioenergy": 0.0189,
+      "Hydro": 0.9766,
       "Solar": 0.0003,
       "Wind": 0.0043
     },
     "2021": {
-      "Bioenergy": 0.0154,
-      "Hydro": 0.9806,
+      "Bioenergy": 0.0159,
+      "Hydro": 0.9802,
       "Solar": 0.0005,
       "Wind": 0.0035
     },
     "2022": {
-      "Bioenergy": 0.0151,
-      "Hydro": 0.98,
+      "Bioenergy": 0.0157,
+      "Hydro": 0.9795,
       "Solar": 0.0009,
-      "Wind": 0.004
+      "Wind": 0.0039
     },
     "2023": {
-      "Bioenergy": 0.0135,
-      "Hydro": 0.9717,
-      "Solar": 0.0029,
-      "Wind": 0.0119
+      "Bioenergy": 0.0149,
+      "Hydro": 0.9705,
+      "Solar": 0.0028,
+      "Wind": 0.0118
     },
     "2024": {
-      "Bioenergy": 0.0204,
-      "Hydro": 0.9607,
-      "Solar": 0.0041,
-      "Wind": 0.0148
+      "Bioenergy": 0.022,
+      "Hydro": 0.9594,
+      "Solar": 0.004,
+      "Wind": 0.0146
     },
     "2025": {
-      "Bioenergy": 0.0147,
-      "Hydro": 0.976,
-      "Solar": 0.0016,
-      "Wind": 0.0078
+      "Bioenergy": 0.0148,
+      "Hydro": 0.9751,
+      "Solar": 0.0019,
+      "Wind": 0.0082
     },
     "2026": {
-      "Bioenergy": 0.0272,
-      "Hydro": 0.9649,
-      "Solar": 0.002,
-      "Wind": 0.0059
+      "Bioenergy": 0.0264,
+      "Hydro": 0.9516,
+      "Solar": 0.0087,
+      "Wind": 0.0133
     }
   },
   "EE": {
     "2019": {
       "Bioenergy": 0.3151,
       "Hydro": 0.1966,
-      "Solar": 0.0374,
-      "Wind": 0.4509
+      "Solar": 0.0375,
+      "Wind": 0.4508
     },
     "2020": {
       "Bioenergy": 0.2352,
@@ -2675,7 +2675,7 @@
       "Wind": 0.35
     },
     "2023": {
-      "Bioenergy": 0.1795,
+      "Bioenergy": 0.1794,
       "Hydro": 0.1691,
       "Solar": 0.2792,
       "Wind": 0.3723
@@ -2687,16 +2687,16 @@
       "Wind": 0.4174
     },
     "2025": {
-      "Bioenergy": 0.1296,
-      "Hydro": 0.1277,
-      "Solar": 0.321,
-      "Wind": 0.4217
+      "Bioenergy": 0.1297,
+      "Hydro": 0.1279,
+      "Solar": 0.3208,
+      "Wind": 0.4216
     },
     "2026": {
-      "Bioenergy": 0.1385,
-      "Hydro": 0.1952,
-      "Solar": 0.0394,
-      "Wind": 0.6269
+      "Bioenergy": 0.2151,
+      "Hydro": 0.2081,
+      "Solar": 0.0695,
+      "Wind": 0.5073
     }
   },
   "EG": {
@@ -2725,10 +2725,10 @@
       "Wind": 0.233
     },
     "2023": {
-      "Bioenergy": 0.0011,
-      "Hydro": 0.5802,
-      "Solar": 0.2012,
-      "Wind": 0.2174
+      "Bioenergy": 0.0023,
+      "Hydro": 0.5795,
+      "Solar": 0.201,
+      "Wind": 0.2172
     },
     "2024": {
       "Bioenergy": 0.0043,
@@ -2737,16 +2737,16 @@
       "Wind": 0.2352
     },
     "2025": {
-      "Bioenergy": 0.0035,
-      "Hydro": 0.5049,
-      "Solar": 0.2482,
-      "Wind": 0.2434
+      "Bioenergy": 0.0034,
+      "Hydro": 0.4733,
+      "Solar": 0.2122,
+      "Wind": 0.3111
     },
     "2026": {
-      "Bioenergy": 0.0034,
-      "Hydro": 0.5091,
-      "Solar": 0.2512,
-      "Wind": 0.2363
+      "Bioenergy": 0.0032,
+      "Hydro": 0.4748,
+      "Solar": 0.1665,
+      "Wind": 0.3555
     }
   },
   "ER": {
@@ -2843,10 +2843,10 @@
       "Wind": 0.375
     },
     "2026": {
-      "Bioenergy": 0.0308,
-      "Hydro": 0.2663,
-      "Solar": 0.2154,
-      "Wind": 0.4874
+      "Bioenergy": 0.0235,
+      "Hydro": 0.2153,
+      "Solar": 0.1683,
+      "Wind": 0.593
     }
   },
   "ET": {
@@ -2933,20 +2933,20 @@
     "2024": {
       "Bioenergy": 0.209,
       "Hydro": 0.3273,
-      "Solar": 0.0314,
+      "Solar": 0.0315,
       "Wind": 0.4323
     },
     "2025": {
-      "Bioenergy": 0.1999,
-      "Hydro": 0.2837,
-      "Solar": 0.0388,
-      "Wind": 0.4776
+      "Bioenergy": 0.2089,
+      "Hydro": 0.2828,
+      "Solar": 0.0337,
+      "Wind": 0.4747
     },
     "2026": {
-      "Bioenergy": 0.223,
-      "Hydro": 0.2316,
-      "Solar": 0.0021,
-      "Wind": 0.5432
+      "Bioenergy": 0.2555,
+      "Hydro": 0.3041,
+      "Solar": 0.0105,
+      "Wind": 0.4299
     }
   },
   "FJ": {
@@ -3143,10 +3143,10 @@
       "Wind": 0.3653
     },
     "2026": {
-      "Bioenergy": 0.0193,
-      "Hydro": 0.4317,
-      "Solar": 0.0883,
-      "Wind": 0.4607
+      "Bioenergy": 0.0196,
+      "Hydro": 0.4222,
+      "Solar": 0.0891,
+      "Wind": 0.4691
     }
   },
   "GA": {
@@ -3237,16 +3237,16 @@
       "Wind": 0.6476
     },
     "2025": {
-      "Bioenergy": 0.1509,
+      "Bioenergy": 0.151,
       "Hydro": 0.0594,
       "Solar": 0.1549,
-      "Wind": 0.6348
+      "Wind": 0.6347
     },
     "2026": {
-      "Bioenergy": 0.1391,
-      "Hydro": 0.0663,
-      "Solar": 0.0351,
-      "Wind": 0.7595
+      "Bioenergy": 0.1439,
+      "Hydro": 0.046,
+      "Solar": 0.0378,
+      "Wind": 0.7723
     }
   },
   "GD": {
@@ -3308,45 +3308,45 @@
     },
     "2020": {
       "Bioenergy": 0.003,
-      "Hydro": 0.9702,
+      "Hydro": 0.9701,
       "Solar": 0.0054,
       "Wind": 0.0214
     },
     "2021": {
       "Bioenergy": 0.0039,
-      "Hydro": 0.9658,
-      "Solar": 0.0075,
+      "Hydro": 0.9656,
+      "Solar": 0.0076,
       "Wind": 0.0229
     },
     "2022": {
       "Bioenergy": 0.0033,
-      "Hydro": 0.9696,
-      "Solar": 0.0066,
+      "Hydro": 0.9695,
+      "Solar": 0.0068,
       "Wind": 0.0204
     },
     "2023": {
       "Bioenergy": 0.0019,
       "Hydro": 0.9763,
-      "Solar": 0.0044,
+      "Solar": 0.0045,
       "Wind": 0.0174
     },
     "2024": {
       "Bioenergy": 0.0021,
       "Hydro": 0.9729,
-      "Solar": 0.0068,
-      "Wind": 0.0182
+      "Solar": 0.0069,
+      "Wind": 0.0181
     },
     "2025": {
-      "Bioenergy": 0.0026,
-      "Hydro": 0.9679,
-      "Solar": 0.0106,
-      "Wind": 0.0189
+      "Bioenergy": 0.003,
+      "Hydro": 0.9631,
+      "Solar": 0.0123,
+      "Wind": 0.0216
     },
     "2026": {
-      "Bioenergy": 0.0029,
-      "Hydro": 0.9708,
-      "Solar": 0.0131,
-      "Wind": 0.0132
+      "Bioenergy": 0.0186,
+      "Hydro": 0.8203,
+      "Solar": 0.0717,
+      "Wind": 0.0894
     }
   },
   "GF": {
@@ -3754,7 +3754,7 @@
       "Bioenergy": 0.0179,
       "Hydro": 0.2968,
       "Solar": 0.253,
-      "Wind": 0.4324
+      "Wind": 0.4323
     },
     "2020": {
       "Bioenergy": 0.0152,
@@ -3784,7 +3784,7 @@
       "Bioenergy": 0.0014,
       "Hydro": 0.1143,
       "Solar": 0.4489,
-      "Wind": 0.4355
+      "Wind": 0.4354
     },
     "2025": {
       "Bioenergy": 0.0007,
@@ -3794,9 +3794,9 @@
     },
     "2026": {
       "Bioenergy": 0,
-      "Hydro": 0.1667,
-      "Solar": 0.3564,
-      "Wind": 0.4769
+      "Hydro": 0.2303,
+      "Solar": 0.2087,
+      "Wind": 0.561
     }
   },
   "GT": {
@@ -4002,127 +4002,127 @@
   "HK": {
     "2019": {
       "Bioenergy": 0.1123,
-      "Hydro": 0.5803,
-      "Solar": 0.135,
+      "Hydro": 0.5801,
+      "Solar": 0.1354,
       "Wind": 0.1723
     },
     "2020": {
-      "Bioenergy": 0.1129,
-      "Hydro": 0.5585,
-      "Solar": 0.1492,
-      "Wind": 0.1794
+      "Bioenergy": 0.1126,
+      "Hydro": 0.5577,
+      "Solar": 0.1505,
+      "Wind": 0.1792
     },
     "2021": {
-      "Bioenergy": 0.117,
-      "Hydro": 0.4998,
-      "Solar": 0.1659,
-      "Wind": 0.2174
+      "Bioenergy": 0.1167,
+      "Hydro": 0.4986,
+      "Solar": 0.1678,
+      "Wind": 0.2169
     },
     "2022": {
-      "Bioenergy": 0.1159,
-      "Hydro": 0.4682,
-      "Solar": 0.1889,
-      "Wind": 0.2271
+      "Bioenergy": 0.1156,
+      "Hydro": 0.4668,
+      "Solar": 0.1911,
+      "Wind": 0.2264
     },
     "2023": {
-      "Bioenergy": 0.1171,
-      "Hydro": 0.4119,
-      "Solar": 0.2231,
-      "Wind": 0.2479
+      "Bioenergy": 0.1168,
+      "Hydro": 0.4107,
+      "Solar": 0.2254,
+      "Wind": 0.2471
     },
     "2024": {
-      "Bioenergy": 0.1056,
-      "Hydro": 0.3951,
-      "Solar": 0.2579,
-      "Wind": 0.2414
+      "Bioenergy": 0.1052,
+      "Hydro": 0.3935,
+      "Solar": 0.2609,
+      "Wind": 0.2403
     },
     "2025": {
-      "Bioenergy": 0.0945,
-      "Hydro": 0.3616,
-      "Solar": 0.3026,
-      "Wind": 0.2413
+      "Bioenergy": 0.0949,
+      "Hydro": 0.3581,
+      "Solar": 0.3061,
+      "Wind": 0.2409
     },
     "2026": {
-      "Bioenergy": 0.0957,
-      "Hydro": 0.3289,
-      "Solar": 0.2884,
-      "Wind": 0.287
+      "Bioenergy": 0.11,
+      "Hydro": 0.3045,
+      "Solar": 0.2878,
+      "Wind": 0.2978
     }
   },
   "HN": {
     "2019": {
-      "Bioenergy": 0.2449,
-      "Hydro": 0.427,
-      "Solar": 0.1883,
-      "Wind": 0.1398
+      "Bioenergy": 0.2461,
+      "Hydro": 0.426,
+      "Solar": 0.1882,
+      "Wind": 0.1396
     },
     "2020": {
-      "Bioenergy": 0.2447,
-      "Hydro": 0.4269,
-      "Solar": 0.1884,
-      "Wind": 0.1399
+      "Bioenergy": 0.246,
+      "Hydro": 0.4258,
+      "Solar": 0.1883,
+      "Wind": 0.1398
     },
     "2021": {
-      "Bioenergy": 0.2448,
-      "Hydro": 0.4258,
-      "Solar": 0.1889,
-      "Wind": 0.1405
+      "Bioenergy": 0.2461,
+      "Hydro": 0.4249,
+      "Solar": 0.1887,
+      "Wind": 0.1403
     },
     "2022": {
-      "Bioenergy": 0.2443,
-      "Hydro": 0.4264,
-      "Solar": 0.1889,
-      "Wind": 0.1404
+      "Bioenergy": 0.2454,
+      "Hydro": 0.4256,
+      "Solar": 0.1887,
+      "Wind": 0.1402
     },
     "2023": {
-      "Bioenergy": 0.2443,
-      "Hydro": 0.4255,
-      "Solar": 0.1895,
-      "Wind": 0.1407
+      "Bioenergy": 0.2454,
+      "Hydro": 0.4247,
+      "Solar": 0.1893,
+      "Wind": 0.1405
     },
     "2024": {
-      "Bioenergy": 0.2443,
-      "Hydro": 0.4246,
-      "Solar": 0.1901,
-      "Wind": 0.141
+      "Bioenergy": 0.2454,
+      "Hydro": 0.4239,
+      "Solar": 0.1899,
+      "Wind": 0.1408
     },
     "2025": {
-      "Bioenergy": 0.2441,
-      "Hydro": 0.424,
-      "Solar": 0.1906,
-      "Wind": 0.1413
+      "Bioenergy": 0.2452,
+      "Hydro": 0.4233,
+      "Solar": 0.1904,
+      "Wind": 0.1411
     },
     "2026": {
-      "Bioenergy": 0.2441,
-      "Hydro": 0.4232,
-      "Solar": 0.1913,
-      "Wind": 0.1414
+      "Bioenergy": 0.2451,
+      "Hydro": 0.423,
+      "Solar": 0.191,
+      "Wind": 0.1409
     }
   },
   "HR": {
     "2019": {
       "Bioenergy": 0.065,
-      "Hydro": 0.685,
+      "Hydro": 0.6851,
       "Solar": 0.0331,
-      "Wind": 0.2169
+      "Wind": 0.2168
     },
     "2020": {
       "Bioenergy": 0.0708,
       "Hydro": 0.6457,
-      "Solar": 0.0339,
+      "Solar": 0.034,
       "Wind": 0.2496
     },
     "2021": {
       "Bioenergy": 0.0687,
-      "Hydro": 0.6665,
-      "Solar": 0.0297,
+      "Hydro": 0.6666,
+      "Solar": 0.0298,
       "Wind": 0.235
     },
     "2022": {
       "Bioenergy": 0.0846,
       "Hydro": 0.5614,
       "Solar": 0.0515,
-      "Wind": 0.3025
+      "Wind": 0.3024
     },
     "2023": {
       "Bioenergy": 0.0596,
@@ -4134,19 +4134,19 @@
       "Bioenergy": 0.0632,
       "Hydro": 0.5501,
       "Solar": 0.112,
-      "Wind": 0.2748
+      "Wind": 0.2747
     },
     "2025": {
-      "Bioenergy": 0.0633,
+      "Bioenergy": 0.0634,
       "Hydro": 0.459,
-      "Solar": 0.1594,
-      "Wind": 0.3183
+      "Solar": 0.1593,
+      "Wind": 0.3182
     },
     "2026": {
-      "Bioenergy": 0.0789,
-      "Hydro": 0.5385,
-      "Solar": 0.048,
-      "Wind": 0.3347
+      "Bioenergy": 0.0611,
+      "Hydro": 0.6522,
+      "Solar": 0.0243,
+      "Wind": 0.2624
     }
   },
   "HT": {
@@ -4202,20 +4202,20 @@
   "HU": {
     "2019": {
       "Bioenergy": 0.1794,
-      "Hydro": 0.3177,
-      "Solar": 0.2483,
-      "Wind": 0.2545
+      "Hydro": 0.3178,
+      "Solar": 0.2484,
+      "Wind": 0.2544
     },
     "2020": {
       "Bioenergy": 0.161,
-      "Hydro": 0.278,
+      "Hydro": 0.2781,
       "Solar": 0.3364,
-      "Wind": 0.2246
+      "Wind": 0.2245
     },
     "2021": {
       "Bioenergy": 0.1476,
       "Hydro": 0.2316,
-      "Solar": 0.4303,
+      "Solar": 0.4304,
       "Wind": 0.1905
     },
     "2022": {
@@ -4225,28 +4225,28 @@
       "Wind": 0.184
     },
     "2023": {
-      "Bioenergy": 0.0846,
+      "Bioenergy": 0.0845,
       "Hydro": 0.168,
       "Solar": 0.5817,
       "Wind": 0.1658
     },
     "2024": {
-      "Bioenergy": 0.0803,
+      "Bioenergy": 0.0804,
       "Hydro": 0.1388,
       "Solar": 0.6443,
       "Wind": 0.1365
     },
     "2025": {
-      "Bioenergy": 0.1026,
-      "Hydro": 0.0958,
-      "Solar": 0.7004,
-      "Wind": 0.1012
+      "Bioenergy": 0.1039,
+      "Hydro": 0.097,
+      "Solar": 0.6967,
+      "Wind": 0.1023
     },
     "2026": {
-      "Bioenergy": 0.1736,
-      "Hydro": 0.2185,
-      "Solar": 0.3812,
-      "Wind": 0.2266
+      "Bioenergy": 0.1496,
+      "Hydro": 0.2372,
+      "Solar": 0.3545,
+      "Wind": 0.2587
     }
   },
   "ID": {
@@ -4266,24 +4266,24 @@
       "Bioenergy": 0.3555,
       "Hydro": 0.6225,
       "Solar": 0.0055,
-      "Wind": 0.0166
+      "Wind": 0.0165
     },
     "2022": {
       "Bioenergy": 0.3552,
-      "Hydro": 0.622,
-      "Solar": 0.0059,
+      "Hydro": 0.6219,
+      "Solar": 0.006,
       "Wind": 0.0169
     },
     "2023": {
       "Bioenergy": 0.3552,
-      "Hydro": 0.6212,
+      "Hydro": 0.6211,
       "Solar": 0.0065,
       "Wind": 0.0172
     },
     "2024": {
       "Bioenergy": 0.3548,
-      "Hydro": 0.6207,
-      "Solar": 0.0072,
+      "Hydro": 0.6206,
+      "Solar": 0.0073,
       "Wind": 0.0173
     },
     "2025": {
@@ -4293,60 +4293,60 @@
       "Wind": 0.0177
     },
     "2026": {
-      "Bioenergy": 0.3541,
-      "Hydro": 0.6191,
-      "Solar": 0.0082,
-      "Wind": 0.0186
+      "Bioenergy": 0.3548,
+      "Hydro": 0.6192,
+      "Solar": 0.0077,
+      "Wind": 0.0183
     }
   },
   "IE": {
     "2019": {
-      "Bioenergy": 0.024,
-      "Hydro": 0.1224,
-      "Solar": 0.0091,
-      "Wind": 0.8445
+      "Bioenergy": 0.009,
+      "Hydro": 0.1265,
+      "Solar": 0.0097,
+      "Wind": 0.8549
     },
     "2020": {
-      "Bioenergy": 0.0186,
-      "Hydro": 0.1145,
-      "Solar": 0.0097,
-      "Wind": 0.8572
+      "Bioenergy": 0.0081,
+      "Hydro": 0.1174,
+      "Solar": 0.0102,
+      "Wind": 0.8644
     },
     "2021": {
-      "Bioenergy": 0.0187,
-      "Hydro": 0.1121,
-      "Solar": 0.0122,
-      "Wind": 0.8569
+      "Bioenergy": 0.0088,
+      "Hydro": 0.1135,
+      "Solar": 0.0127,
+      "Wind": 0.8651
     },
     "2022": {
-      "Bioenergy": 0.016,
-      "Hydro": 0.0869,
-      "Solar": 0.0115,
-      "Wind": 0.8856
+      "Bioenergy": 0.007,
+      "Hydro": 0.0874,
+      "Solar": 0.0119,
+      "Wind": 0.8938
     },
     "2023": {
-      "Bioenergy": 0.016,
-      "Hydro": 0.1116,
-      "Solar": 0.0451,
-      "Wind": 0.8273
+      "Bioenergy": 0.008,
+      "Hydro": 0.1137,
+      "Solar": 0.0448,
+      "Wind": 0.8335
     },
     "2024": {
-      "Bioenergy": 0.0179,
-      "Hydro": 0.1139,
-      "Solar": 0.0756,
-      "Wind": 0.7926
+      "Bioenergy": 0.0394,
+      "Hydro": 0.1117,
+      "Solar": 0.0748,
+      "Wind": 0.7741
     },
     "2025": {
-      "Bioenergy": 0.0193,
-      "Hydro": 0.1102,
-      "Solar": 0.1086,
-      "Wind": 0.7619
+      "Bioenergy": 0.0408,
+      "Hydro": 0.1071,
+      "Solar": 0.1072,
+      "Wind": 0.7449
     },
     "2026": {
-      "Bioenergy": 0.0186,
-      "Hydro": 0.1245,
-      "Solar": 0.0332,
-      "Wind": 0.8236
+      "Bioenergy": 0.0445,
+      "Hydro": 0.124,
+      "Solar": 0.0321,
+      "Wind": 0.7994
     }
   },
   "IL": {
@@ -4401,52 +4401,52 @@
   },
   "IN": {
     "2019": {
-      "Bioenergy": 0.0515,
-      "Hydro": 0.5658,
-      "Solar": 0.1614,
-      "Wind": 0.2213
+      "Bioenergy": 0.0513,
+      "Hydro": 0.5632,
+      "Solar": 0.1654,
+      "Wind": 0.2202
     },
     "2020": {
-      "Bioenergy": 0.0486,
-      "Hydro": 0.5505,
-      "Solar": 0.1974,
-      "Wind": 0.2035
+      "Bioenergy": 0.0478,
+      "Hydro": 0.5426,
+      "Solar": 0.209,
+      "Wind": 0.2006
     },
     "2021": {
-      "Bioenergy": 0.0491,
-      "Hydro": 0.5141,
-      "Solar": 0.2186,
-      "Wind": 0.2182
+      "Bioenergy": 0.048,
+      "Hydro": 0.5018,
+      "Solar": 0.2368,
+      "Wind": 0.2133
     },
     "2022": {
-      "Bioenergy": 0.0459,
-      "Hydro": 0.4904,
-      "Solar": 0.2669,
-      "Wind": 0.1967
+      "Bioenergy": 0.0445,
+      "Hydro": 0.476,
+      "Solar": 0.2886,
+      "Wind": 0.1909
     },
     "2023": {
-      "Bioenergy": 0.0415,
-      "Hydro": 0.4145,
-      "Solar": 0.3154,
-      "Wind": 0.2286
+      "Bioenergy": 0.0401,
+      "Hydro": 0.401,
+      "Solar": 0.3377,
+      "Wind": 0.2212
     },
     "2024": {
-      "Bioenergy": 0.0349,
-      "Hydro": 0.4056,
-      "Solar": 0.3475,
-      "Wind": 0.212
+      "Bioenergy": 0.0333,
+      "Hydro": 0.3863,
+      "Solar": 0.3785,
+      "Wind": 0.2019
     },
     "2025": {
-      "Bioenergy": 0.0297,
-      "Hydro": 0.3899,
-      "Solar": 0.3546,
-      "Wind": 0.2258
+      "Bioenergy": 0.0285,
+      "Hydro": 0.354,
+      "Solar": 0.4101,
+      "Wind": 0.2074
     },
     "2026": {
-      "Bioenergy": 0.0587,
-      "Hydro": 0.356,
-      "Solar": 0.437,
-      "Wind": 0.1484
+      "Bioenergy": 0.0661,
+      "Hydro": 0.2611,
+      "Solar": 0.535,
+      "Wind": 0.1378
     }
   },
   "IQ": {
@@ -4626,27 +4626,27 @@
     },
     "2023": {
       "Bioenergy": 0.1294,
-      "Hydro": 0.3721,
+      "Hydro": 0.3722,
       "Solar": 0.264,
       "Wind": 0.2344
     },
     "2024": {
       "Bioenergy": 0.1125,
       "Hydro": 0.4228,
-      "Solar": 0.2686,
+      "Solar": 0.2687,
       "Wind": 0.1961
     },
     "2025": {
-      "Bioenergy": 0.1058,
-      "Hydro": 0.3486,
-      "Solar": 0.3497,
-      "Wind": 0.1959
+      "Bioenergy": 0.1059,
+      "Hydro": 0.3488,
+      "Solar": 0.3496,
+      "Wind": 0.1958
     },
     "2026": {
-      "Bioenergy": 0.1999,
-      "Hydro": 0.2942,
-      "Solar": 0.2447,
-      "Wind": 0.2612
+      "Bioenergy": 0.1336,
+      "Hydro": 0.2931,
+      "Solar": 0.1982,
+      "Wind": 0.3751
     }
   },
   "JM": {
@@ -4787,16 +4787,16 @@
       "Wind": 0.0718
     },
     "2025": {
-      "Bioenergy": 0.2302,
-      "Hydro": 0.2353,
-      "Solar": 0.4628,
-      "Wind": 0.0718
+      "Bioenergy": 0.2277,
+      "Hydro": 0.2362,
+      "Solar": 0.4579,
+      "Wind": 0.0783
     },
     "2026": {
-      "Bioenergy": 0.2674,
-      "Hydro": 0.1777,
-      "Solar": 0.4713,
-      "Wind": 0.0835
+      "Bioenergy": 0.2569,
+      "Hydro": 0.181,
+      "Solar": 0.4497,
+      "Wind": 0.1123
     }
   },
   "KE": {
@@ -4837,16 +4837,16 @@
       "Wind": 0.2855
     },
     "2025": {
-      "Bioenergy": 0.0571,
-      "Hydro": 0.5608,
-      "Solar": 0.0714,
-      "Wind": 0.3107
+      "Bioenergy": 0.0576,
+      "Hydro": 0.568,
+      "Solar": 0.0719,
+      "Wind": 0.3025
     },
     "2026": {
-      "Bioenergy": 0.0512,
-      "Hydro": 0.5049,
-      "Solar": 0.0699,
-      "Wind": 0.374
+      "Bioenergy": 0.056,
+      "Hydro": 0.5863,
+      "Solar": 0.0764,
+      "Wind": 0.2813
     }
   },
   "KG": {
@@ -4864,89 +4864,89 @@
     },
     "2021": {
       "Bioenergy": 0.0008,
-      "Hydro": 0.995,
-      "Solar": 0.0017,
+      "Hydro": 0.9949,
+      "Solar": 0.0018,
       "Wind": 0.0025
     },
     "2022": {
       "Bioenergy": 0.0021,
-      "Hydro": 0.9858,
+      "Hydro": 0.9857,
       "Solar": 0.0051,
       "Wind": 0.007
     },
     "2023": {
       "Bioenergy": 0.002,
-      "Hydro": 0.9873,
+      "Hydro": 0.9872,
       "Solar": 0.0045,
       "Wind": 0.0063
     },
     "2024": {
       "Bioenergy": 0.0023,
-      "Hydro": 0.9817,
-      "Solar": 0.0079,
+      "Hydro": 0.9816,
+      "Solar": 0.008,
       "Wind": 0.0081
     },
     "2025": {
       "Bioenergy": 0.0018,
       "Hydro": 0.9822,
-      "Solar": 0.0088,
-      "Wind": 0.0072
+      "Solar": 0.0089,
+      "Wind": 0.0071
     },
     "2026": {
-      "Bioenergy": 0.0019,
-      "Hydro": 0.9808,
-      "Solar": 0.0086,
-      "Wind": 0.0087
+      "Bioenergy": 0.002,
+      "Hydro": 0.9821,
+      "Solar": 0.0077,
+      "Wind": 0.0081
     }
   },
   "KH": {
     "2019": {
       "Bioenergy": 0.0287,
-      "Hydro": 0.9053,
-      "Solar": 0.0416,
+      "Hydro": 0.9052,
+      "Solar": 0.0417,
       "Wind": 0.0244
     },
     "2020": {
-      "Bioenergy": 0.0295,
-      "Hydro": 0.8993,
-      "Solar": 0.0445,
-      "Wind": 0.0268
+      "Bioenergy": 0.0294,
+      "Hydro": 0.8991,
+      "Solar": 0.0447,
+      "Wind": 0.0267
     },
     "2021": {
       "Bioenergy": 0.0305,
-      "Hydro": 0.8886,
-      "Solar": 0.0476,
+      "Hydro": 0.8883,
+      "Solar": 0.0479,
       "Wind": 0.0333
     },
     "2022": {
       "Bioenergy": 0.0312,
-      "Hydro": 0.8795,
-      "Solar": 0.0525,
-      "Wind": 0.0368
+      "Hydro": 0.8792,
+      "Solar": 0.0529,
+      "Wind": 0.0367
     },
     "2023": {
       "Bioenergy": 0.0316,
-      "Hydro": 0.8694,
-      "Solar": 0.0584,
-      "Wind": 0.0406
+      "Hydro": 0.869,
+      "Solar": 0.0589,
+      "Wind": 0.0405
     },
     "2024": {
       "Bioenergy": 0.0307,
-      "Hydro": 0.8606,
-      "Solar": 0.0666,
-      "Wind": 0.0421
+      "Hydro": 0.8601,
+      "Solar": 0.0672,
+      "Wind": 0.042
     },
     "2025": {
       "Bioenergy": 0.03,
-      "Hydro": 0.8453,
-      "Solar": 0.0787,
-      "Wind": 0.0459
+      "Hydro": 0.8451,
+      "Solar": 0.0792,
+      "Wind": 0.0457
     },
     "2026": {
-      "Bioenergy": 0.0305,
-      "Hydro": 0.8372,
-      "Solar": 0.0769,
-      "Wind": 0.0555
+      "Bioenergy": 0.0317,
+      "Hydro": 0.843,
+      "Solar": 0.0725,
+      "Wind": 0.0528
     }
   },
   "KI": {
@@ -5187,16 +5187,16 @@
       "Wind": 0.0639
     },
     "2025": {
-      "Bioenergy": 0.2044,
-      "Hydro": 0.0672,
-      "Solar": 0.6668,
-      "Wind": 0.0617
+      "Bioenergy": 0.2074,
+      "Hydro": 0.0667,
+      "Solar": 0.6618,
+      "Wind": 0.064
     },
     "2026": {
-      "Bioenergy": 0.2183,
-      "Hydro": 0.0618,
-      "Solar": 0.6385,
-      "Wind": 0.0814
+      "Bioenergy": 0.2627,
+      "Hydro": 0.0546,
+      "Solar": 0.5673,
+      "Wind": 0.1155
     }
   },
   "KW": {
@@ -5338,15 +5338,15 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.581,
-      "Solar": 0.1261,
-      "Wind": 0.2929
+      "Hydro": 0.5837,
+      "Solar": 0.1161,
+      "Wind": 0.3002
     },
     "2026": {
       "Bioenergy": 0,
-      "Hydro": 0.5075,
-      "Solar": 0.1248,
-      "Wind": 0.3677
+      "Hydro": 0.5442,
+      "Solar": 0.0442,
+      "Wind": 0.4117
     }
   },
   "LA": {
@@ -5651,14 +5651,14 @@
   },
   "LT": {
     "2019": {
-      "Bioenergy": 0.1293,
-      "Hydro": 0.3686,
-      "Solar": 0.0688,
-      "Wind": 0.4334
+      "Bioenergy": 0.1292,
+      "Hydro": 0.3687,
+      "Solar": 0.0689,
+      "Wind": 0.4333
     },
     "2020": {
-      "Bioenergy": 0.1268,
-      "Hydro": 0.3373,
+      "Bioenergy": 0.1267,
+      "Hydro": 0.3374,
       "Solar": 0.0716,
       "Wind": 0.4643
     },
@@ -5675,7 +5675,7 @@
       "Wind": 0.4366
     },
     "2023": {
-      "Bioenergy": 0.0722,
+      "Bioenergy": 0.0721,
       "Hydro": 0.2525,
       "Solar": 0.1683,
       "Wind": 0.507
@@ -5684,33 +5684,33 @@
       "Bioenergy": 0.0513,
       "Hydro": 0.1846,
       "Solar": 0.236,
-      "Wind": 0.5281
+      "Wind": 0.528
     },
     "2025": {
-      "Bioenergy": 0.0331,
+      "Bioenergy": 0.0332,
       "Hydro": 0.1192,
-      "Solar": 0.2617,
-      "Wind": 0.5861
+      "Solar": 0.2615,
+      "Wind": 0.586
     },
     "2026": {
-      "Bioenergy": 0.0314,
-      "Hydro": 0.1354,
-      "Solar": 0.0328,
-      "Wind": 0.8004
+      "Bioenergy": 0.0441,
+      "Hydro": 0.1325,
+      "Solar": 0.0454,
+      "Wind": 0.778
     }
   },
   "LU": {
     "2019": {
       "Bioenergy": 0.1488,
-      "Hydro": 0.3879,
+      "Hydro": 0.388,
       "Solar": 0.1302,
-      "Wind": 0.3331
+      "Wind": 0.333
     },
     "2020": {
       "Bioenergy": 0.1645,
-      "Hydro": 0.3505,
+      "Hydro": 0.3506,
       "Solar": 0.1319,
-      "Wind": 0.3531
+      "Wind": 0.353
     },
     "2021": {
       "Bioenergy": 0.1846,
@@ -5720,39 +5720,39 @@
     },
     "2022": {
       "Bioenergy": 0.187,
-      "Hydro": 0.2888,
-      "Solar": 0.1959,
+      "Hydro": 0.2889,
+      "Solar": 0.196,
       "Wind": 0.3282
     },
     "2023": {
       "Bioenergy": 0.1102,
       "Hydro": 0.2889,
       "Solar": 0.2007,
-      "Wind": 0.4003
+      "Wind": 0.4002
     },
     "2024": {
       "Bioenergy": 0.1377,
-      "Hydro": 0.2934,
-      "Solar": 0.2197,
-      "Wind": 0.3492
+      "Hydro": 0.2933,
+      "Solar": 0.2198,
+      "Wind": 0.3491
     },
     "2025": {
-      "Bioenergy": 0.1294,
-      "Hydro": 0.2421,
-      "Solar": 0.28,
-      "Wind": 0.3485
+      "Bioenergy": 0.1296,
+      "Hydro": 0.2422,
+      "Solar": 0.2798,
+      "Wind": 0.3484
     },
     "2026": {
-      "Bioenergy": 0.1352,
-      "Hydro": 0.2708,
-      "Solar": 0.0918,
-      "Wind": 0.5021
+      "Bioenergy": 0.0981,
+      "Hydro": 0.3263,
+      "Solar": 0.0534,
+      "Wind": 0.5222
     }
   },
   "LV": {
     "2019": {
       "Bioenergy": 0.1956,
-      "Hydro": 0.7134,
+      "Hydro": 0.7135,
       "Solar": 0.0129,
       "Wind": 0.078
     },
@@ -5784,19 +5784,19 @@
       "Bioenergy": 0.0896,
       "Hydro": 0.679,
       "Solar": 0.1239,
-      "Wind": 0.1075
+      "Wind": 0.1074
     },
     "2025": {
-      "Bioenergy": 0.0823,
+      "Bioenergy": 0.0824,
       "Hydro": 0.6651,
       "Solar": 0.1733,
       "Wind": 0.0793
     },
     "2026": {
-      "Bioenergy": 0.0562,
-      "Hydro": 0.8484,
-      "Solar": 0.0294,
-      "Wind": 0.066
+      "Bioenergy": 0.0954,
+      "Hydro": 0.7618,
+      "Solar": 0.0475,
+      "Wind": 0.0954
     }
   },
   "LY": {
@@ -5888,27 +5888,27 @@
     },
     "2025": {
       "Bioenergy": 0.0011,
-      "Hydro": 0.1146,
-      "Solar": 0.1396,
-      "Wind": 0.7447
+      "Hydro": 0.1106,
+      "Solar": 0.1478,
+      "Wind": 0.7405
     },
     "2026": {
       "Bioenergy": 0.0012,
-      "Hydro": 0.1126,
-      "Solar": 0.1401,
-      "Wind": 0.7461
+      "Hydro": 0.1055,
+      "Solar": 0.1601,
+      "Wind": 0.7332
     }
   },
   "MD": {
     "2019": {
-      "Bioenergy": 0.0836,
-      "Hydro": 0.7095,
+      "Bioenergy": 0.0835,
+      "Hydro": 0.7096,
       "Solar": 0.0348,
-      "Wind": 0.1721
+      "Wind": 0.172
     },
     "2020": {
-      "Bioenergy": 0.0132,
-      "Hydro": 0.9174,
+      "Bioenergy": 0.0131,
+      "Hydro": 0.9175,
       "Solar": 0.0098,
       "Wind": 0.0596
     },
@@ -5920,9 +5920,9 @@
     },
     "2022": {
       "Bioenergy": 0.0474,
-      "Hydro": 0.6979,
+      "Hydro": 0.698,
       "Solar": 0.0777,
-      "Wind": 0.177
+      "Wind": 0.1769
     },
     "2023": {
       "Bioenergy": 0.0113,
@@ -5937,23 +5937,23 @@
       "Wind": 0.1776
     },
     "2025": {
-      "Bioenergy": 0.0081,
+      "Bioenergy": 0.0082,
       "Hydro": 0.6342,
       "Solar": 0.3205,
       "Wind": 0.0371
     },
     "2026": {
-      "Bioenergy": 0.0084,
-      "Hydro": 0.6404,
-      "Solar": 0.3069,
-      "Wind": 0.0443
+      "Bioenergy": 0.0082,
+      "Hydro": 0.6399,
+      "Solar": 0.306,
+      "Wind": 0.046
     }
   },
   "ME": {
     "2019": {
       "Bioenergy": 0.0142,
-      "Hydro": 0.794,
-      "Solar": 0.0195,
+      "Hydro": 0.7941,
+      "Solar": 0.0196,
       "Wind": 0.1722
     },
     "2020": {
@@ -5981,22 +5981,22 @@
       "Wind": 0.1506
     },
     "2024": {
-      "Bioenergy": 0.0068,
+      "Bioenergy": 0.0069,
       "Hydro": 0.7723,
-      "Solar": 0.057,
-      "Wind": 0.1639
+      "Solar": 0.0571,
+      "Wind": 0.1638
     },
     "2025": {
-      "Bioenergy": 0.0224,
+      "Bioenergy": 0.0225,
       "Hydro": 0.6162,
-      "Solar": 0.1478,
-      "Wind": 0.2137
+      "Solar": 0.1477,
+      "Wind": 0.2136
     },
     "2026": {
-      "Bioenergy": 0.0148,
-      "Hydro": 0.7689,
-      "Solar": 0.0566,
-      "Wind": 0.1597
+      "Bioenergy": 0,
+      "Hydro": 0.8649,
+      "Solar": 0.027,
+      "Wind": 0.1081
     }
   },
   "MG": {
@@ -6052,19 +6052,19 @@
   "MK": {
     "2019": {
       "Bioenergy": 0.0676,
-      "Hydro": 0.7702,
+      "Hydro": 0.7703,
       "Solar": 0.0191,
-      "Wind": 0.1432
+      "Wind": 0.1431
     },
     "2020": {
       "Bioenergy": 0.0715,
-      "Hydro": 0.7502,
+      "Hydro": 0.7503,
       "Solar": 0.0263,
-      "Wind": 0.152
+      "Wind": 0.1519
     },
     "2021": {
       "Bioenergy": 0.0647,
-      "Hydro": 0.7682,
+      "Hydro": 0.7683,
       "Solar": 0.0305,
       "Wind": 0.1365
     },
@@ -6087,16 +6087,16 @@
       "Wind": 0.1214
     },
     "2025": {
-      "Bioenergy": 0.0269,
-      "Hydro": 0.6097,
-      "Solar": 0.167,
-      "Wind": 0.1964
+      "Bioenergy": 0.0271,
+      "Hydro": 0.6098,
+      "Solar": 0.1669,
+      "Wind": 0.1963
     },
     "2026": {
-      "Bioenergy": 0.0247,
-      "Hydro": 0.6215,
-      "Solar": 0.1247,
-      "Wind": 0.2291
+      "Bioenergy": 0.0241,
+      "Hydro": 0.6199,
+      "Solar": 0.123,
+      "Wind": 0.233
     }
   },
   "ML": {
@@ -6251,52 +6251,52 @@
   },
   "MO": {
     "2019": {
-      "Bioenergy": 0.2209,
-      "Hydro": 0.5129,
-      "Solar": 0.1138,
+      "Bioenergy": 0.2208,
+      "Hydro": 0.5127,
+      "Solar": 0.1141,
       "Wind": 0.1523
     },
     "2020": {
-      "Bioenergy": 0.2158,
-      "Hydro": 0.497,
-      "Solar": 0.1275,
-      "Wind": 0.1597
+      "Bioenergy": 0.2155,
+      "Hydro": 0.4964,
+      "Solar": 0.1287,
+      "Wind": 0.1595
     },
     "2021": {
-      "Bioenergy": 0.2166,
-      "Hydro": 0.4463,
-      "Solar": 0.143,
-      "Wind": 0.1941
+      "Bioenergy": 0.2162,
+      "Hydro": 0.4453,
+      "Solar": 0.1448,
+      "Wind": 0.1937
     },
     "2022": {
-      "Bioenergy": 0.21,
-      "Hydro": 0.4209,
-      "Solar": 0.165,
-      "Wind": 0.2041
+      "Bioenergy": 0.2095,
+      "Hydro": 0.4198,
+      "Solar": 0.1671,
+      "Wind": 0.2036
     },
     "2023": {
-      "Bioenergy": 0.2099,
-      "Hydro": 0.3709,
-      "Solar": 0.1961,
-      "Wind": 0.2231
+      "Bioenergy": 0.2094,
+      "Hydro": 0.3699,
+      "Solar": 0.1983,
+      "Wind": 0.2225
     },
     "2024": {
-      "Bioenergy": 0.1933,
-      "Hydro": 0.3584,
-      "Solar": 0.2294,
-      "Wind": 0.2189
+      "Bioenergy": 0.1927,
+      "Hydro": 0.357,
+      "Solar": 0.2323,
+      "Wind": 0.218
     },
     "2025": {
-      "Bioenergy": 0.1751,
-      "Hydro": 0.331,
-      "Solar": 0.273,
-      "Wind": 0.2209
+      "Bioenergy": 0.1757,
+      "Hydro": 0.3277,
+      "Solar": 0.2761,
+      "Wind": 0.2205
     },
     "2026": {
-      "Bioenergy": 0.1747,
-      "Hydro": 0.3016,
-      "Solar": 0.2605,
-      "Wind": 0.2632
+      "Bioenergy": 0.1957,
+      "Hydro": 0.2766,
+      "Solar": 0.2571,
+      "Wind": 0.2705
     }
   },
   "MQ": {
@@ -6451,22 +6451,22 @@
   },
   "MT": {
     "2019": {
-      "Bioenergy": 0.0875,
-      "Hydro": 0.5243,
-      "Solar": 0.1018,
-      "Wind": 0.2865
+      "Bioenergy": 0.0874,
+      "Hydro": 0.5244,
+      "Solar": 0.1019,
+      "Wind": 0.2863
     },
     "2020": {
-      "Bioenergy": 0.085,
-      "Hydro": 0.5131,
-      "Solar": 0.1021,
-      "Wind": 0.2998
+      "Bioenergy": 0.0848,
+      "Hydro": 0.5133,
+      "Solar": 0.1022,
+      "Wind": 0.2997
     },
     "2021": {
       "Bioenergy": 0.09,
-      "Hydro": 0.4984,
-      "Solar": 0.1112,
-      "Wind": 0.3003
+      "Hydro": 0.4985,
+      "Solar": 0.1113,
+      "Wind": 0.3002
     },
     "2022": {
       "Bioenergy": 0.0563,
@@ -6484,19 +6484,19 @@
       "Bioenergy": 0.0297,
       "Hydro": 0.1921,
       "Solar": 0.6451,
-      "Wind": 0.1332
+      "Wind": 0.1331
     },
     "2025": {
-      "Bioenergy": 0.0295,
-      "Hydro": 0.1754,
-      "Solar": 0.6606,
-      "Wind": 0.1345
+      "Bioenergy": 0.0302,
+      "Hydro": 0.1791,
+      "Solar": 0.6548,
+      "Wind": 0.1359
     },
     "2026": {
-      "Bioenergy": 0.0328,
-      "Hydro": 0.1752,
-      "Solar": 0.6184,
-      "Wind": 0.1737
+      "Bioenergy": 0.0394,
+      "Hydro": 0.2189,
+      "Solar": 0.5197,
+      "Wind": 0.222
     }
   },
   "MU": {
@@ -6651,22 +6651,22 @@
   },
   "MX": {
     "2019": {
-      "Bioenergy": 0.0019,
-      "Hydro": 0.4838,
+      "Bioenergy": 0.0018,
+      "Hydro": 0.4839,
       "Solar": 0.1719,
       "Wind": 0.3424
     },
     "2020": {
       "Bioenergy": 0.0011,
       "Hydro": 0.4461,
-      "Solar": 0.225,
-      "Wind": 0.3277
+      "Solar": 0.2249,
+      "Wind": 0.3278
     },
     "2021": {
       "Bioenergy": 0.0011,
       "Hydro": 0.476,
-      "Solar": 0.234,
-      "Wind": 0.2889
+      "Solar": 0.2341,
+      "Wind": 0.2888
     },
     "2022": {
       "Bioenergy": 0.0013,
@@ -6682,8 +6682,8 @@
     },
     "2024": {
       "Bioenergy": 0.0014,
-      "Hydro": 0.3808,
-      "Solar": 0.2979,
+      "Hydro": 0.3807,
+      "Solar": 0.298,
       "Wind": 0.3199
     },
     "2025": {
@@ -7001,52 +7001,52 @@
   },
   "NI": {
     "2019": {
-      "Bioenergy": 0.4074,
-      "Hydro": 0.2098,
-      "Solar": 0.0182,
-      "Wind": 0.3646
+      "Bioenergy": 0.4131,
+      "Hydro": 0.2053,
+      "Solar": 0.018,
+      "Wind": 0.3636
     },
     "2020": {
-      "Bioenergy": 0.4054,
-      "Hydro": 0.2107,
-      "Solar": 0.0198,
-      "Wind": 0.3642
+      "Bioenergy": 0.4119,
+      "Hydro": 0.2053,
+      "Solar": 0.0195,
+      "Wind": 0.3633
     },
     "2021": {
-      "Bioenergy": 0.4064,
-      "Hydro": 0.2043,
-      "Solar": 0.0215,
-      "Wind": 0.3678
+      "Bioenergy": 0.4123,
+      "Hydro": 0.2001,
+      "Solar": 0.0211,
+      "Wind": 0.3664
     },
     "2022": {
-      "Bioenergy": 0.4021,
-      "Hydro": 0.2097,
-      "Solar": 0.0233,
-      "Wind": 0.3649
+      "Bioenergy": 0.4074,
+      "Hydro": 0.2061,
+      "Solar": 0.023,
+      "Wind": 0.3635
     },
     "2023": {
-      "Bioenergy": 0.4022,
-      "Hydro": 0.2052,
-      "Solar": 0.0263,
-      "Wind": 0.3663
+      "Bioenergy": 0.4074,
+      "Hydro": 0.2019,
+      "Solar": 0.0259,
+      "Wind": 0.3649
     },
     "2024": {
-      "Bioenergy": 0.402,
-      "Hydro": 0.201,
-      "Solar": 0.0293,
-      "Wind": 0.3676
+      "Bioenergy": 0.4072,
+      "Hydro": 0.1978,
+      "Solar": 0.0289,
+      "Wind": 0.3661
     },
     "2025": {
-      "Bioenergy": 0.4011,
-      "Hydro": 0.1983,
-      "Solar": 0.032,
-      "Wind": 0.3686
+      "Bioenergy": 0.4061,
+      "Hydro": 0.1954,
+      "Solar": 0.0315,
+      "Wind": 0.367
     },
     "2026": {
-      "Bioenergy": 0.4011,
-      "Hydro": 0.1941,
-      "Solar": 0.0353,
-      "Wind": 0.3695
+      "Bioenergy": 0.4055,
+      "Hydro": 0.194,
+      "Solar": 0.0344,
+      "Wind": 0.366
     }
   },
   "NL": {
@@ -7054,7 +7054,7 @@
       "Bioenergy": 0.2235,
       "Hydro": 0.0256,
       "Solar": 0.2425,
-      "Wind": 0.5085
+      "Wind": 0.5084
     },
     "2020": {
       "Bioenergy": 0.2457,
@@ -7093,10 +7093,10 @@
       "Wind": 0.4685
     },
     "2026": {
-      "Bioenergy": 0.0935,
+      "Bioenergy": 0.1369,
       "Hydro": 0.0019,
-      "Solar": 0.109,
-      "Wind": 0.7957
+      "Solar": 0.1351,
+      "Wind": 0.7262
     }
   },
   "NO": {
@@ -7144,9 +7144,9 @@
     },
     "2026": {
       "Bioenergy": 0,
-      "Hydro": 0.892,
+      "Hydro": 0.91,
       "Solar": 0,
-      "Wind": 0.108
+      "Wind": 0.09
     }
   },
   "NP": {
@@ -7159,44 +7159,44 @@
     "2020": {
       "Bioenergy": 0.0043,
       "Hydro": 0.9617,
-      "Solar": 0.0212,
+      "Solar": 0.0213,
       "Wind": 0.0128
     },
     "2021": {
       "Bioenergy": 0.0048,
-      "Hydro": 0.9571,
-      "Solar": 0.0226,
-      "Wind": 0.0156
+      "Hydro": 0.957,
+      "Solar": 0.0227,
+      "Wind": 0.0155
     },
     "2022": {
       "Bioenergy": 0.0052,
-      "Hydro": 0.953,
-      "Solar": 0.0248,
+      "Hydro": 0.9528,
+      "Solar": 0.0249,
       "Wind": 0.0171
     },
     "2023": {
       "Bioenergy": 0.0054,
-      "Hydro": 0.9486,
-      "Solar": 0.0273,
+      "Hydro": 0.9484,
+      "Solar": 0.0275,
       "Wind": 0.0187
     },
     "2024": {
       "Bioenergy": 0.0051,
-      "Hydro": 0.9444,
-      "Solar": 0.031,
+      "Hydro": 0.9442,
+      "Solar": 0.0312,
       "Wind": 0.0195
     },
     "2025": {
       "Bioenergy": 0.005,
-      "Hydro": 0.9371,
-      "Solar": 0.0365,
-      "Wind": 0.0213
+      "Hydro": 0.937,
+      "Solar": 0.0367,
+      "Wind": 0.0212
     },
     "2026": {
-      "Bioenergy": 0.0053,
-      "Hydro": 0.9334,
-      "Solar": 0.0358,
-      "Wind": 0.0255
+      "Bioenergy": 0.0056,
+      "Hydro": 0.9367,
+      "Solar": 0.0336,
+      "Wind": 0.0241
     }
   },
   "NR": {
@@ -7343,10 +7343,10 @@
       "Wind": 0.1373
     },
     "2026": {
-      "Bioenergy": 0.0041,
-      "Hydro": 0.8553,
+      "Bioenergy": 0.0044,
+      "Hydro": 0.849,
       "Solar": 0,
-      "Wind": 0.1406
+      "Wind": 0.1466
     }
   },
   "OM": {
@@ -7493,10 +7493,10 @@
       "Wind": 0.1003
     },
     "2026": {
-      "Bioenergy": 0.0163,
-      "Hydro": 0.7766,
-      "Solar": 0.0938,
-      "Wind": 0.1133
+      "Bioenergy": 0.0161,
+      "Hydro": 0.8525,
+      "Solar": 0.059,
+      "Wind": 0.0724
     }
   },
   "PF": {
@@ -7637,16 +7637,16 @@
       "Wind": 0.0721
     },
     "2025": {
-      "Bioenergy": 0.0551,
-      "Hydro": 0.6759,
-      "Solar": 0.2264,
-      "Wind": 0.0425
+      "Bioenergy": 0.0603,
+      "Hydro": 0.6586,
+      "Solar": 0.2236,
+      "Wind": 0.0574
     },
     "2026": {
-      "Bioenergy": 0.0392,
-      "Hydro": 0.7317,
-      "Solar": 0.2048,
-      "Wind": 0.0242
+      "Bioenergy": 0.0779,
+      "Hydro": 0.5929,
+      "Solar": 0.2095,
+      "Wind": 0.1197
     }
   },
   "PK": {
@@ -7687,16 +7687,16 @@
       "Wind": 0.0556
     },
     "2025": {
-      "Bioenergy": 0.0067,
-      "Hydro": 0.5785,
-      "Solar": 0.3535,
-      "Wind": 0.0614
+      "Bioenergy": 0.0081,
+      "Hydro": 0.4909,
+      "Solar": 0.4509,
+      "Wind": 0.0501
     },
     "2026": {
-      "Bioenergy": 0.0049,
-      "Hydro": 0.6665,
-      "Solar": 0.2669,
-      "Wind": 0.0617
+      "Bioenergy": 0.0194,
+      "Hydro": 0.2971,
+      "Solar": 0.6525,
+      "Wind": 0.031
     }
   },
   "PL": {
@@ -7731,7 +7731,7 @@
       "Wind": 0.5489
     },
     "2024": {
-      "Bioenergy": 0.052,
+      "Bioenergy": 0.0521,
       "Hydro": 0.0524,
       "Solar": 0.3777,
       "Wind": 0.5178
@@ -7743,10 +7743,10 @@
       "Wind": 0.4835
     },
     "2026": {
-      "Bioenergy": 0.0767,
-      "Hydro": 0.0702,
-      "Solar": 0.1333,
-      "Wind": 0.7198
+      "Bioenergy": 0.0861,
+      "Hydro": 0.0307,
+      "Solar": 0.1722,
+      "Wind": 0.711
     }
   },
   "PM": {
@@ -7937,16 +7937,16 @@
       "Wind": 0.376
     },
     "2025": {
-      "Bioenergy": 0.0744,
-      "Hydro": 0.3321,
-      "Solar": 0.2412,
-      "Wind": 0.3523
+      "Bioenergy": 0.0747,
+      "Hydro": 0.3332,
+      "Solar": 0.2386,
+      "Wind": 0.3535
     },
     "2026": {
-      "Bioenergy": 0.0735,
-      "Hydro": 0.4212,
-      "Solar": 0.1209,
-      "Wind": 0.3844
+      "Bioenergy": 0.0621,
+      "Hydro": 0.4016,
+      "Solar": 0.1147,
+      "Wind": 0.4216
     }
   },
   "PY": {
@@ -8101,10 +8101,10 @@
   },
   "RO": {
     "2019": {
-      "Bioenergy": 0.0196,
+      "Bioenergy": 0.0195,
       "Hydro": 0.6439,
       "Solar": 0.0576,
-      "Wind": 0.279
+      "Wind": 0.2789
     },
     "2020": {
       "Bioenergy": 0.0231,
@@ -8137,16 +8137,16 @@
       "Wind": 0.2537
     },
     "2025": {
-      "Bioenergy": 0.0221,
+      "Bioenergy": 0.0222,
       "Hydro": 0.4981,
       "Solar": 0.231,
       "Wind": 0.2488
     },
     "2026": {
       "Bioenergy": 0.0237,
-      "Hydro": 0.6424,
-      "Solar": 0.0425,
-      "Wind": 0.2915
+      "Hydro": 0.5828,
+      "Solar": 0.0478,
+      "Wind": 0.3457
     }
   },
   "RS": {
@@ -8184,7 +8184,7 @@
       "Bioenergy": 0.025,
       "Hydro": 0.8495,
       "Solar": 0.0164,
-      "Wind": 0.1092
+      "Wind": 0.1091
     },
     "2025": {
       "Bioenergy": 0.0349,
@@ -8193,10 +8193,10 @@
       "Wind": 0.1477
     },
     "2026": {
-      "Bioenergy": 0.0347,
-      "Hydro": 0.8138,
-      "Solar": 0.0057,
-      "Wind": 0.1458
+      "Bioenergy": 0.0023,
+      "Hydro": 0.8375,
+      "Solar": 0.0025,
+      "Wind": 0.1577
     }
   },
   "RU": {
@@ -8238,15 +8238,15 @@
     },
     "2025": {
       "Bioenergy": 0.0039,
-      "Hydro": 0.9641,
-      "Solar": 0.0114,
-      "Wind": 0.0206
+      "Hydro": 0.9639,
+      "Solar": 0.011,
+      "Wind": 0.0212
     },
     "2026": {
-      "Bioenergy": 0.0043,
-      "Hydro": 0.9707,
-      "Solar": 0.0073,
-      "Wind": 0.0177
+      "Bioenergy": 0.0047,
+      "Hydro": 0.9676,
+      "Solar": 0.0027,
+      "Wind": 0.025
     }
   },
   "RW": {
@@ -8538,15 +8538,15 @@
     },
     "2025": {
       "Bioenergy": 0.0491,
-      "Hydro": 0.5814,
-      "Solar": 0.0385,
-      "Wind": 0.3311
+      "Hydro": 0.582,
+      "Solar": 0.0375,
+      "Wind": 0.3314
     },
     "2026": {
-      "Bioenergy": 0.0599,
-      "Hydro": 0.5715,
-      "Solar": 0.0083,
-      "Wind": 0.3603
+      "Bioenergy": 0.0811,
+      "Hydro": 0.6539,
+      "Solar": 0.0024,
+      "Wind": 0.2626
     }
   },
   "SG": {
@@ -8570,7 +8570,7 @@
     },
     "2022": {
       "Bioenergy": 0.0051,
-      "Hydro": 0.0377,
+      "Hydro": 0.0376,
       "Solar": 0.9441,
       "Wind": 0.0132
     },
@@ -8588,15 +8588,15 @@
     },
     "2025": {
       "Bioenergy": 0.0033,
-      "Hydro": 0.0194,
-      "Solar": 0.9642,
-      "Wind": 0.0131
+      "Hydro": 0.0191,
+      "Solar": 0.9646,
+      "Wind": 0.013
     },
     "2026": {
-      "Bioenergy": 0.0036,
-      "Hydro": 0.019,
-      "Solar": 0.9608,
-      "Wind": 0.0166
+      "Bioenergy": 0.0038,
+      "Hydro": 0.0159,
+      "Solar": 0.9647,
+      "Wind": 0.0155
     }
   },
   "SH": {
@@ -8687,16 +8687,16 @@
       "Wind": 0.0053
     },
     "2025": {
-      "Bioenergy": 0.0313,
-      "Hydro": 0.6841,
-      "Solar": 0.2702,
-      "Wind": 0.0144
+      "Bioenergy": 0.0315,
+      "Hydro": 0.689,
+      "Solar": 0.265,
+      "Wind": 0.0145
     },
     "2026": {
-      "Bioenergy": 0.0665,
-      "Hydro": 0.7336,
-      "Solar": 0.1999,
-      "Wind": 0
+      "Bioenergy": 0.0791,
+      "Hydro": 0.7173,
+      "Solar": 0.1114,
+      "Wind": 0.0922
     }
   },
   "SK": {
@@ -8704,13 +8704,13 @@
       "Bioenergy": 0.1406,
       "Hydro": 0.7417,
       "Solar": 0.0927,
-      "Wind": 0.025
+      "Wind": 0.0249
     },
     "2020": {
       "Bioenergy": 0.1516,
       "Hydro": 0.7508,
       "Solar": 0.0868,
-      "Wind": 0.0109
+      "Wind": 0.0108
     },
     "2021": {
       "Bioenergy": 0.1554,
@@ -8743,9 +8743,9 @@
       "Wind": 0
     },
     "2026": {
-      "Bioenergy": 0.2052,
-      "Hydro": 0.7695,
-      "Solar": 0.0253,
+      "Bioenergy": 0.2122,
+      "Hydro": 0.7576,
+      "Solar": 0.0302,
       "Wind": 0
     }
   },
@@ -9069,34 +9069,34 @@
       "Wind": 0.0426
     },
     "2022": {
-      "Bioenergy": 0.1318,
-      "Hydro": 0.5603,
-      "Solar": 0.2674,
-      "Wind": 0.0406
+      "Bioenergy": 0.1344,
+      "Hydro": 0.5583,
+      "Solar": 0.267,
+      "Wind": 0.0403
     },
     "2023": {
-      "Bioenergy": 0.1533,
-      "Hydro": 0.4498,
-      "Solar": 0.3468,
+      "Bioenergy": 0.1535,
+      "Hydro": 0.4497,
+      "Solar": 0.3467,
       "Wind": 0.0501
     },
     "2024": {
-      "Bioenergy": 0.1322,
-      "Hydro": 0.533,
-      "Solar": 0.2982,
-      "Wind": 0.0367
+      "Bioenergy": 0.1332,
+      "Hydro": 0.5323,
+      "Solar": 0.298,
+      "Wind": 0.0365
     },
     "2025": {
-      "Bioenergy": 0.2823,
-      "Hydro": 0.3303,
-      "Solar": 0.2911,
-      "Wind": 0.0963
+      "Bioenergy": 0.1051,
+      "Hydro": 0.5239,
+      "Solar": 0.3293,
+      "Wind": 0.0416
     },
     "2026": {
-      "Bioenergy": 0.2822,
-      "Hydro": 0.3281,
-      "Solar": 0.2931,
-      "Wind": 0.0965
+      "Bioenergy": 0.0011,
+      "Hydro": 0.656,
+      "Solar": 0.3093,
+      "Wind": 0.0336
     }
   },
   "SY": {
@@ -9352,51 +9352,51 @@
   "TH": {
     "2019": {
       "Bioenergy": 0.3919,
-      "Hydro": 0.2899,
-      "Solar": 0.1797,
+      "Hydro": 0.2898,
+      "Solar": 0.1798,
       "Wind": 0.1385
     },
     "2020": {
-      "Bioenergy": 0.4077,
-      "Hydro": 0.2639,
-      "Solar": 0.1878,
-      "Wind": 0.1406
+      "Bioenergy": 0.4076,
+      "Hydro": 0.2638,
+      "Solar": 0.188,
+      "Wind": 0.1405
     },
     "2021": {
-      "Bioenergy": 0.4041,
-      "Hydro": 0.2573,
-      "Solar": 0.1634,
-      "Wind": 0.1752
+      "Bioenergy": 0.4039,
+      "Hydro": 0.2571,
+      "Solar": 0.1639,
+      "Wind": 0.1751
     },
     "2022": {
-      "Bioenergy": 0.3871,
-      "Hydro": 0.2971,
-      "Solar": 0.1805,
-      "Wind": 0.1352
+      "Bioenergy": 0.3869,
+      "Hydro": 0.2969,
+      "Solar": 0.1811,
+      "Wind": 0.1351
     },
     "2023": {
-      "Bioenergy": 0.392,
-      "Hydro": 0.2704,
-      "Solar": 0.1849,
-      "Wind": 0.1527
+      "Bioenergy": 0.3918,
+      "Hydro": 0.2702,
+      "Solar": 0.1855,
+      "Wind": 0.1526
     },
     "2024": {
-      "Bioenergy": 0.3583,
-      "Hydro": 0.269,
-      "Solar": 0.2152,
-      "Wind": 0.1575
+      "Bioenergy": 0.358,
+      "Hydro": 0.2686,
+      "Solar": 0.216,
+      "Wind": 0.1573
     },
     "2025": {
-      "Bioenergy": 0.2604,
-      "Hydro": 0.2765,
-      "Solar": 0.3136,
-      "Wind": 0.1494
+      "Bioenergy": 0.2492,
+      "Hydro": 0.2848,
+      "Solar": 0.3167,
+      "Wind": 0.1493
     },
     "2026": {
-      "Bioenergy": 0.2431,
-      "Hydro": 0.2556,
-      "Solar": 0.3226,
-      "Wind": 0.1788
+      "Bioenergy": 0.2099,
+      "Hydro": 0.279,
+      "Solar": 0.3213,
+      "Wind": 0.1898
     }
   },
   "TJ": {
@@ -9693,10 +9693,10 @@
       "Wind": 0.2767
     },
     "2026": {
-      "Bioenergy": 0.0791,
-      "Hydro": 0.4193,
-      "Solar": 0.1729,
-      "Wind": 0.3288
+      "Bioenergy": 0.0598,
+      "Hydro": 0.3616,
+      "Solar": 0.1324,
+      "Wind": 0.4462
     }
   },
   "TT": {
@@ -9751,52 +9751,52 @@
   },
   "TW": {
     "2019": {
-      "Bioenergy": 0.0161,
-      "Hydro": 0.4763,
-      "Solar": 0.3438,
-      "Wind": 0.1637
+      "Bioenergy": 0.0162,
+      "Hydro": 0.4776,
+      "Solar": 0.3421,
+      "Wind": 0.1641
     },
     "2020": {
-      "Bioenergy": 0.019,
-      "Hydro": 0.2584,
-      "Solar": 0.5233,
-      "Wind": 0.1993
+      "Bioenergy": 0.0187,
+      "Hydro": 0.2553,
+      "Solar": 0.529,
+      "Wind": 0.1969
     },
     "2021": {
-      "Bioenergy": 0.016,
-      "Hydro": 0.2501,
-      "Solar": 0.5715,
-      "Wind": 0.1624
+      "Bioenergy": 0.0156,
+      "Hydro": 0.243,
+      "Solar": 0.5836,
+      "Wind": 0.1578
     },
     "2022": {
-      "Bioenergy": 0.0094,
-      "Hydro": 0.2882,
-      "Solar": 0.5263,
-      "Wind": 0.1762
+      "Bioenergy": 0.0093,
+      "Hydro": 0.285,
+      "Solar": 0.5315,
+      "Wind": 0.1742
     },
     "2023": {
-      "Bioenergy": 0.0107,
-      "Hydro": 0.1697,
-      "Solar": 0.5525,
-      "Wind": 0.2671
+      "Bioenergy": 0.0105,
+      "Hydro": 0.1667,
+      "Solar": 0.5601,
+      "Wind": 0.2627
     },
     "2024": {
       "Bioenergy": 0.0072,
-      "Hydro": 0.1389,
-      "Solar": 0.5055,
-      "Wind": 0.3484
+      "Hydro": 0.1393,
+      "Solar": 0.5044,
+      "Wind": 0.3492
     },
     "2025": {
-      "Bioenergy": 0.0074,
-      "Hydro": 0.1771,
-      "Solar": 0.4389,
-      "Wind": 0.3766
+      "Bioenergy": 0.0073,
+      "Hydro": 0.162,
+      "Solar": 0.4709,
+      "Wind": 0.3597
     },
     "2026": {
-      "Bioenergy": 0.0061,
-      "Hydro": 0.1144,
-      "Solar": 0.3147,
-      "Wind": 0.5647
+      "Bioenergy": 0.0062,
+      "Hydro": 0.0556,
+      "Solar": 0.3443,
+      "Wind": 0.594
     }
   },
   "TZ": {
@@ -9987,16 +9987,16 @@
       "Wind": 0.4378
     },
     "2025": {
-      "Bioenergy": 0.0407,
-      "Hydro": 0.2117,
-      "Solar": 0.3386,
-      "Wind": 0.409
+      "Bioenergy": 0.0405,
+      "Hydro": 0.2116,
+      "Solar": 0.3402,
+      "Wind": 0.4077
     },
     "2026": {
-      "Bioenergy": 0.0437,
-      "Hydro": 0.2462,
-      "Solar": 0.2066,
-      "Wind": 0.5035
+      "Bioenergy": 0.0411,
+      "Hydro": 0.2763,
+      "Solar": 0.254,
+      "Wind": 0.4286
     }
   },
   "UY": {
@@ -10007,8 +10007,8 @@
       "Wind": 0.3479
     },
     "2020": {
-      "Bioenergy": 0.093,
-      "Hydro": 0.3685,
+      "Bioenergy": 0.0937,
+      "Hydro": 0.3679,
       "Solar": 0.0382,
       "Wind": 0.5002
     },
@@ -10025,10 +10025,10 @@
       "Wind": 0.4157
     },
     "2023": {
-      "Bioenergy": 0.1087,
-      "Hydro": 0.3867,
-      "Solar": 0.0438,
-      "Wind": 0.4608
+      "Bioenergy": 0.1121,
+      "Hydro": 0.3845,
+      "Solar": 0.0436,
+      "Wind": 0.4599
     },
     "2024": {
       "Bioenergy": 0.1296,
@@ -10037,16 +10037,16 @@
       "Wind": 0.3343
     },
     "2025": {
-      "Bioenergy": 0.14,
-      "Hydro": 0.4747,
+      "Bioenergy": 0.141,
+      "Hydro": 0.4741,
       "Solar": 0.041,
-      "Wind": 0.3443
+      "Wind": 0.344
     },
     "2026": {
-      "Bioenergy": 0.1656,
-      "Hydro": 0.4889,
-      "Solar": 0.0534,
-      "Wind": 0.2921
+      "Bioenergy": 0.1468,
+      "Hydro": 0.4495,
+      "Solar": 0.055,
+      "Wind": 0.3486
     }
   },
   "UZ": {
@@ -10064,39 +10064,39 @@
     },
     "2021": {
       "Bioenergy": 0.0037,
-      "Hydro": 0.9754,
-      "Solar": 0.0099,
+      "Hydro": 0.9753,
+      "Solar": 0.0101,
       "Wind": 0.011
     },
     "2022": {
       "Bioenergy": 0.004,
-      "Hydro": 0.9721,
-      "Solar": 0.0117,
+      "Hydro": 0.972,
+      "Solar": 0.0118,
       "Wind": 0.0122
     },
     "2023": {
       "Bioenergy": 0.0042,
-      "Hydro": 0.9687,
-      "Solar": 0.0137,
-      "Wind": 0.0135
+      "Hydro": 0.9685,
+      "Solar": 0.0138,
+      "Wind": 0.0134
     },
     "2024": {
       "Bioenergy": 0.004,
-      "Hydro": 0.9653,
-      "Solar": 0.0166,
+      "Hydro": 0.9651,
+      "Solar": 0.0168,
       "Wind": 0.0141
     },
     "2025": {
       "Bioenergy": 0.0039,
       "Hydro": 0.9594,
-      "Solar": 0.0211,
-      "Wind": 0.0156
+      "Solar": 0.0212,
+      "Wind": 0.0155
     },
     "2026": {
-      "Bioenergy": 0.0041,
-      "Hydro": 0.9565,
-      "Solar": 0.0205,
-      "Wind": 0.0189
+      "Bioenergy": 0.0044,
+      "Hydro": 0.9593,
+      "Solar": 0.0187,
+      "Wind": 0.0177
     }
   },
   "VC": {
@@ -10451,7 +10451,7 @@
   },
   "XK": {
     "2019": {
-      "Bioenergy": 0.0018,
+      "Bioenergy": 0.0017,
       "Hydro": 0.6739,
       "Solar": 0.034,
       "Wind": 0.2904
@@ -10481,22 +10481,22 @@
       "Wind": 0.4551
     },
     "2024": {
-      "Bioenergy": 0.028,
+      "Bioenergy": 0.0281,
       "Hydro": 0.3914,
       "Solar": 0.0433,
       "Wind": 0.5373
     },
     "2025": {
-      "Bioenergy": 0.0349,
+      "Bioenergy": 0.0352,
       "Hydro": 0.4406,
-      "Solar": 0.1044,
-      "Wind": 0.4201
+      "Solar": 0.1043,
+      "Wind": 0.4199
     },
     "2026": {
-      "Bioenergy": 0.0351,
-      "Hydro": 0.4644,
-      "Solar": 0.0378,
-      "Wind": 0.4628
+      "Bioenergy": 0.034,
+      "Hydro": 0.4635,
+      "Solar": 0.0362,
+      "Wind": 0.4662
     }
   },
   "YE": {
@@ -10588,15 +10588,15 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.0461,
-      "Solar": 0.6224,
-      "Wind": 0.3314
+      "Hydro": 0.0521,
+      "Solar": 0.6213,
+      "Wind": 0.3266
     },
     "2026": {
       "Bioenergy": 0,
-      "Hydro": 0.0399,
-      "Solar": 0.6573,
-      "Wind": 0.3028
+      "Hydro": 0.0919,
+      "Solar": 0.6402,
+      "Wind": 0.2679
     }
   },
   "ZM": {