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

@digital4better/data 1.3.32 → 1.3.33

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

package/data/factor/continent-monthly-green.csv +416 -416
package/data/factor/continent-monthly-green.json +3605 -3605
package/data/factor/continent-monthly.csv +415 -415
package/data/factor/continent-monthly.json +3524 -3524
package/data/factor/continent-yearly-green.csv +41 -41
package/data/factor/continent-yearly-green.json +353 -353
package/data/factor/continent-yearly.csv +41 -41
package/data/factor/continent-yearly.json +336 -336
package/data/factor/country-monthly-green.csv +5657 -5657
package/data/factor/country-monthly-green.json +49811 -49811
package/data/factor/country-monthly.csv +5696 -5696
package/data/factor/country-monthly.json +44380 -44380
package/data/factor/country-yearly-green.csv +639 -639
package/data/factor/country-yearly-green.json +5637 -5637
package/data/factor/country-yearly.csv +641 -641
package/data/factor/country-yearly.json +5008 -5008
package/data/factor/subdivision-monthly-green.csv +39 -39
package/data/factor/subdivision-monthly-green.json +345 -345
package/data/factor/subdivision-monthly.csv +39 -39
package/data/factor/subdivision-monthly.json +342 -342
package/data/factor/subdivision-yearly-green.csv +26 -26
package/data/factor/subdivision-yearly-green.json +228 -228
package/data/factor/subdivision-yearly.csv +26 -26
package/data/factor/subdivision-yearly.json +230 -230
package/data/factor/world-monthly-green.csv +86 -86
package/data/factor/world-monthly-green.json +774 -774
package/data/factor/world-monthly.csv +86 -86
package/data/factor/world-monthly.json +774 -774
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 +368 -368
package/data/mix/continent-monthly-green.json +1302 -1302
package/data/mix/continent-monthly.csv +368 -368
package/data/mix/continent-monthly.json +2427 -2427
package/data/mix/continent-yearly-green.csv +36 -36
package/data/mix/continent-yearly-green.json +130 -130
package/data/mix/continent-yearly.csv +36 -36
package/data/mix/continent-yearly.json +244 -244
package/data/mix/country-monthly-green.csv +4065 -4065
package/data/mix/country-monthly-green.json +13522 -13522
package/data/mix/country-monthly.csv +4065 -4065
package/data/mix/country-monthly.json +15688 -15688
package/data/mix/country-yearly-green.csv +449 -449
package/data/mix/country-yearly-green.json +1499 -1499
package/data/mix/country-yearly.csv +449 -449
package/data/mix/country-yearly.json +1955 -1955
package/data/mix/subdivision-monthly-green.csv +30 -30
package/data/mix/subdivision-monthly-green.json +57 -57
package/data/mix/subdivision-monthly.csv +30 -30
package/data/mix/subdivision-monthly.json +102 -102
package/data/mix/subdivision-yearly-green.csv +18 -18
package/data/mix/subdivision-yearly-green.json +34 -34
package/data/mix/subdivision-yearly.csv +18 -18
package/data/mix/subdivision-yearly.json +57 -57
package/data/mix/world-monthly-green.csv +86 -86
package/data/mix/world-monthly-green.json +344 -344
package/data/mix/world-monthly.csv +86 -86
package/data/mix/world-monthly.json +763 -763
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 +72 -72
package/package.json +1 -1

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

@@ -51,52 +51,52 @@
   },
   "AF": {
     "2019": {
-      "Bioenergy": 0.0318,
-      "Hydro": 0.7952,
-      "Solar": 0.0885,
-      "Wind": 0.0845
+      "Bioenergy": 0.0319,
+      "Hydro": 0.7969,
+      "Solar": 0.0873,
+      "Wind": 0.084
     },
     "2020": {
-      "Bioenergy": 0.0343,
-      "Hydro": 0.7776,
-      "Solar": 0.0975,
-      "Wind": 0.0906
+      "Bioenergy": 0.0345,
+      "Hydro": 0.7796,
+      "Solar": 0.0959,
+      "Wind": 0.0899
     },
     "2021": {
-      "Bioenergy": 0.0377,
-      "Hydro": 0.7435,
-      "Solar": 0.1073,
-      "Wind": 0.1115
+      "Bioenergy": 0.0379,
+      "Hydro": 0.7456,
+      "Solar": 0.1057,
+      "Wind": 0.1109
     },
     "2022": {
-      "Bioenergy": 0.0398,
-      "Hydro": 0.7185,
-      "Solar": 0.1217,
-      "Wind": 0.12
+      "Bioenergy": 0.04,
+      "Hydro": 0.7206,
+      "Solar": 0.1198,
+      "Wind": 0.1196
     },
     "2023": {
-      "Bioenergy": 0.041,
-      "Hydro": 0.6867,
-      "Solar": 0.1405,
-      "Wind": 0.1318
+      "Bioenergy": 0.0412,
+      "Hydro": 0.6885,
+      "Solar": 0.1388,
+      "Wind": 0.1315
     },
     "2024": {
-      "Bioenergy": 0.0377,
-      "Hydro": 0.6659,
-      "Solar": 0.1636,
-      "Wind": 0.1328
+      "Bioenergy": 0.0379,
+      "Hydro": 0.6677,
+      "Solar": 0.1618,
+      "Wind": 0.1326
     },
     "2025": {
-      "Bioenergy": 0.0354,
-      "Hydro": 0.6307,
-      "Solar": 0.1949,
+      "Bioenergy": 0.0356,
+      "Hydro": 0.6325,
+      "Solar": 0.193,
       "Wind": 0.139
     },
     "2026": {
-      "Bioenergy": 0.041,
-      "Hydro": 0.6139,
-      "Solar": 0.1794,
-      "Wind": 0.1658
+      "Bioenergy": 0.0406,
+      "Hydro": 0.5938,
+      "Solar": 0.203,
+      "Wind": 0.1626
     }
   },
   "AG": {
@@ -176,9 +176,9 @@
     },
     "2023": {
       "Bioenergy": 0.0109,
-      "Hydro": 0.9115,
+      "Hydro": 0.9114,
       "Solar": 0.0284,
-      "Wind": 0.0492
+      "Wind": 0.0493
     },
     "2024": {
       "Bioenergy": 0.0109,
@@ -187,16 +187,16 @@
       "Wind": 0.0497
     },
     "2025": {
-      "Bioenergy": 0.0109,
-      "Hydro": 0.9002,
-      "Solar": 0.0396,
-      "Wind": 0.0493
+      "Bioenergy": 0.0108,
+      "Hydro": 0.9001,
+      "Solar": 0.0397,
+      "Wind": 0.0494
     },
     "2026": {
       "Bioenergy": 0.0109,
-      "Hydro": 0.9128,
-      "Solar": 0.0149,
-      "Wind": 0.0614
+      "Hydro": 0.9099,
+      "Solar": 0.0187,
+      "Wind": 0.0605
     }
   },
   "AM": {
@@ -220,32 +220,32 @@
     },
     "2022": {
       "Bioenergy": 0.0006,
-      "Hydro": 0.8854,
+      "Hydro": 0.8855,
       "Solar": 0.1117,
       "Wind": 0.0022
     },
     "2023": {
       "Bioenergy": 0.0008,
-      "Hydro": 0.8074,
-      "Solar": 0.1888,
+      "Hydro": 0.8075,
+      "Solar": 0.1887,
       "Wind": 0.003
     },
     "2024": {
       "Bioenergy": 0.0012,
-      "Hydro": 0.7893,
-      "Solar": 0.205,
-      "Wind": 0.0045
+      "Hydro": 0.7837,
+      "Solar": 0.2106,
+      "Wind": 0.0044
     },
     "2025": {
       "Bioenergy": 0.0003,
-      "Hydro": 0.8255,
-      "Solar": 0.1731,
+      "Hydro": 0.7888,
+      "Solar": 0.2097,
       "Wind": 0.0012
     },
     "2026": {
       "Bioenergy": 0,
-      "Hydro": 0.8463,
-      "Solar": 0.1537,
+      "Hydro": 0.6665,
+      "Solar": 0.3335,
       "Wind": 0
     }
   },
@@ -301,7 +301,7 @@
   },
   "AR": {
     "2019": {
-      "Bioenergy": 0.0147,
+      "Bioenergy": 0.0148,
       "Hydro": 0.8514,
       "Solar": 0.0188,
       "Wind": 0.1151
@@ -325,14 +325,14 @@
       "Wind": 0.2746
     },
     "2023": {
-      "Bioenergy": 0.0218,
-      "Hydro": 0.6848,
-      "Solar": 0.0564,
-      "Wind": 0.237
+      "Bioenergy": 0.0219,
+      "Hydro": 0.685,
+      "Solar": 0.0563,
+      "Wind": 0.2369
     },
     "2024": {
       "Bioenergy": 0.024,
-      "Hydro": 0.6221,
+      "Hydro": 0.6222,
       "Solar": 0.0715,
       "Wind": 0.2823
     },
@@ -340,13 +340,13 @@
       "Bioenergy": 0.029,
       "Hydro": 0.5585,
       "Solar": 0.0911,
-      "Wind": 0.3214
+      "Wind": 0.3213
     },
     "2026": {
-      "Bioenergy": 0.0255,
-      "Hydro": 0.5235,
-      "Solar": 0.1196,
-      "Wind": 0.3314
+      "Bioenergy": 0.0271,
+      "Hydro": 0.5134,
+      "Solar": 0.1306,
+      "Wind": 0.3289
     }
   },
   "AS": {
@@ -437,16 +437,16 @@
       "Wind": 0.1511
     },
     "2025": {
-      "Bioenergy": 0.0308,
-      "Hydro": 0.6523,
-      "Solar": 0.1827,
-      "Wind": 0.1342
+      "Bioenergy": 0.0352,
+      "Hydro": 0.6393,
+      "Solar": 0.1681,
+      "Wind": 0.1573
     },
     "2026": {
-      "Bioenergy": 0.0288,
-      "Hydro": 0.6723,
-      "Solar": 0.1805,
-      "Wind": 0.1183
+      "Bioenergy": 0.0521,
+      "Hydro": 0.59,
+      "Solar": 0.13,
+      "Wind": 0.2278
     }
   },
   "AU": {
@@ -493,10 +493,10 @@
       "Wind": 0.3676
     },
     "2026": {
-      "Bioenergy": 0.0064,
-      "Hydro": 0.0919,
-      "Solar": 0.5818,
-      "Wind": 0.3198
+      "Bioenergy": 0.007,
+      "Hydro": 0.0992,
+      "Solar": 0.5675,
+      "Wind": 0.3264
     }
   },
   "AW": {
@@ -576,9 +576,9 @@
     },
     "2023": {
       "Bioenergy": 0.0011,
-      "Hydro": 0.9575,
-      "Solar": 0.0381,
-      "Wind": 0.0033
+      "Hydro": 0.9576,
+      "Solar": 0.038,
+      "Wind": 0.0032
     },
     "2024": {
       "Bioenergy": 0,
@@ -588,14 +588,14 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.9646,
-      "Solar": 0.0354,
+      "Hydro": 0.9554,
+      "Solar": 0.0446,
       "Wind": 0
     },
     "2026": {
       "Bioenergy": 0,
-      "Hydro": 1,
-      "Solar": 0,
+      "Hydro": 0.9562,
+      "Solar": 0.0438,
       "Wind": 0
     }
   },
@@ -644,9 +644,9 @@
     },
     "2026": {
       "Bioenergy": 0,
-      "Hydro": 0.9243,
-      "Solar": 0.0455,
-      "Wind": 0.0303
+      "Hydro": 0.9253,
+      "Solar": 0.0448,
+      "Wind": 0.0298
     }
   },
   "BB": {
@@ -701,52 +701,52 @@
   },
   "BD": {
     "2019": {
-      "Bioenergy": 0.0437,
-      "Hydro": 0.739,
-      "Solar": 0.0999,
-      "Wind": 0.1175
+      "Bioenergy": 0.0438,
+      "Hydro": 0.7412,
+      "Solar": 0.0981,
+      "Wind": 0.1169
     },
     "2020": {
-      "Bioenergy": 0.0465,
-      "Hydro": 0.7037,
-      "Solar": 0.1271,
-      "Wind": 0.1228
+      "Bioenergy": 0.0467,
+      "Hydro": 0.7065,
+      "Solar": 0.1247,
+      "Wind": 0.122
     },
     "2021": {
-      "Bioenergy": 0.0503,
-      "Hydro": 0.5993,
-      "Solar": 0.2014,
-      "Wind": 0.1491
+      "Bioenergy": 0.0505,
+      "Hydro": 0.6016,
+      "Solar": 0.1994,
+      "Wind": 0.1485
     },
     "2022": {
-      "Bioenergy": 0.0503,
-      "Hydro": 0.5467,
-      "Solar": 0.2499,
-      "Wind": 0.1531
+      "Bioenergy": 0.0506,
+      "Hydro": 0.5489,
+      "Solar": 0.2479,
+      "Wind": 0.1527
     },
     "2023": {
-      "Bioenergy": 0.0484,
-      "Hydro": 0.4571,
-      "Solar": 0.3372,
-      "Wind": 0.1573
+      "Bioenergy": 0.0487,
+      "Hydro": 0.4586,
+      "Solar": 0.3357,
+      "Wind": 0.1571
     },
     "2024": {
-      "Bioenergy": 0.0434,
-      "Hydro": 0.4331,
-      "Solar": 0.3538,
-      "Wind": 0.1696
+      "Bioenergy": 0.0437,
+      "Hydro": 0.4347,
+      "Solar": 0.3522,
+      "Wind": 0.1694
     },
     "2025": {
-      "Bioenergy": 0.044,
-      "Hydro": 0.3768,
-      "Solar": 0.4008,
-      "Wind": 0.1783
+      "Bioenergy": 0.0443,
+      "Hydro": 0.3783,
+      "Solar": 0.3989,
+      "Wind": 0.1784
     },
     "2026": {
-      "Bioenergy": 0.0581,
-      "Hydro": 0.2963,
-      "Solar": 0.4103,
-      "Wind": 0.2352
+      "Bioenergy": 0.0538,
+      "Hydro": 0.28,
+      "Solar": 0.4315,
+      "Wind": 0.2348
     }
   },
   "BE": {
@@ -783,69 +783,69 @@
     "2024": {
       "Bioenergy": 0.0374,
       "Hydro": 0.0803,
-      "Solar": 0.3399,
-      "Wind": 0.5424
+      "Solar": 0.3398,
+      "Wind": 0.5425
     },
     "2025": {
-      "Bioenergy": 0.042,
+      "Bioenergy": 0.0419,
       "Hydro": 0.081,
       "Solar": 0.3874,
-      "Wind": 0.4896
+      "Wind": 0.4897
     },
     "2026": {
-      "Bioenergy": 0.0457,
-      "Hydro": 0.0923,
-      "Solar": 0.1219,
-      "Wind": 0.74
+      "Bioenergy": 0.0405,
+      "Hydro": 0.0968,
+      "Solar": 0.1512,
+      "Wind": 0.7116
     }
   },
   "BF": {
     "2019": {
-      "Bioenergy": 0.1346,
-      "Hydro": 0.5968,
-      "Solar": 0.218,
+      "Bioenergy": 0.1338,
+      "Hydro": 0.5964,
+      "Solar": 0.2192,
       "Wind": 0.0506
     },
     "2020": {
-      "Bioenergy": 0.1346,
-      "Hydro": 0.5968,
-      "Solar": 0.218,
+      "Bioenergy": 0.1338,
+      "Hydro": 0.5964,
+      "Solar": 0.2192,
       "Wind": 0.0506
     },
     "2021": {
-      "Bioenergy": 0.1346,
-      "Hydro": 0.5968,
-      "Solar": 0.218,
+      "Bioenergy": 0.1338,
+      "Hydro": 0.5964,
+      "Solar": 0.2192,
       "Wind": 0.0506
     },
     "2022": {
-      "Bioenergy": 0.1346,
-      "Hydro": 0.5968,
-      "Solar": 0.218,
+      "Bioenergy": 0.1338,
+      "Hydro": 0.5964,
+      "Solar": 0.2192,
       "Wind": 0.0506
     },
     "2023": {
-      "Bioenergy": 0.1346,
-      "Hydro": 0.5968,
-      "Solar": 0.218,
+      "Bioenergy": 0.1338,
+      "Hydro": 0.5964,
+      "Solar": 0.2192,
       "Wind": 0.0506
     },
     "2024": {
-      "Bioenergy": 0.1346,
-      "Hydro": 0.5968,
-      "Solar": 0.218,
+      "Bioenergy": 0.1338,
+      "Hydro": 0.5964,
+      "Solar": 0.2192,
       "Wind": 0.0506
     },
     "2025": {
-      "Bioenergy": 0.1346,
-      "Hydro": 0.5968,
-      "Solar": 0.218,
+      "Bioenergy": 0.1338,
+      "Hydro": 0.5964,
+      "Solar": 0.2192,
       "Wind": 0.0506
     },
     "2026": {
-      "Bioenergy": 0.1346,
-      "Hydro": 0.5968,
-      "Solar": 0.218,
+      "Bioenergy": 0.1338,
+      "Hydro": 0.5964,
+      "Solar": 0.2192,
       "Wind": 0.0506
     }
   },
@@ -876,14 +876,14 @@
     },
     "2023": {
       "Bioenergy": 0.0234,
-      "Hydro": 0.3932,
+      "Hydro": 0.3931,
       "Solar": 0.3897,
       "Wind": 0.1937
     },
     "2024": {
       "Bioenergy": 0.0171,
       "Hydro": 0.3193,
-      "Solar": 0.5028,
+      "Solar": 0.5027,
       "Wind": 0.1609
     },
     "2025": {
@@ -893,160 +893,160 @@
       "Wind": 0.1298
     },
     "2026": {
-      "Bioenergy": 0.018,
-      "Hydro": 0.4611,
-      "Solar": 0.3044,
-      "Wind": 0.2165
+      "Bioenergy": 0.0171,
+      "Hydro": 0.4987,
+      "Solar": 0.2928,
+      "Wind": 0.1914
     }
   },
   "BH": {
     "2019": {
       "Bioenergy": 0.0007,
-      "Hydro": 0.1089,
-      "Solar": 0.8855,
+      "Hydro": 0.1088,
+      "Solar": 0.8857,
       "Wind": 0.0048
     },
     "2020": {
       "Bioenergy": 0.0007,
-      "Hydro": 0.1089,
-      "Solar": 0.8855,
+      "Hydro": 0.1088,
+      "Solar": 0.8857,
       "Wind": 0.0048
     },
     "2021": {
       "Bioenergy": 0.0007,
-      "Hydro": 0.1089,
-      "Solar": 0.8855,
+      "Hydro": 0.1088,
+      "Solar": 0.8857,
       "Wind": 0.0048
     },
     "2022": {
       "Bioenergy": 0.0007,
-      "Hydro": 0.1089,
-      "Solar": 0.8855,
+      "Hydro": 0.1088,
+      "Solar": 0.8857,
       "Wind": 0.0048
     },
     "2023": {
       "Bioenergy": 0.0007,
-      "Hydro": 0.1089,
-      "Solar": 0.8855,
+      "Hydro": 0.1088,
+      "Solar": 0.8857,
       "Wind": 0.0048
     },
     "2024": {
       "Bioenergy": 0.0007,
-      "Hydro": 0.1089,
-      "Solar": 0.8855,
+      "Hydro": 0.1088,
+      "Solar": 0.8857,
       "Wind": 0.0048
     },
     "2025": {
       "Bioenergy": 0.0007,
-      "Hydro": 0.1089,
-      "Solar": 0.8855,
+      "Hydro": 0.1088,
+      "Solar": 0.8857,
       "Wind": 0.0048
     },
     "2026": {
       "Bioenergy": 0.0007,
-      "Hydro": 0.1089,
-      "Solar": 0.8855,
+      "Hydro": 0.1088,
+      "Solar": 0.8857,
       "Wind": 0.0048
     }
   },
   "BI": {
     "2019": {
-      "Bioenergy": 0.0357,
-      "Hydro": 0.9523,
-      "Solar": 0.0043,
+      "Bioenergy": 0.0356,
+      "Hydro": 0.9522,
+      "Solar": 0.0046,
       "Wind": 0.0077
     },
     "2020": {
-      "Bioenergy": 0.0357,
-      "Hydro": 0.9523,
-      "Solar": 0.0043,
+      "Bioenergy": 0.0356,
+      "Hydro": 0.9522,
+      "Solar": 0.0046,
       "Wind": 0.0077
     },
     "2021": {
-      "Bioenergy": 0.0357,
-      "Hydro": 0.9523,
-      "Solar": 0.0043,
+      "Bioenergy": 0.0356,
+      "Hydro": 0.9522,
+      "Solar": 0.0046,
       "Wind": 0.0077
     },
     "2022": {
-      "Bioenergy": 0.0357,
-      "Hydro": 0.9523,
-      "Solar": 0.0043,
+      "Bioenergy": 0.0356,
+      "Hydro": 0.9522,
+      "Solar": 0.0046,
       "Wind": 0.0077
     },
     "2023": {
-      "Bioenergy": 0.0357,
-      "Hydro": 0.9523,
-      "Solar": 0.0043,
+      "Bioenergy": 0.0356,
+      "Hydro": 0.9522,
+      "Solar": 0.0046,
       "Wind": 0.0077
     },
     "2024": {
-      "Bioenergy": 0.0357,
-      "Hydro": 0.9523,
-      "Solar": 0.0043,
+      "Bioenergy": 0.0356,
+      "Hydro": 0.9522,
+      "Solar": 0.0046,
       "Wind": 0.0077
     },
     "2025": {
-      "Bioenergy": 0.0357,
-      "Hydro": 0.9523,
-      "Solar": 0.0043,
+      "Bioenergy": 0.0356,
+      "Hydro": 0.9522,
+      "Solar": 0.0046,
       "Wind": 0.0077
     },
     "2026": {
-      "Bioenergy": 0.0357,
-      "Hydro": 0.9523,
-      "Solar": 0.0043,
+      "Bioenergy": 0.0356,
+      "Hydro": 0.9522,
+      "Solar": 0.0046,
       "Wind": 0.0077
     }
   },
   "BJ": {
     "2019": {
-      "Bioenergy": 0.0177,
-      "Hydro": 0.7711,
-      "Solar": 0.1043,
-      "Wind": 0.1069
+      "Bioenergy": 0.0163,
+      "Hydro": 0.77,
+      "Solar": 0.107,
+      "Wind": 0.1067
     },
     "2020": {
-      "Bioenergy": 0.0177,
-      "Hydro": 0.7711,
-      "Solar": 0.1043,
-      "Wind": 0.1069
+      "Bioenergy": 0.0163,
+      "Hydro": 0.77,
+      "Solar": 0.107,
+      "Wind": 0.1067
     },
     "2021": {
-      "Bioenergy": 0.0177,
-      "Hydro": 0.7711,
-      "Solar": 0.1043,
-      "Wind": 0.1069
+      "Bioenergy": 0.0163,
+      "Hydro": 0.77,
+      "Solar": 0.107,
+      "Wind": 0.1067
     },
     "2022": {
-      "Bioenergy": 0.0177,
-      "Hydro": 0.7711,
-      "Solar": 0.1043,
-      "Wind": 0.1069
+      "Bioenergy": 0.0163,
+      "Hydro": 0.77,
+      "Solar": 0.107,
+      "Wind": 0.1067
     },
     "2023": {
-      "Bioenergy": 0.0177,
-      "Hydro": 0.7711,
-      "Solar": 0.1043,
-      "Wind": 0.1069
+      "Bioenergy": 0.0163,
+      "Hydro": 0.77,
+      "Solar": 0.107,
+      "Wind": 0.1067
     },
     "2024": {
-      "Bioenergy": 0.0177,
-      "Hydro": 0.7711,
-      "Solar": 0.1043,
-      "Wind": 0.1069
+      "Bioenergy": 0.0163,
+      "Hydro": 0.77,
+      "Solar": 0.107,
+      "Wind": 0.1067
     },
     "2025": {
-      "Bioenergy": 0.0177,
-      "Hydro": 0.7711,
-      "Solar": 0.1043,
-      "Wind": 0.1069
+      "Bioenergy": 0.0163,
+      "Hydro": 0.77,
+      "Solar": 0.107,
+      "Wind": 0.1067
     },
     "2026": {
-      "Bioenergy": 0.0177,
-      "Hydro": 0.7711,
-      "Solar": 0.1043,
-      "Wind": 0.1069
+      "Bioenergy": 0.0163,
+      "Hydro": 0.77,
+      "Solar": 0.107,
+      "Wind": 0.1067
     }
   },
   "BM": {
@@ -1194,9 +1194,9 @@
     },
     "2026": {
       "Bioenergy": 0,
-      "Hydro": 0.8485,
-      "Solar": 0.0909,
-      "Wind": 0.0606
+      "Hydro": 0.9,
+      "Solar": 0.0751,
+      "Wind": 0.0249
     }
   },
   "BR": {
@@ -1243,10 +1243,10 @@
       "Wind": 0.1727
     },
     "2026": {
-      "Bioenergy": 0.0635,
-      "Hydro": 0.633,
-      "Solar": 0.1564,
-      "Wind": 0.147
+      "Bioenergy": 0.0643,
+      "Hydro": 0.66,
+      "Solar": 0.1517,
+      "Wind": 0.124
     }
   },
   "BS": {
@@ -1351,52 +1351,52 @@
   },
   "BW": {
     "2019": {
-      "Bioenergy": 0.0177,
-      "Hydro": 0.7682,
-      "Solar": 0.1076,
-      "Wind": 0.1065
+      "Bioenergy": 0.0162,
+      "Hydro": 0.7671,
+      "Solar": 0.1103,
+      "Wind": 0.1063
     },
     "2020": {
-      "Bioenergy": 0.0177,
-      "Hydro": 0.7682,
-      "Solar": 0.1076,
-      "Wind": 0.1065
+      "Bioenergy": 0.0162,
+      "Hydro": 0.7671,
+      "Solar": 0.1103,
+      "Wind": 0.1063
     },
     "2021": {
-      "Bioenergy": 0.0177,
-      "Hydro": 0.7682,
-      "Solar": 0.1076,
-      "Wind": 0.1065
+      "Bioenergy": 0.0162,
+      "Hydro": 0.7671,
+      "Solar": 0.1103,
+      "Wind": 0.1063
     },
     "2022": {
-      "Bioenergy": 0.0177,
-      "Hydro": 0.7682,
-      "Solar": 0.1076,
-      "Wind": 0.1065
+      "Bioenergy": 0.0162,
+      "Hydro": 0.7671,
+      "Solar": 0.1103,
+      "Wind": 0.1063
     },
     "2023": {
-      "Bioenergy": 0.0177,
-      "Hydro": 0.7682,
-      "Solar": 0.1076,
-      "Wind": 0.1065
+      "Bioenergy": 0.0162,
+      "Hydro": 0.7671,
+      "Solar": 0.1103,
+      "Wind": 0.1063
     },
     "2024": {
-      "Bioenergy": 0.0177,
-      "Hydro": 0.7682,
-      "Solar": 0.1076,
-      "Wind": 0.1065
+      "Bioenergy": 0.0162,
+      "Hydro": 0.7671,
+      "Solar": 0.1103,
+      "Wind": 0.1063
     },
     "2025": {
-      "Bioenergy": 0.0177,
-      "Hydro": 0.7682,
-      "Solar": 0.1076,
-      "Wind": 0.1065
+      "Bioenergy": 0.0162,
+      "Hydro": 0.7671,
+      "Solar": 0.1103,
+      "Wind": 0.1063
     },
     "2026": {
-      "Bioenergy": 0.0177,
-      "Hydro": 0.7682,
-      "Solar": 0.1076,
-      "Wind": 0.1065
+      "Bioenergy": 0.0162,
+      "Hydro": 0.7671,
+      "Solar": 0.1103,
+      "Wind": 0.1063
     }
   },
   "BY": {
@@ -1428,75 +1428,75 @@
       "Bioenergy": 0.4119,
       "Hydro": 0.3102,
       "Solar": 0.1262,
-      "Wind": 0.1516
+      "Wind": 0.1517
     },
     "2024": {
-      "Bioenergy": 0.2913,
+      "Bioenergy": 0.2914,
       "Hydro": 0.3668,
-      "Solar": 0.1918,
-      "Wind": 0.1501
+      "Solar": 0.1916,
+      "Wind": 0.1502
     },
     "2025": {
-      "Bioenergy": 0.3545,
-      "Hydro": 0.3371,
-      "Solar": 0.1462,
-      "Wind": 0.1621
+      "Bioenergy": 0.1539,
+      "Hydro": 0.4671,
+      "Solar": 0.1629,
+      "Wind": 0.216
     },
     "2026": {
-      "Bioenergy": 0.3333,
-      "Hydro": 0.3333,
-      "Solar": 0.1667,
-      "Wind": 0.1667
+      "Bioenergy": 0.1383,
+      "Hydro": 0.4725,
+      "Solar": 0.1665,
+      "Wind": 0.2227
     }
   },
   "BZ": {
     "2019": {
-      "Bioenergy": 0.2479,
-      "Hydro": 0.6952,
+      "Bioenergy": 0.2481,
+      "Hydro": 0.6951,
       "Solar": 0.0244,
       "Wind": 0.0324
     },
     "2020": {
-      "Bioenergy": 0.2468,
-      "Hydro": 0.6892,
+      "Bioenergy": 0.247,
+      "Hydro": 0.689,
       "Solar": 0.0284,
-      "Wind": 0.0357
+      "Wind": 0.0356
     },
     "2021": {
-      "Bioenergy": 0.2471,
-      "Hydro": 0.6773,
-      "Solar": 0.033,
-      "Wind": 0.0427
+      "Bioenergy": 0.2475,
+      "Hydro": 0.6771,
+      "Solar": 0.0329,
+      "Wind": 0.0425
     },
     "2022": {
-      "Bioenergy": 0.2385,
-      "Hydro": 0.6797,
+      "Bioenergy": 0.2388,
+      "Hydro": 0.6795,
       "Solar": 0.0376,
-      "Wind": 0.0442
+      "Wind": 0.0441
     },
     "2023": {
-      "Bioenergy": 0.2386,
-      "Hydro": 0.668,
-      "Solar": 0.0453,
-      "Wind": 0.048
+      "Bioenergy": 0.2384,
+      "Hydro": 0.6688,
+      "Solar": 0.0451,
+      "Wind": 0.0476
     },
     "2024": {
-      "Bioenergy": 0.2382,
-      "Hydro": 0.6565,
-      "Solar": 0.0535,
-      "Wind": 0.0517
+      "Bioenergy": 0.2383,
+      "Hydro": 0.6572,
+      "Solar": 0.0533,
+      "Wind": 0.0511
     },
     "2025": {
       "Bioenergy": 0.2362,
-      "Hydro": 0.6481,
-      "Solar": 0.0603,
-      "Wind": 0.0554
+      "Hydro": 0.649,
+      "Solar": 0.0599,
+      "Wind": 0.055
     },
     "2026": {
-      "Bioenergy": 0.2347,
-      "Hydro": 0.6444,
-      "Solar": 0.0681,
-      "Wind": 0.0529
+      "Bioenergy": 0.2304,
+      "Hydro": 0.6523,
+      "Solar": 0.0666,
+      "Wind": 0.0507
     }
   },
   "CA": {
@@ -1538,64 +1538,64 @@
     },
     "2025": {
       "Bioenergy": 0.0272,
-      "Hydro": 0.8327,
-      "Solar": 0.0155,
-      "Wind": 0.1246
+      "Hydro": 0.8343,
+      "Solar": 0.015,
+      "Wind": 0.1236
     },
     "2026": {
       "Bioenergy": 0.0289,
-      "Hydro": 0.8101,
-      "Solar": 0.0086,
-      "Wind": 0.1524
+      "Hydro": 0.8287,
+      "Solar": 0.0044,
+      "Wind": 0.138
     }
   },
   "CD": {
     "2019": {
-      "Bioenergy": 0.0208,
-      "Hydro": 0.9758,
-      "Solar": 0.0017,
+      "Bioenergy": 0.001,
+      "Hydro": 0.9954,
+      "Solar": 0.0018,
       "Wind": 0.0017
     },
     "2020": {
-      "Bioenergy": 0.0208,
-      "Hydro": 0.9758,
-      "Solar": 0.0017,
+      "Bioenergy": 0.001,
+      "Hydro": 0.9954,
+      "Solar": 0.0018,
       "Wind": 0.0017
     },
     "2021": {
-      "Bioenergy": 0.0208,
-      "Hydro": 0.9758,
-      "Solar": 0.0017,
+      "Bioenergy": 0.001,
+      "Hydro": 0.9954,
+      "Solar": 0.0018,
       "Wind": 0.0017
     },
     "2022": {
-      "Bioenergy": 0.0208,
-      "Hydro": 0.9758,
-      "Solar": 0.0017,
+      "Bioenergy": 0.001,
+      "Hydro": 0.9954,
+      "Solar": 0.0018,
       "Wind": 0.0017
     },
     "2023": {
-      "Bioenergy": 0.0208,
-      "Hydro": 0.9758,
-      "Solar": 0.0017,
+      "Bioenergy": 0.001,
+      "Hydro": 0.9954,
+      "Solar": 0.0018,
       "Wind": 0.0017
     },
     "2024": {
-      "Bioenergy": 0.0208,
-      "Hydro": 0.9758,
-      "Solar": 0.0017,
+      "Bioenergy": 0.001,
+      "Hydro": 0.9954,
+      "Solar": 0.0018,
       "Wind": 0.0017
     },
     "2025": {
-      "Bioenergy": 0.0208,
-      "Hydro": 0.9758,
-      "Solar": 0.0017,
+      "Bioenergy": 0.001,
+      "Hydro": 0.9954,
+      "Solar": 0.0018,
       "Wind": 0.0017
     },
     "2026": {
-      "Bioenergy": 0.0208,
-      "Hydro": 0.9758,
-      "Solar": 0.0017,
+      "Bioenergy": 0.001,
+      "Hydro": 0.9954,
+      "Solar": 0.0018,
       "Wind": 0.0017
     }
   },
@@ -1651,50 +1651,50 @@
   },
   "CG": {
     "2019": {
-      "Bioenergy": 0,
-      "Hydro": 1,
+      "Bioenergy": 0.0277,
+      "Hydro": 0.9723,
       "Solar": 0,
       "Wind": 0
     },
     "2020": {
-      "Bioenergy": 0,
-      "Hydro": 1,
+      "Bioenergy": 0.0277,
+      "Hydro": 0.9723,
       "Solar": 0,
       "Wind": 0
     },
     "2021": {
-      "Bioenergy": 0,
-      "Hydro": 1,
+      "Bioenergy": 0.0277,
+      "Hydro": 0.9723,
       "Solar": 0,
       "Wind": 0
     },
     "2022": {
-      "Bioenergy": 0,
-      "Hydro": 1,
+      "Bioenergy": 0.0277,
+      "Hydro": 0.9723,
       "Solar": 0,
       "Wind": 0
     },
     "2023": {
-      "Bioenergy": 0,
-      "Hydro": 1,
+      "Bioenergy": 0.0277,
+      "Hydro": 0.9723,
       "Solar": 0,
       "Wind": 0
     },
     "2024": {
-      "Bioenergy": 0,
-      "Hydro": 1,
+      "Bioenergy": 0.0277,
+      "Hydro": 0.9723,
       "Solar": 0,
       "Wind": 0
     },
     "2025": {
-      "Bioenergy": 0,
-      "Hydro": 1,
+      "Bioenergy": 0.0277,
+      "Hydro": 0.9723,
       "Solar": 0,
       "Wind": 0
     },
     "2026": {
-      "Bioenergy": 0,
-      "Hydro": 1,
+      "Bioenergy": 0.0277,
+      "Hydro": 0.9723,
       "Solar": 0,
       "Wind": 0
     }
@@ -1732,21 +1732,21 @@
     },
     "2024": {
       "Bioenergy": 0.0006,
-      "Hydro": 0.8882,
+      "Hydro": 0.8881,
       "Solar": 0.1044,
       "Wind": 0.0069
     },
     "2025": {
       "Bioenergy": 0.0039,
-      "Hydro": 0.7995,
+      "Hydro": 0.7996,
       "Solar": 0.174,
       "Wind": 0.0225
     },
     "2026": {
       "Bioenergy": 0.0147,
-      "Hydro": 0.803,
-      "Solar": 0.0967,
-      "Wind": 0.0856
+      "Hydro": 0.7827,
+      "Solar": 0.118,
+      "Wind": 0.0846
     }
   },
   "CI": {
@@ -1864,20 +1864,20 @@
     },
     "2021": {
       "Bioenergy": 0.0553,
-      "Hydro": 0.4512,
-      "Solar": 0.2952,
+      "Hydro": 0.4513,
+      "Solar": 0.2951,
       "Wind": 0.1983
     },
     "2022": {
       "Bioenergy": 0.0421,
-      "Hydro": 0.4453,
+      "Hydro": 0.4454,
       "Solar": 0.3186,
       "Wind": 0.194
     },
     "2023": {
       "Bioenergy": 0.0373,
-      "Hydro": 0.4559,
-      "Solar": 0.3185,
+      "Hydro": 0.456,
+      "Solar": 0.3184,
       "Wind": 0.1882
     },
     "2024": {
@@ -1893,10 +1893,10 @@
       "Wind": 0.2186
     },
     "2026": {
-      "Bioenergy": 0.0286,
-      "Hydro": 0.3333,
-      "Solar": 0.4494,
-      "Wind": 0.1886
+      "Bioenergy": 0.0284,
+      "Hydro": 0.3296,
+      "Solar": 0.4462,
+      "Wind": 0.1958
     }
   },
   "CM": {
@@ -2001,52 +2001,52 @@
   },
   "CO": {
     "2019": {
-      "Bioenergy": 0.0035,
-      "Hydro": 0.9897,
-      "Solar": 0.0027,
-      "Wind": 0.004
+      "Bioenergy": 0.0138,
+      "Hydro": 0.9806,
+      "Solar": 0.0025,
+      "Wind": 0.0031
     },
     "2020": {
-      "Bioenergy": 0.0065,
-      "Hydro": 0.9824,
-      "Solar": 0.0059,
-      "Wind": 0.0052
+      "Bioenergy": 0.0151,
+      "Hydro": 0.9789,
+      "Solar": 0.0045,
+      "Wind": 0.0015
     },
     "2021": {
-      "Bioenergy": 0.0015,
-      "Hydro": 0.9883,
-      "Solar": 0.0065,
-      "Wind": 0.0037
+      "Bioenergy": 0.0132,
+      "Hydro": 0.9798,
+      "Solar": 0.0055,
+      "Wind": 0.0015
     },
     "2022": {
-      "Bioenergy": 0.0007,
-      "Hydro": 0.9883,
-      "Solar": 0.0084,
-      "Wind": 0.0026
+      "Bioenergy": 0.0121,
+      "Hydro": 0.9791,
+      "Solar": 0.0077,
+      "Wind": 0.0012
     },
     "2023": {
-      "Bioenergy": 0.0027,
-      "Hydro": 0.9653,
-      "Solar": 0.0228,
-      "Wind": 0.0092
+      "Bioenergy": 0.0135,
+      "Hydro": 0.9625,
+      "Solar": 0.0198,
+      "Wind": 0.0042
     },
     "2024": {
-      "Bioenergy": 0.0056,
-      "Hydro": 0.9165,
-      "Solar": 0.0622,
-      "Wind": 0.0157
+      "Bioenergy": 0.0148,
+      "Hydro": 0.9266,
+      "Solar": 0.0561,
+      "Wind": 0.0026
     },
     "2025": {
-      "Bioenergy": 0.0003,
-      "Hydro": 0.9381,
-      "Solar": 0.0583,
-      "Wind": 0.0033
+      "Bioenergy": 0.013,
+      "Hydro": 0.9241,
+      "Solar": 0.0607,
+      "Wind": 0.0022
     },
     "2026": {
-      "Bioenergy": 0.0001,
-      "Hydro": 0.9389,
-      "Solar": 0.0575,
-      "Wind": 0.0034
+      "Bioenergy": 0.0155,
+      "Hydro": 0.9103,
+      "Solar": 0.0711,
+      "Wind": 0.0031
     }
   },
   "CR": {
@@ -2082,9 +2082,9 @@
     },
     "2024": {
       "Bioenergy": 0.0063,
-      "Hydro": 0.8639,
+      "Hydro": 0.864,
       "Solar": 0.0024,
-      "Wind": 0.1274
+      "Wind": 0.1273
     },
     "2025": {
       "Bioenergy": 0.0048,
@@ -2093,10 +2093,10 @@
       "Wind": 0.1331
     },
     "2026": {
-      "Bioenergy": 0.0116,
-      "Hydro": 0.7675,
-      "Solar": 0.0021,
-      "Wind": 0.2188
+      "Bioenergy": 0.011,
+      "Hydro": 0.7774,
+      "Solar": 0.0011,
+      "Wind": 0.2105
     }
   },
   "CU": {
@@ -2239,14 +2239,14 @@
     "2025": {
       "Bioenergy": 0,
       "Hydro": 0,
-      "Solar": 0.873,
-      "Wind": 0.127
+      "Solar": 0.8641,
+      "Wind": 0.1359
     },
     "2026": {
       "Bioenergy": 0,
       "Hydro": 0,
-      "Solar": 0.8571,
-      "Wind": 0.1429
+      "Solar": 0.727,
+      "Wind": 0.273
     }
   },
   "CZ": {
@@ -2293,10 +2293,10 @@
       "Wind": 0.0648
     },
     "2026": {
-      "Bioenergy": 0.4716,
-      "Hydro": 0.1886,
-      "Solar": 0.208,
-      "Wind": 0.1318
+      "Bioenergy": 0.4304,
+      "Hydro": 0.2021,
+      "Solar": 0.2485,
+      "Wind": 0.1189
     }
   },
   "DE": {
@@ -2343,60 +2343,60 @@
       "Wind": 0.4668
     },
     "2026": {
-      "Bioenergy": 0.1592,
-      "Hydro": 0.0443,
-      "Solar": 0.083,
-      "Wind": 0.7135
+      "Bioenergy": 0.1515,
+      "Hydro": 0.0464,
+      "Solar": 0.1273,
+      "Wind": 0.6748
     }
   },
   "DJ": {
     "2019": {
-      "Bioenergy": 0.0185,
-      "Hydro": 0.8065,
-      "Solar": 0.0632,
-      "Wind": 0.1118
+      "Bioenergy": 0.017,
+      "Hydro": 0.8053,
+      "Solar": 0.0661,
+      "Wind": 0.1116
     },
     "2020": {
-      "Bioenergy": 0.0185,
-      "Hydro": 0.8065,
-      "Solar": 0.0632,
-      "Wind": 0.1118
+      "Bioenergy": 0.017,
+      "Hydro": 0.8053,
+      "Solar": 0.0661,
+      "Wind": 0.1116
     },
     "2021": {
-      "Bioenergy": 0.0185,
-      "Hydro": 0.8065,
-      "Solar": 0.0632,
-      "Wind": 0.1118
+      "Bioenergy": 0.017,
+      "Hydro": 0.8053,
+      "Solar": 0.0661,
+      "Wind": 0.1116
     },
     "2022": {
-      "Bioenergy": 0.0185,
-      "Hydro": 0.8065,
-      "Solar": 0.0632,
-      "Wind": 0.1118
+      "Bioenergy": 0.017,
+      "Hydro": 0.8053,
+      "Solar": 0.0661,
+      "Wind": 0.1116
     },
     "2023": {
-      "Bioenergy": 0.0185,
-      "Hydro": 0.8065,
-      "Solar": 0.0632,
-      "Wind": 0.1118
+      "Bioenergy": 0.017,
+      "Hydro": 0.8053,
+      "Solar": 0.0661,
+      "Wind": 0.1116
     },
     "2024": {
-      "Bioenergy": 0.0185,
-      "Hydro": 0.8065,
-      "Solar": 0.0632,
-      "Wind": 0.1118
+      "Bioenergy": 0.017,
+      "Hydro": 0.8053,
+      "Solar": 0.0661,
+      "Wind": 0.1116
     },
     "2025": {
-      "Bioenergy": 0.0185,
-      "Hydro": 0.8065,
-      "Solar": 0.0632,
-      "Wind": 0.1118
+      "Bioenergy": 0.017,
+      "Hydro": 0.8053,
+      "Solar": 0.0661,
+      "Wind": 0.1116
     },
     "2026": {
-      "Bioenergy": 0.0185,
-      "Hydro": 0.8065,
-      "Solar": 0.0632,
-      "Wind": 0.1118
+      "Bioenergy": 0.017,
+      "Hydro": 0.8053,
+      "Solar": 0.0661,
+      "Wind": 0.1116
     }
   },
   "DK": {
@@ -2437,16 +2437,16 @@
       "Wind": 0.7017
     },
     "2025": {
-      "Bioenergy": 0.126,
+      "Bioenergy": 0.1259,
       "Hydro": 0.0408,
       "Solar": 0.1674,
       "Wind": 0.6659
     },
     "2026": {
-      "Bioenergy": 0.1642,
-      "Hydro": 0.0138,
-      "Solar": 0.0182,
-      "Wind": 0.8038
+      "Bioenergy": 0.1846,
+      "Hydro": 0.0231,
+      "Solar": 0.0346,
+      "Wind": 0.7577
     }
   },
   "DM": {
@@ -2626,15 +2626,15 @@
     },
     "2023": {
       "Bioenergy": 0.0149,
-      "Hydro": 0.9705,
+      "Hydro": 0.9706,
       "Solar": 0.0028,
-      "Wind": 0.0118
+      "Wind": 0.0117
     },
     "2024": {
       "Bioenergy": 0.022,
-      "Hydro": 0.9594,
+      "Hydro": 0.9595,
       "Solar": 0.004,
-      "Wind": 0.0146
+      "Wind": 0.0145
     },
     "2025": {
       "Bioenergy": 0.0148,
@@ -2643,10 +2643,10 @@
       "Wind": 0.0082
     },
     "2026": {
-      "Bioenergy": 0.0264,
-      "Hydro": 0.9516,
-      "Solar": 0.0087,
-      "Wind": 0.0133
+      "Bioenergy": 0.0261,
+      "Hydro": 0.9524,
+      "Solar": 0.0086,
+      "Wind": 0.013
     }
   },
   "EE": {
@@ -2676,9 +2676,9 @@
     },
     "2023": {
       "Bioenergy": 0.1794,
-      "Hydro": 0.1691,
+      "Hydro": 0.169,
       "Solar": 0.2792,
-      "Wind": 0.3723
+      "Wind": 0.3724
     },
     "2024": {
       "Bioenergy": 0.1394,
@@ -2688,15 +2688,15 @@
     },
     "2025": {
       "Bioenergy": 0.1297,
-      "Hydro": 0.1279,
+      "Hydro": 0.1278,
       "Solar": 0.3208,
-      "Wind": 0.4216
+      "Wind": 0.4217
     },
     "2026": {
-      "Bioenergy": 0.2151,
-      "Hydro": 0.2081,
-      "Solar": 0.0695,
-      "Wind": 0.5073
+      "Bioenergy": 0.2005,
+      "Hydro": 0.1873,
+      "Solar": 0.0915,
+      "Wind": 0.5207
     }
   },
   "EG": {
@@ -2843,10 +2843,10 @@
       "Wind": 0.375
     },
     "2026": {
-      "Bioenergy": 0.0235,
-      "Hydro": 0.2153,
-      "Solar": 0.1683,
-      "Wind": 0.593
+      "Bioenergy": 0.02,
+      "Hydro": 0.2694,
+      "Solar": 0.1836,
+      "Wind": 0.527
     }
   },
   "ET": {
@@ -2937,16 +2937,16 @@
       "Wind": 0.4323
     },
     "2025": {
-      "Bioenergy": 0.2089,
-      "Hydro": 0.2828,
-      "Solar": 0.0337,
-      "Wind": 0.4747
+      "Bioenergy": 0.2056,
+      "Hydro": 0.2868,
+      "Solar": 0.0336,
+      "Wind": 0.474
     },
     "2026": {
-      "Bioenergy": 0.2555,
-      "Hydro": 0.3041,
-      "Solar": 0.0105,
-      "Wind": 0.4299
+      "Bioenergy": 0.2393,
+      "Hydro": 0.328,
+      "Solar": 0.016,
+      "Wind": 0.4167
     }
   },
   "FJ": {
@@ -3143,59 +3143,59 @@
       "Wind": 0.3653
     },
     "2026": {
-      "Bioenergy": 0.0196,
-      "Hydro": 0.4222,
-      "Solar": 0.0891,
-      "Wind": 0.4691
+      "Bioenergy": 0.0202,
+      "Hydro": 0.4121,
+      "Solar": 0.0994,
+      "Wind": 0.4683
     }
   },
   "GA": {
     "2019": {
-      "Bioenergy": 0.0083,
-      "Hydro": 0.9787,
-      "Solar": 0.0047,
+      "Bioenergy": 0.0082,
+      "Hydro": 0.9786,
+      "Solar": 0.0049,
       "Wind": 0.0083
     },
     "2020": {
-      "Bioenergy": 0.0083,
-      "Hydro": 0.9787,
-      "Solar": 0.0047,
+      "Bioenergy": 0.0082,
+      "Hydro": 0.9786,
+      "Solar": 0.0049,
       "Wind": 0.0083
     },
     "2021": {
-      "Bioenergy": 0.0083,
-      "Hydro": 0.9787,
-      "Solar": 0.0047,
+      "Bioenergy": 0.0082,
+      "Hydro": 0.9786,
+      "Solar": 0.0049,
       "Wind": 0.0083
     },
     "2022": {
-      "Bioenergy": 0.0083,
-      "Hydro": 0.9787,
-      "Solar": 0.0047,
+      "Bioenergy": 0.0082,
+      "Hydro": 0.9786,
+      "Solar": 0.0049,
       "Wind": 0.0083
     },
     "2023": {
-      "Bioenergy": 0.0083,
-      "Hydro": 0.9787,
-      "Solar": 0.0047,
+      "Bioenergy": 0.0082,
+      "Hydro": 0.9786,
+      "Solar": 0.0049,
       "Wind": 0.0083
     },
     "2024": {
-      "Bioenergy": 0.0083,
-      "Hydro": 0.9787,
-      "Solar": 0.0047,
+      "Bioenergy": 0.0082,
+      "Hydro": 0.9786,
+      "Solar": 0.0049,
       "Wind": 0.0083
     },
     "2025": {
-      "Bioenergy": 0.0083,
-      "Hydro": 0.9787,
-      "Solar": 0.0047,
+      "Bioenergy": 0.0082,
+      "Hydro": 0.9786,
+      "Solar": 0.0049,
       "Wind": 0.0083
     },
     "2026": {
-      "Bioenergy": 0.0083,
-      "Hydro": 0.9787,
-      "Solar": 0.0047,
+      "Bioenergy": 0.0082,
+      "Hydro": 0.9786,
+      "Solar": 0.0049,
       "Wind": 0.0083
     }
   },
@@ -3240,13 +3240,13 @@
       "Bioenergy": 0.151,
       "Hydro": 0.0594,
       "Solar": 0.1549,
-      "Wind": 0.6347
+      "Wind": 0.6348
     },
     "2026": {
-      "Bioenergy": 0.1439,
-      "Hydro": 0.046,
-      "Solar": 0.0378,
-      "Wind": 0.7723
+      "Bioenergy": 0.1438,
+      "Hydro": 0.0421,
+      "Solar": 0.0449,
+      "Wind": 0.7691
     }
   },
   "GD": {
@@ -3302,100 +3302,100 @@
   "GE": {
     "2019": {
       "Bioenergy": 0.0028,
-      "Hydro": 0.9721,
+      "Hydro": 0.9722,
       "Solar": 0.0051,
-      "Wind": 0.02
+      "Wind": 0.0199
     },
     "2020": {
       "Bioenergy": 0.003,
-      "Hydro": 0.9701,
-      "Solar": 0.0054,
+      "Hydro": 0.9703,
+      "Solar": 0.0053,
       "Wind": 0.0214
     },
     "2021": {
       "Bioenergy": 0.0039,
-      "Hydro": 0.9656,
-      "Solar": 0.0076,
-      "Wind": 0.0229
+      "Hydro": 0.9658,
+      "Solar": 0.0075,
+      "Wind": 0.0228
     },
     "2022": {
       "Bioenergy": 0.0033,
-      "Hydro": 0.9695,
-      "Solar": 0.0068,
-      "Wind": 0.0204
+      "Hydro": 0.9697,
+      "Solar": 0.0066,
+      "Wind": 0.0203
     },
     "2023": {
       "Bioenergy": 0.0019,
-      "Hydro": 0.9763,
-      "Solar": 0.0045,
-      "Wind": 0.0174
+      "Hydro": 0.9764,
+      "Solar": 0.0044,
+      "Wind": 0.0173
     },
     "2024": {
       "Bioenergy": 0.0021,
-      "Hydro": 0.9729,
-      "Solar": 0.0069,
+      "Hydro": 0.973,
+      "Solar": 0.0068,
       "Wind": 0.0181
     },
     "2025": {
       "Bioenergy": 0.003,
-      "Hydro": 0.9631,
-      "Solar": 0.0123,
-      "Wind": 0.0216
+      "Hydro": 0.9632,
+      "Solar": 0.0122,
+      "Wind": 0.0215
     },
     "2026": {
-      "Bioenergy": 0.0186,
-      "Hydro": 0.8203,
-      "Solar": 0.0717,
-      "Wind": 0.0894
+      "Bioenergy": 0.0185,
+      "Hydro": 0.8102,
+      "Solar": 0.0829,
+      "Wind": 0.0883
     }
   },
   "GF": {
     "2019": {
       "Bioenergy": 0.0212,
-      "Hydro": 0.8723,
-      "Solar": 0.1064,
+      "Hydro": 0.8724,
+      "Solar": 0.1063,
       "Wind": 0
     },
     "2020": {
       "Bioenergy": 0.0212,
-      "Hydro": 0.8723,
-      "Solar": 0.1064,
+      "Hydro": 0.8724,
+      "Solar": 0.1063,
       "Wind": 0
     },
     "2021": {
       "Bioenergy": 0.0212,
-      "Hydro": 0.8723,
-      "Solar": 0.1064,
+      "Hydro": 0.8724,
+      "Solar": 0.1063,
       "Wind": 0
     },
     "2022": {
       "Bioenergy": 0.0212,
-      "Hydro": 0.8723,
-      "Solar": 0.1064,
+      "Hydro": 0.8724,
+      "Solar": 0.1063,
       "Wind": 0
     },
     "2023": {
       "Bioenergy": 0.0212,
-      "Hydro": 0.8723,
-      "Solar": 0.1064,
+      "Hydro": 0.8724,
+      "Solar": 0.1063,
       "Wind": 0
     },
     "2024": {
       "Bioenergy": 0.0212,
-      "Hydro": 0.8723,
-      "Solar": 0.1064,
+      "Hydro": 0.8724,
+      "Solar": 0.1063,
       "Wind": 0
     },
     "2025": {
       "Bioenergy": 0.0212,
-      "Hydro": 0.8723,
-      "Solar": 0.1064,
+      "Hydro": 0.8724,
+      "Solar": 0.1063,
       "Wind": 0
     },
     "2026": {
       "Bioenergy": 0.0212,
-      "Hydro": 0.8723,
-      "Solar": 0.1064,
+      "Hydro": 0.8724,
+      "Solar": 0.1063,
       "Wind": 0
     }
   },
@@ -3784,7 +3784,7 @@
       "Bioenergy": 0.0014,
       "Hydro": 0.1143,
       "Solar": 0.4489,
-      "Wind": 0.4354
+      "Wind": 0.4355
     },
     "2025": {
       "Bioenergy": 0.0007,
@@ -3794,9 +3794,9 @@
     },
     "2026": {
       "Bioenergy": 0,
-      "Hydro": 0.2303,
-      "Solar": 0.2087,
-      "Wind": 0.561
+      "Hydro": 0.2795,
+      "Solar": 0.2347,
+      "Wind": 0.4858
     }
   },
   "GT": {
@@ -3951,152 +3951,152 @@
   },
   "GY": {
     "2019": {
-      "Bioenergy": 0.3346,
+      "Bioenergy": 0.5,
       "Hydro": 0,
-      "Solar": 0.6654,
+      "Solar": 0.5,
       "Wind": 0
     },
     "2020": {
-      "Bioenergy": 0.3346,
+      "Bioenergy": 0.5,
       "Hydro": 0,
-      "Solar": 0.6654,
+      "Solar": 0.5,
       "Wind": 0
     },
     "2021": {
-      "Bioenergy": 0.3346,
+      "Bioenergy": 0.5,
       "Hydro": 0,
-      "Solar": 0.6654,
+      "Solar": 0.5,
       "Wind": 0
     },
     "2022": {
-      "Bioenergy": 0.3346,
+      "Bioenergy": 0.5,
       "Hydro": 0,
-      "Solar": 0.6654,
+      "Solar": 0.5,
       "Wind": 0
     },
     "2023": {
-      "Bioenergy": 0.3346,
+      "Bioenergy": 0.5,
       "Hydro": 0,
-      "Solar": 0.6654,
+      "Solar": 0.5,
       "Wind": 0
     },
     "2024": {
-      "Bioenergy": 0.3346,
+      "Bioenergy": 0.5,
       "Hydro": 0,
-      "Solar": 0.6654,
+      "Solar": 0.5,
       "Wind": 0
     },
     "2025": {
-      "Bioenergy": 0.3346,
+      "Bioenergy": 0.5,
       "Hydro": 0,
-      "Solar": 0.6654,
+      "Solar": 0.5,
       "Wind": 0
     },
     "2026": {
-      "Bioenergy": 0.3346,
+      "Bioenergy": 0.5,
       "Hydro": 0,
-      "Solar": 0.6654,
+      "Solar": 0.5,
       "Wind": 0
     }
   },
   "HK": {
     "2019": {
-      "Bioenergy": 0.1123,
-      "Hydro": 0.5801,
-      "Solar": 0.1354,
-      "Wind": 0.1723
+      "Bioenergy": 0.1127,
+      "Hydro": 0.5827,
+      "Solar": 0.1331,
+      "Wind": 0.1715
     },
     "2020": {
-      "Bioenergy": 0.1126,
-      "Hydro": 0.5577,
-      "Solar": 0.1505,
-      "Wind": 0.1792
+      "Bioenergy": 0.1133,
+      "Hydro": 0.5609,
+      "Solar": 0.1476,
+      "Wind": 0.1782
     },
     "2021": {
-      "Bioenergy": 0.1167,
-      "Hydro": 0.4986,
-      "Solar": 0.1678,
-      "Wind": 0.2169
+      "Bioenergy": 0.1173,
+      "Hydro": 0.5015,
+      "Solar": 0.1649,
+      "Wind": 0.2163
     },
     "2022": {
-      "Bioenergy": 0.1156,
-      "Hydro": 0.4668,
-      "Solar": 0.1911,
-      "Wind": 0.2264
+      "Bioenergy": 0.1164,
+      "Hydro": 0.4695,
+      "Solar": 0.1879,
+      "Wind": 0.2261
     },
     "2023": {
-      "Bioenergy": 0.1168,
-      "Hydro": 0.4107,
-      "Solar": 0.2254,
-      "Wind": 0.2471
+      "Bioenergy": 0.1176,
+      "Hydro": 0.4128,
+      "Solar": 0.2226,
+      "Wind": 0.247
     },
     "2024": {
-      "Bioenergy": 0.1052,
-      "Hydro": 0.3935,
-      "Solar": 0.2609,
+      "Bioenergy": 0.1058,
+      "Hydro": 0.3958,
+      "Solar": 0.2581,
       "Wind": 0.2403
     },
     "2025": {
-      "Bioenergy": 0.0949,
-      "Hydro": 0.3581,
-      "Solar": 0.3061,
-      "Wind": 0.2409
+      "Bioenergy": 0.0955,
+      "Hydro": 0.36,
+      "Solar": 0.3032,
+      "Wind": 0.2413
     },
     "2026": {
-      "Bioenergy": 0.11,
-      "Hydro": 0.3045,
-      "Solar": 0.2878,
-      "Wind": 0.2978
+      "Bioenergy": 0.1081,
+      "Hydro": 0.274,
+      "Solar": 0.328,
+      "Wind": 0.2898
     }
   },
   "HN": {
     "2019": {
-      "Bioenergy": 0.2461,
-      "Hydro": 0.426,
-      "Solar": 0.1882,
-      "Wind": 0.1396
+      "Bioenergy": 0.1788,
+      "Hydro": 0.4641,
+      "Solar": 0.2051,
+      "Wind": 0.1521
     },
     "2020": {
-      "Bioenergy": 0.246,
-      "Hydro": 0.4258,
-      "Solar": 0.1883,
-      "Wind": 0.1398
+      "Bioenergy": 0.1787,
+      "Hydro": 0.4638,
+      "Solar": 0.2052,
+      "Wind": 0.1522
     },
     "2021": {
-      "Bioenergy": 0.2461,
-      "Hydro": 0.4249,
-      "Solar": 0.1887,
-      "Wind": 0.1403
+      "Bioenergy": 0.1787,
+      "Hydro": 0.4627,
+      "Solar": 0.2057,
+      "Wind": 0.1529
     },
     "2022": {
-      "Bioenergy": 0.2454,
-      "Hydro": 0.4256,
-      "Solar": 0.1887,
-      "Wind": 0.1402
+      "Bioenergy": 0.1782,
+      "Hydro": 0.4635,
+      "Solar": 0.2056,
+      "Wind": 0.1527
     },
     "2023": {
-      "Bioenergy": 0.2454,
-      "Hydro": 0.4247,
-      "Solar": 0.1893,
-      "Wind": 0.1405
+      "Bioenergy": 0.1782,
+      "Hydro": 0.4626,
+      "Solar": 0.2062,
+      "Wind": 0.153
     },
     "2024": {
-      "Bioenergy": 0.2454,
-      "Hydro": 0.4239,
-      "Solar": 0.1899,
-      "Wind": 0.1408
+      "Bioenergy": 0.1782,
+      "Hydro": 0.4616,
+      "Solar": 0.2069,
+      "Wind": 0.1533
     },
     "2025": {
-      "Bioenergy": 0.2452,
-      "Hydro": 0.4233,
-      "Solar": 0.1904,
-      "Wind": 0.1411
+      "Bioenergy": 0.178,
+      "Hydro": 0.461,
+      "Solar": 0.2074,
+      "Wind": 0.1536
     },
     "2026": {
-      "Bioenergy": 0.2451,
-      "Hydro": 0.423,
-      "Solar": 0.191,
-      "Wind": 0.1409
+      "Bioenergy": 0.1776,
+      "Hydro": 0.4615,
+      "Solar": 0.2078,
+      "Wind": 0.1531
     }
   },
   "HR": {
@@ -4126,27 +4126,27 @@
     },
     "2023": {
       "Bioenergy": 0.0596,
-      "Hydro": 0.6403,
+      "Hydro": 0.6402,
       "Solar": 0.0515,
-      "Wind": 0.2486
+      "Wind": 0.2487
     },
     "2024": {
       "Bioenergy": 0.0632,
-      "Hydro": 0.5501,
+      "Hydro": 0.55,
       "Solar": 0.112,
-      "Wind": 0.2747
+      "Wind": 0.2748
     },
     "2025": {
       "Bioenergy": 0.0634,
       "Hydro": 0.459,
-      "Solar": 0.1593,
-      "Wind": 0.3182
+      "Solar": 0.1594,
+      "Wind": 0.3183
     },
     "2026": {
-      "Bioenergy": 0.0611,
-      "Hydro": 0.6522,
-      "Solar": 0.0243,
-      "Wind": 0.2624
+      "Bioenergy": 0.0545,
+      "Hydro": 0.6731,
+      "Solar": 0.0311,
+      "Wind": 0.2413
     }
   },
   "HT": {
@@ -4225,35 +4225,35 @@
       "Wind": 0.184
     },
     "2023": {
-      "Bioenergy": 0.0845,
-      "Hydro": 0.168,
-      "Solar": 0.5817,
-      "Wind": 0.1658
+      "Bioenergy": 0.0846,
+      "Hydro": 0.1679,
+      "Solar": 0.5816,
+      "Wind": 0.1659
     },
     "2024": {
       "Bioenergy": 0.0804,
       "Hydro": 0.1388,
-      "Solar": 0.6443,
-      "Wind": 0.1365
+      "Solar": 0.6442,
+      "Wind": 0.1366
     },
     "2025": {
-      "Bioenergy": 0.1039,
-      "Hydro": 0.097,
-      "Solar": 0.6967,
-      "Wind": 0.1023
+      "Bioenergy": 0.1042,
+      "Hydro": 0.0973,
+      "Solar": 0.6958,
+      "Wind": 0.1027
     },
     "2026": {
-      "Bioenergy": 0.1496,
-      "Hydro": 0.2372,
-      "Solar": 0.3545,
-      "Wind": 0.2587
+      "Bioenergy": 0.143,
+      "Hydro": 0.2178,
+      "Solar": 0.3991,
+      "Wind": 0.2401
     }
   },
   "ID": {
     "2019": {
       "Bioenergy": 0.3557,
       "Hydro": 0.6236,
-      "Solar": 0.005,
+      "Solar": 0.0049,
       "Wind": 0.0158
     },
     "2020": {
@@ -4269,34 +4269,34 @@
       "Wind": 0.0165
     },
     "2022": {
-      "Bioenergy": 0.3552,
-      "Hydro": 0.6219,
-      "Solar": 0.006,
-      "Wind": 0.0169
+      "Bioenergy": 0.3553,
+      "Hydro": 0.622,
+      "Solar": 0.0059,
+      "Wind": 0.0168
     },
     "2023": {
       "Bioenergy": 0.3552,
-      "Hydro": 0.6211,
-      "Solar": 0.0065,
+      "Hydro": 0.6212,
+      "Solar": 0.0064,
       "Wind": 0.0172
     },
     "2024": {
       "Bioenergy": 0.3548,
-      "Hydro": 0.6206,
-      "Solar": 0.0073,
+      "Hydro": 0.6207,
+      "Solar": 0.0072,
       "Wind": 0.0173
     },
     "2025": {
       "Bioenergy": 0.3542,
-      "Hydro": 0.6197,
-      "Solar": 0.0084,
+      "Hydro": 0.6198,
+      "Solar": 0.0083,
       "Wind": 0.0177
     },
     "2026": {
-      "Bioenergy": 0.3548,
-      "Hydro": 0.6192,
-      "Solar": 0.0077,
-      "Wind": 0.0183
+      "Bioenergy": 0.3547,
+      "Hydro": 0.6187,
+      "Solar": 0.0084,
+      "Wind": 0.0182
     }
   },
   "IE": {
@@ -4337,66 +4337,66 @@
       "Wind": 0.7741
     },
     "2025": {
-      "Bioenergy": 0.0408,
+      "Bioenergy": 0.0407,
       "Hydro": 0.1071,
       "Solar": 0.1072,
-      "Wind": 0.7449
+      "Wind": 0.745
     },
     "2026": {
-      "Bioenergy": 0.0445,
-      "Hydro": 0.124,
-      "Solar": 0.0321,
-      "Wind": 0.7994
+      "Bioenergy": 0.0393,
+      "Hydro": 0.122,
+      "Solar": 0.0377,
+      "Wind": 0.801
     }
   },
   "IL": {
     "2019": {
-      "Bioenergy": 0.0371,
-      "Hydro": 0,
-      "Solar": 0.8985,
-      "Wind": 0.0644
+      "Bioenergy": 0.0048,
+      "Hydro": 0.7627,
+      "Solar": 0.1985,
+      "Wind": 0.0339
     },
     "2020": {
-      "Bioenergy": 0.0371,
-      "Hydro": 0,
-      "Solar": 0.8985,
-      "Wind": 0.0644
+      "Bioenergy": 0.0048,
+      "Hydro": 0.7627,
+      "Solar": 0.1985,
+      "Wind": 0.0339
     },
     "2021": {
-      "Bioenergy": 0.0371,
-      "Hydro": 0,
-      "Solar": 0.8985,
-      "Wind": 0.0644
+      "Bioenergy": 0.0048,
+      "Hydro": 0.7627,
+      "Solar": 0.1985,
+      "Wind": 0.0339
     },
     "2022": {
-      "Bioenergy": 0.0371,
-      "Hydro": 0,
-      "Solar": 0.8985,
-      "Wind": 0.0644
+      "Bioenergy": 0.0048,
+      "Hydro": 0.7627,
+      "Solar": 0.1985,
+      "Wind": 0.0339
     },
     "2023": {
-      "Bioenergy": 0.0371,
-      "Hydro": 0,
-      "Solar": 0.8985,
-      "Wind": 0.0644
+      "Bioenergy": 0.0048,
+      "Hydro": 0.7627,
+      "Solar": 0.1985,
+      "Wind": 0.0339
     },
     "2024": {
-      "Bioenergy": 0.0371,
-      "Hydro": 0,
-      "Solar": 0.8985,
-      "Wind": 0.0644
+      "Bioenergy": 0.0048,
+      "Hydro": 0.7627,
+      "Solar": 0.1985,
+      "Wind": 0.0339
     },
     "2025": {
-      "Bioenergy": 0.0371,
-      "Hydro": 0,
-      "Solar": 0.8985,
-      "Wind": 0.0644
+      "Bioenergy": 0.0048,
+      "Hydro": 0.7627,
+      "Solar": 0.1985,
+      "Wind": 0.0339
     },
     "2026": {
-      "Bioenergy": 0.0371,
-      "Hydro": 0,
-      "Solar": 0.8985,
-      "Wind": 0.0644
+      "Bioenergy": 0.0048,
+      "Hydro": 0.7627,
+      "Solar": 0.1985,
+      "Wind": 0.0339
     }
   },
   "IN": {
@@ -4408,7 +4408,7 @@
     },
     "2020": {
       "Bioenergy": 0.0478,
-      "Hydro": 0.5426,
+      "Hydro": 0.5427,
       "Solar": 0.209,
       "Wind": 0.2006
     },
@@ -4421,7 +4421,7 @@
     "2022": {
       "Bioenergy": 0.0445,
       "Hydro": 0.476,
-      "Solar": 0.2886,
+      "Solar": 0.2885,
       "Wind": 0.1909
     },
     "2023": {
@@ -4443,59 +4443,59 @@
       "Wind": 0.2074
     },
     "2026": {
-      "Bioenergy": 0.0661,
-      "Hydro": 0.2611,
-      "Solar": 0.535,
-      "Wind": 0.1378
+      "Bioenergy": 0.0624,
+      "Hydro": 0.2225,
+      "Solar": 0.5327,
+      "Wind": 0.1823
     }
   },
   "IQ": {
     "2019": {
       "Bioenergy": 0.0002,
-      "Hydro": 0.9776,
-      "Solar": 0.0204,
+      "Hydro": 0.977,
+      "Solar": 0.021,
       "Wind": 0.0017
     },
     "2020": {
       "Bioenergy": 0.0002,
-      "Hydro": 0.9776,
-      "Solar": 0.0204,
+      "Hydro": 0.977,
+      "Solar": 0.021,
       "Wind": 0.0017
     },
     "2021": {
       "Bioenergy": 0.0002,
-      "Hydro": 0.9776,
-      "Solar": 0.0204,
+      "Hydro": 0.977,
+      "Solar": 0.021,
       "Wind": 0.0017
     },
     "2022": {
       "Bioenergy": 0.0002,
-      "Hydro": 0.9776,
-      "Solar": 0.0204,
+      "Hydro": 0.977,
+      "Solar": 0.021,
       "Wind": 0.0017
     },
     "2023": {
       "Bioenergy": 0.0002,
-      "Hydro": 0.9776,
-      "Solar": 0.0204,
+      "Hydro": 0.977,
+      "Solar": 0.021,
       "Wind": 0.0017
     },
     "2024": {
       "Bioenergy": 0.0002,
-      "Hydro": 0.9776,
-      "Solar": 0.0204,
+      "Hydro": 0.977,
+      "Solar": 0.021,
       "Wind": 0.0017
     },
     "2025": {
       "Bioenergy": 0.0002,
-      "Hydro": 0.9776,
-      "Solar": 0.0204,
+      "Hydro": 0.977,
+      "Solar": 0.021,
       "Wind": 0.0017
     },
     "2026": {
       "Bioenergy": 0.0002,
-      "Hydro": 0.9776,
-      "Solar": 0.0204,
+      "Hydro": 0.977,
+      "Solar": 0.021,
       "Wind": 0.0017
     }
   },
@@ -4626,27 +4626,27 @@
     },
     "2023": {
       "Bioenergy": 0.1294,
-      "Hydro": 0.3722,
+      "Hydro": 0.3721,
       "Solar": 0.264,
       "Wind": 0.2344
     },
     "2024": {
       "Bioenergy": 0.1125,
       "Hydro": 0.4228,
-      "Solar": 0.2687,
+      "Solar": 0.2686,
       "Wind": 0.1961
     },
     "2025": {
-      "Bioenergy": 0.1059,
-      "Hydro": 0.3488,
-      "Solar": 0.3496,
-      "Wind": 0.1958
+      "Bioenergy": 0.1055,
+      "Hydro": 0.3508,
+      "Solar": 0.3485,
+      "Wind": 0.1952
     },
     "2026": {
-      "Bioenergy": 0.1336,
-      "Hydro": 0.2931,
-      "Solar": 0.1982,
-      "Wind": 0.3751
+      "Bioenergy": 0.1299,
+      "Hydro": 0.2781,
+      "Solar": 0.2368,
+      "Wind": 0.3552
     }
   },
   "JM": {
@@ -4751,52 +4751,52 @@
   },
   "JP": {
     "2019": {
-      "Bioenergy": 0.1269,
-      "Hydro": 0.4023,
-      "Solar": 0.4024,
-      "Wind": 0.0683
+      "Bioenergy": 0.1369,
+      "Hydro": 0.4341,
+      "Solar": 0.3828,
+      "Wind": 0.0462
     },
     "2020": {
-      "Bioenergy": 0.1399,
-      "Hydro": 0.3782,
-      "Solar": 0.4081,
-      "Wind": 0.0738
+      "Bioenergy": 0.1537,
+      "Hydro": 0.4153,
+      "Solar": 0.3841,
+      "Wind": 0.0469
     },
     "2021": {
-      "Bioenergy": 0.1675,
-      "Hydro": 0.3425,
-      "Solar": 0.4178,
-      "Wind": 0.0723
+      "Bioenergy": 0.1849,
+      "Hydro": 0.378,
+      "Solar": 0.3924,
+      "Wind": 0.0447
     },
     "2022": {
-      "Bioenergy": 0.1889,
-      "Hydro": 0.302,
-      "Solar": 0.4397,
-      "Wind": 0.0694
+      "Bioenergy": 0.2111,
+      "Hydro": 0.3373,
+      "Solar": 0.4082,
+      "Wind": 0.0435
     },
     "2023": {
-      "Bioenergy": 0.2092,
-      "Hydro": 0.2797,
-      "Solar": 0.4418,
-      "Wind": 0.0693
+      "Bioenergy": 0.2322,
+      "Hydro": 0.3106,
+      "Solar": 0.4121,
+      "Wind": 0.0451
     },
     "2024": {
-      "Bioenergy": 0.2141,
-      "Hydro": 0.2809,
-      "Solar": 0.4332,
-      "Wind": 0.0718
+      "Bioenergy": 0.2407,
+      "Hydro": 0.3157,
+      "Solar": 0.3953,
+      "Wind": 0.0483
     },
     "2025": {
-      "Bioenergy": 0.2277,
-      "Hydro": 0.2362,
-      "Solar": 0.4579,
-      "Wind": 0.0783
+      "Bioenergy": 0.2691,
+      "Hydro": 0.2806,
+      "Solar": 0.3984,
+      "Wind": 0.0519
     },
     "2026": {
-      "Bioenergy": 0.2569,
-      "Hydro": 0.181,
-      "Solar": 0.4497,
-      "Wind": 0.1123
+      "Bioenergy": 0.3159,
+      "Hydro": 0.2333,
+      "Solar": 0.3509,
+      "Wind": 0.0999
     }
   },
   "KE": {
@@ -4804,7 +4804,7 @@
       "Bioenergy": 0.0279,
       "Hydro": 0.6393,
       "Solar": 0.0243,
-      "Wind": 0.3085
+      "Wind": 0.3084
     },
     "2020": {
       "Bioenergy": 0.0189,
@@ -4821,31 +4821,31 @@
     "2022": {
       "Bioenergy": 0.0379,
       "Hydro": 0.5262,
-      "Solar": 0.0658,
+      "Solar": 0.0659,
       "Wind": 0.37
     },
     "2023": {
       "Bioenergy": 0.0348,
       "Hydro": 0.5088,
-      "Solar": 0.0903,
+      "Solar": 0.0904,
       "Wind": 0.366
     },
     "2024": {
-      "Bioenergy": 0.0427,
-      "Hydro": 0.5977,
-      "Solar": 0.0742,
+      "Bioenergy": 0.0426,
+      "Hydro": 0.5976,
+      "Solar": 0.0743,
       "Wind": 0.2855
     },
     "2025": {
-      "Bioenergy": 0.0576,
+      "Bioenergy": 0.0575,
       "Hydro": 0.568,
-      "Solar": 0.0719,
+      "Solar": 0.0721,
       "Wind": 0.3025
     },
     "2026": {
       "Bioenergy": 0.056,
-      "Hydro": 0.5863,
-      "Solar": 0.0764,
+      "Hydro": 0.5862,
+      "Solar": 0.0765,
       "Wind": 0.2813
     }
   },
@@ -4864,89 +4864,89 @@
     },
     "2021": {
       "Bioenergy": 0.0008,
-      "Hydro": 0.9949,
-      "Solar": 0.0018,
+      "Hydro": 0.995,
+      "Solar": 0.0017,
       "Wind": 0.0025
     },
     "2022": {
       "Bioenergy": 0.0021,
-      "Hydro": 0.9857,
-      "Solar": 0.0051,
+      "Hydro": 0.986,
+      "Solar": 0.005,
       "Wind": 0.007
     },
     "2023": {
       "Bioenergy": 0.002,
-      "Hydro": 0.9872,
+      "Hydro": 0.9874,
       "Solar": 0.0045,
-      "Wind": 0.0063
+      "Wind": 0.0062
     },
     "2024": {
       "Bioenergy": 0.0023,
-      "Hydro": 0.9816,
-      "Solar": 0.008,
-      "Wind": 0.0081
+      "Hydro": 0.9817,
+      "Solar": 0.0079,
+      "Wind": 0.008
     },
     "2025": {
       "Bioenergy": 0.0018,
-      "Hydro": 0.9822,
-      "Solar": 0.0089,
+      "Hydro": 0.9823,
+      "Solar": 0.0088,
       "Wind": 0.0071
     },
     "2026": {
       "Bioenergy": 0.002,
-      "Hydro": 0.9821,
-      "Solar": 0.0077,
-      "Wind": 0.0081
+      "Hydro": 0.981,
+      "Solar": 0.009,
+      "Wind": 0.008
     }
   },
   "KH": {
     "2019": {
-      "Bioenergy": 0.0287,
-      "Hydro": 0.9052,
-      "Solar": 0.0417,
-      "Wind": 0.0244
+      "Bioenergy": 0.0281,
+      "Hydro": 0.9092,
+      "Solar": 0.0372,
+      "Wind": 0.0255
     },
     "2020": {
-      "Bioenergy": 0.0294,
-      "Hydro": 0.8991,
-      "Solar": 0.0447,
-      "Wind": 0.0267
+      "Bioenergy": 0.0289,
+      "Hydro": 0.9028,
+      "Solar": 0.0404,
+      "Wind": 0.0279
     },
     "2021": {
-      "Bioenergy": 0.0305,
-      "Hydro": 0.8883,
-      "Solar": 0.0479,
-      "Wind": 0.0333
+      "Bioenergy": 0.03,
+      "Hydro": 0.8915,
+      "Solar": 0.0437,
+      "Wind": 0.0347
     },
     "2022": {
-      "Bioenergy": 0.0312,
-      "Hydro": 0.8792,
-      "Solar": 0.0529,
-      "Wind": 0.0367
+      "Bioenergy": 0.0308,
+      "Hydro": 0.882,
+      "Solar": 0.0489,
+      "Wind": 0.0383
     },
     "2023": {
-      "Bioenergy": 0.0316,
-      "Hydro": 0.869,
-      "Solar": 0.0589,
-      "Wind": 0.0405
+      "Bioenergy": 0.0312,
+      "Hydro": 0.8712,
+      "Solar": 0.0552,
+      "Wind": 0.0424
     },
     "2024": {
-      "Bioenergy": 0.0307,
-      "Hydro": 0.8601,
-      "Solar": 0.0672,
-      "Wind": 0.042
+      "Bioenergy": 0.0302,
+      "Hydro": 0.8618,
+      "Solar": 0.064,
+      "Wind": 0.044
     },
     "2025": {
-      "Bioenergy": 0.03,
-      "Hydro": 0.8451,
-      "Solar": 0.0792,
-      "Wind": 0.0457
+      "Bioenergy": 0.0296,
+      "Hydro": 0.8461,
+      "Solar": 0.0765,
+      "Wind": 0.0478
     },
     "2026": {
-      "Bioenergy": 0.0317,
-      "Hydro": 0.843,
-      "Solar": 0.0725,
-      "Wind": 0.0528
+      "Bioenergy": 0.0312,
+      "Hydro": 0.8357,
+      "Solar": 0.0785,
+      "Wind": 0.0547
     }
   },
   "KI": {
@@ -5601,51 +5601,51 @@
   },
   "LS": {
     "2019": {
-      "Bioenergy": 0.004,
-      "Hydro": 0.9581,
-      "Solar": 0.0137,
+      "Bioenergy": 0.0037,
+      "Hydro": 0.9578,
+      "Solar": 0.0143,
       "Wind": 0.0242
     },
     "2020": {
-      "Bioenergy": 0.004,
-      "Hydro": 0.9581,
-      "Solar": 0.0137,
+      "Bioenergy": 0.0037,
+      "Hydro": 0.9578,
+      "Solar": 0.0143,
       "Wind": 0.0242
     },
     "2021": {
-      "Bioenergy": 0.004,
-      "Hydro": 0.9581,
-      "Solar": 0.0137,
+      "Bioenergy": 0.0037,
+      "Hydro": 0.9578,
+      "Solar": 0.0143,
       "Wind": 0.0242
     },
     "2022": {
-      "Bioenergy": 0.004,
-      "Hydro": 0.9581,
-      "Solar": 0.0137,
+      "Bioenergy": 0.0037,
+      "Hydro": 0.9578,
+      "Solar": 0.0143,
       "Wind": 0.0242
     },
     "2023": {
-      "Bioenergy": 0.004,
-      "Hydro": 0.9581,
-      "Solar": 0.0137,
+      "Bioenergy": 0.0037,
+      "Hydro": 0.9578,
+      "Solar": 0.0143,
       "Wind": 0.0242
     },
     "2024": {
-      "Bioenergy": 0.004,
-      "Hydro": 0.9581,
-      "Solar": 0.0137,
+      "Bioenergy": 0.0037,
+      "Hydro": 0.9578,
+      "Solar": 0.0143,
       "Wind": 0.0242
     },
     "2025": {
-      "Bioenergy": 0.004,
-      "Hydro": 0.9581,
-      "Solar": 0.0137,
+      "Bioenergy": 0.0037,
+      "Hydro": 0.9578,
+      "Solar": 0.0143,
       "Wind": 0.0242
     },
     "2026": {
-      "Bioenergy": 0.004,
-      "Hydro": 0.9581,
-      "Solar": 0.0137,
+      "Bioenergy": 0.0037,
+      "Hydro": 0.9578,
+      "Solar": 0.0143,
       "Wind": 0.0242
     }
   },
@@ -5676,27 +5676,27 @@
     },
     "2023": {
       "Bioenergy": 0.0721,
-      "Hydro": 0.2525,
+      "Hydro": 0.2524,
       "Solar": 0.1683,
-      "Wind": 0.507
+      "Wind": 0.5071
     },
     "2024": {
       "Bioenergy": 0.0513,
       "Hydro": 0.1846,
       "Solar": 0.236,
-      "Wind": 0.528
+      "Wind": 0.5281
     },
     "2025": {
       "Bioenergy": 0.0332,
       "Hydro": 0.1192,
-      "Solar": 0.2615,
-      "Wind": 0.586
+      "Solar": 0.2616,
+      "Wind": 0.5861
     },
     "2026": {
-      "Bioenergy": 0.0441,
-      "Hydro": 0.1325,
-      "Solar": 0.0454,
-      "Wind": 0.778
+      "Bioenergy": 0.0395,
+      "Hydro": 0.1373,
+      "Solar": 0.0739,
+      "Wind": 0.7493
     }
   },
   "LU": {
@@ -5726,27 +5726,27 @@
     },
     "2023": {
       "Bioenergy": 0.1102,
-      "Hydro": 0.2889,
-      "Solar": 0.2007,
-      "Wind": 0.4002
+      "Hydro": 0.2888,
+      "Solar": 0.2006,
+      "Wind": 0.4004
     },
     "2024": {
       "Bioenergy": 0.1377,
       "Hydro": 0.2933,
-      "Solar": 0.2198,
-      "Wind": 0.3491
+      "Solar": 0.2197,
+      "Wind": 0.3492
     },
     "2025": {
-      "Bioenergy": 0.1296,
-      "Hydro": 0.2422,
-      "Solar": 0.2798,
-      "Wind": 0.3484
+      "Bioenergy": 0.1295,
+      "Hydro": 0.242,
+      "Solar": 0.2799,
+      "Wind": 0.3486
     },
     "2026": {
-      "Bioenergy": 0.0981,
-      "Hydro": 0.3263,
-      "Solar": 0.0534,
-      "Wind": 0.5222
+      "Bioenergy": 0.1146,
+      "Hydro": 0.2957,
+      "Solar": 0.0851,
+      "Wind": 0.5046
     }
   },
   "LV": {
@@ -5776,77 +5776,77 @@
     },
     "2023": {
       "Bioenergy": 0.0582,
-      "Hydro": 0.7753,
+      "Hydro": 0.7752,
       "Solar": 0.0657,
-      "Wind": 0.1008
+      "Wind": 0.1009
     },
     "2024": {
       "Bioenergy": 0.0896,
       "Hydro": 0.679,
       "Solar": 0.1239,
-      "Wind": 0.1074
+      "Wind": 0.1075
     },
     "2025": {
-      "Bioenergy": 0.0824,
-      "Hydro": 0.6651,
+      "Bioenergy": 0.0823,
+      "Hydro": 0.665,
       "Solar": 0.1733,
-      "Wind": 0.0793
+      "Wind": 0.0794
     },
     "2026": {
-      "Bioenergy": 0.0954,
-      "Hydro": 0.7618,
-      "Solar": 0.0475,
-      "Wind": 0.0954
+      "Bioenergy": 0.0998,
+      "Hydro": 0.697,
+      "Solar": 0.1002,
+      "Wind": 0.1029
     }
   },
   "LY": {
     "2019": {
-      "Bioenergy": 0.0174,
-      "Hydro": 0.756,
-      "Solar": 0.1218,
-      "Wind": 0.1048
+      "Bioenergy": 0.016,
+      "Hydro": 0.755,
+      "Solar": 0.1244,
+      "Wind": 0.1046
     },
     "2020": {
-      "Bioenergy": 0.0174,
-      "Hydro": 0.756,
-      "Solar": 0.1218,
-      "Wind": 0.1048
+      "Bioenergy": 0.016,
+      "Hydro": 0.755,
+      "Solar": 0.1244,
+      "Wind": 0.1046
     },
     "2021": {
-      "Bioenergy": 0.0174,
-      "Hydro": 0.756,
-      "Solar": 0.1218,
-      "Wind": 0.1048
+      "Bioenergy": 0.016,
+      "Hydro": 0.755,
+      "Solar": 0.1244,
+      "Wind": 0.1046
     },
     "2022": {
-      "Bioenergy": 0.0174,
-      "Hydro": 0.756,
-      "Solar": 0.1218,
-      "Wind": 0.1048
+      "Bioenergy": 0.016,
+      "Hydro": 0.755,
+      "Solar": 0.1244,
+      "Wind": 0.1046
     },
     "2023": {
-      "Bioenergy": 0.0174,
-      "Hydro": 0.756,
-      "Solar": 0.1218,
-      "Wind": 0.1048
+      "Bioenergy": 0.016,
+      "Hydro": 0.755,
+      "Solar": 0.1244,
+      "Wind": 0.1046
     },
     "2024": {
-      "Bioenergy": 0.0174,
-      "Hydro": 0.756,
-      "Solar": 0.1218,
-      "Wind": 0.1048
+      "Bioenergy": 0.016,
+      "Hydro": 0.755,
+      "Solar": 0.1244,
+      "Wind": 0.1046
     },
     "2025": {
-      "Bioenergy": 0.0174,
-      "Hydro": 0.756,
-      "Solar": 0.1218,
-      "Wind": 0.1048
+      "Bioenergy": 0.016,
+      "Hydro": 0.755,
+      "Solar": 0.1244,
+      "Wind": 0.1046
     },
     "2026": {
-      "Bioenergy": 0.0174,
-      "Hydro": 0.756,
-      "Solar": 0.1218,
-      "Wind": 0.1048
+      "Bioenergy": 0.016,
+      "Hydro": 0.755,
+      "Solar": 0.1244,
+      "Wind": 0.1046
     }
   },
   "MA": {
@@ -5857,10 +5857,10 @@
       "Wind": 0.5848
     },
     "2020": {
-      "Bioenergy": 0.0002,
+      "Bioenergy": 0.0001,
       "Hydro": 0.1829,
-      "Solar": 0.2051,
-      "Wind": 0.6118
+      "Solar": 0.2052,
+      "Wind": 0.6117
     },
     "2021": {
       "Bioenergy": 0.0001,
@@ -5871,31 +5871,31 @@
     "2022": {
       "Bioenergy": 0.0007,
       "Hydro": 0.1198,
-      "Solar": 0.193,
-      "Wind": 0.6865
+      "Solar": 0.1932,
+      "Wind": 0.6864
     },
     "2023": {
       "Bioenergy": 0.0007,
       "Hydro": 0.0868,
-      "Solar": 0.2289,
+      "Solar": 0.229,
       "Wind": 0.6836
     },
     "2024": {
-      "Bioenergy": 0.0008,
+      "Bioenergy": 0.0007,
       "Hydro": 0.0908,
-      "Solar": 0.1379,
-      "Wind": 0.7705
+      "Solar": 0.138,
+      "Wind": 0.7704
     },
     "2025": {
-      "Bioenergy": 0.0011,
+      "Bioenergy": 0.001,
       "Hydro": 0.1106,
-      "Solar": 0.1478,
+      "Solar": 0.148,
       "Wind": 0.7405
     },
     "2026": {
-      "Bioenergy": 0.0012,
+      "Bioenergy": 0.0011,
       "Hydro": 0.1055,
-      "Solar": 0.1601,
+      "Solar": 0.1603,
       "Wind": 0.7332
     }
   },
@@ -5926,13 +5926,13 @@
     },
     "2023": {
       "Bioenergy": 0.0113,
-      "Hydro": 0.8463,
+      "Hydro": 0.8462,
       "Solar": 0.0159,
       "Wind": 0.1266
     },
     "2024": {
       "Bioenergy": 0.0122,
-      "Hydro": 0.642,
+      "Hydro": 0.6419,
       "Solar": 0.1682,
       "Wind": 0.1776
     },
@@ -5940,13 +5940,13 @@
       "Bioenergy": 0.0082,
       "Hydro": 0.6342,
       "Solar": 0.3205,
-      "Wind": 0.0371
+      "Wind": 0.0372
     },
     "2026": {
       "Bioenergy": 0.0082,
-      "Hydro": 0.6399,
-      "Solar": 0.306,
-      "Wind": 0.046
+      "Hydro": 0.6385,
+      "Solar": 0.3079,
+      "Wind": 0.0454
     }
   },
   "ME": {
@@ -5982,21 +5982,21 @@
     },
     "2024": {
       "Bioenergy": 0.0069,
-      "Hydro": 0.7723,
-      "Solar": 0.0571,
-      "Wind": 0.1638
+      "Hydro": 0.7722,
+      "Solar": 0.057,
+      "Wind": 0.1639
     },
     "2025": {
-      "Bioenergy": 0.0225,
-      "Hydro": 0.6162,
+      "Bioenergy": 0.0224,
+      "Hydro": 0.6161,
       "Solar": 0.1477,
-      "Wind": 0.2136
+      "Wind": 0.2138
     },
     "2026": {
       "Bioenergy": 0,
-      "Hydro": 0.8649,
-      "Solar": 0.027,
-      "Wind": 0.1081
+      "Hydro": 0.8726,
+      "Solar": 0.028,
+      "Wind": 0.0993
     }
   },
   "MG": {
@@ -6087,16 +6087,16 @@
       "Wind": 0.1214
     },
     "2025": {
-      "Bioenergy": 0.0271,
-      "Hydro": 0.6098,
-      "Solar": 0.1669,
-      "Wind": 0.1963
+      "Bioenergy": 0.0207,
+      "Hydro": 0.4675,
+      "Solar": 0.3611,
+      "Wind": 0.1506
     },
     "2026": {
-      "Bioenergy": 0.0241,
-      "Hydro": 0.6199,
-      "Solar": 0.123,
-      "Wind": 0.233
+      "Bioenergy": 0.0179,
+      "Hydro": 0.4608,
+      "Solar": 0.3497,
+      "Wind": 0.1715
     }
   },
   "ML": {
@@ -6151,51 +6151,51 @@
   },
   "MM": {
     "2019": {
-      "Bioenergy": 0,
-      "Hydro": 0.9971,
-      "Solar": 0.0029,
+      "Bioenergy": 0.024,
+      "Hydro": 0.9677,
+      "Solar": 0.0084,
       "Wind": 0
     },
     "2020": {
-      "Bioenergy": 0,
-      "Hydro": 0.9866,
-      "Solar": 0.0134,
+      "Bioenergy": 0.024,
+      "Hydro": 0.9677,
+      "Solar": 0.0084,
       "Wind": 0
     },
     "2021": {
-      "Bioenergy": 0,
-      "Hydro": 0.9876,
-      "Solar": 0.0124,
+      "Bioenergy": 0.024,
+      "Hydro": 0.9677,
+      "Solar": 0.0084,
       "Wind": 0
     },
     "2022": {
-      "Bioenergy": 0,
-      "Hydro": 0.9848,
-      "Solar": 0.0152,
+      "Bioenergy": 0.024,
+      "Hydro": 0.9677,
+      "Solar": 0.0084,
       "Wind": 0
     },
     "2023": {
-      "Bioenergy": 0,
-      "Hydro": 0.9583,
-      "Solar": 0.0417,
+      "Bioenergy": 0.024,
+      "Hydro": 0.9677,
+      "Solar": 0.0084,
       "Wind": 0
     },
     "2024": {
-      "Bioenergy": 0,
-      "Hydro": 0.9577,
-      "Solar": 0.0423,
+      "Bioenergy": 0.024,
+      "Hydro": 0.9677,
+      "Solar": 0.0084,
       "Wind": 0
     },
     "2025": {
-      "Bioenergy": 0,
-      "Hydro": 0.9577,
-      "Solar": 0.0423,
+      "Bioenergy": 0.024,
+      "Hydro": 0.9677,
+      "Solar": 0.0084,
       "Wind": 0
     },
     "2026": {
-      "Bioenergy": 0,
-      "Hydro": 0.9577,
-      "Solar": 0.0423,
+      "Bioenergy": 0.024,
+      "Hydro": 0.9677,
+      "Solar": 0.0084,
       "Wind": 0
     }
   },
@@ -6251,52 +6251,52 @@
   },
   "MO": {
     "2019": {
-      "Bioenergy": 0.2208,
-      "Hydro": 0.5127,
-      "Solar": 0.1141,
-      "Wind": 0.1523
+      "Bioenergy": 0.2216,
+      "Hydro": 0.5148,
+      "Solar": 0.112,
+      "Wind": 0.1516
     },
     "2020": {
-      "Bioenergy": 0.2155,
-      "Hydro": 0.4964,
-      "Solar": 0.1287,
-      "Wind": 0.1595
+      "Bioenergy": 0.2165,
+      "Hydro": 0.499,
+      "Solar": 0.126,
+      "Wind": 0.1585
     },
     "2021": {
-      "Bioenergy": 0.2162,
-      "Hydro": 0.4453,
-      "Solar": 0.1448,
-      "Wind": 0.1937
+      "Bioenergy": 0.2171,
+      "Hydro": 0.4477,
+      "Solar": 0.1421,
+      "Wind": 0.1931
     },
     "2022": {
-      "Bioenergy": 0.2095,
-      "Hydro": 0.4198,
-      "Solar": 0.1671,
-      "Wind": 0.2036
+      "Bioenergy": 0.2107,
+      "Hydro": 0.422,
+      "Solar": 0.1641,
+      "Wind": 0.2032
     },
     "2023": {
-      "Bioenergy": 0.2094,
-      "Hydro": 0.3699,
-      "Solar": 0.1983,
-      "Wind": 0.2225
+      "Bioenergy": 0.2105,
+      "Hydro": 0.3716,
+      "Solar": 0.1956,
+      "Wind": 0.2223
     },
     "2024": {
-      "Bioenergy": 0.1927,
-      "Hydro": 0.357,
-      "Solar": 0.2323,
-      "Wind": 0.218
+      "Bioenergy": 0.1935,
+      "Hydro": 0.359,
+      "Solar": 0.2296,
+      "Wind": 0.2179
     },
     "2025": {
-      "Bioenergy": 0.1757,
-      "Hydro": 0.3277,
-      "Solar": 0.2761,
-      "Wind": 0.2205
+      "Bioenergy": 0.1766,
+      "Hydro": 0.3293,
+      "Solar": 0.2734,
+      "Wind": 0.2207
     },
     "2026": {
-      "Bioenergy": 0.1957,
-      "Hydro": 0.2766,
-      "Solar": 0.2571,
-      "Wind": 0.2705
+      "Bioenergy": 0.1927,
+      "Hydro": 0.2494,
+      "Solar": 0.2942,
+      "Wind": 0.2637
     }
   },
   "MQ": {
@@ -6351,51 +6351,51 @@
   },
   "MR": {
     "2019": {
-      "Bioenergy": 0.0015,
-      "Hydro": 0.4555,
-      "Solar": 0.299,
+      "Bioenergy": 0.0013,
+      "Hydro": 0.4554,
+      "Solar": 0.2992,
       "Wind": 0.244
     },
     "2020": {
-      "Bioenergy": 0.0015,
-      "Hydro": 0.4555,
-      "Solar": 0.299,
+      "Bioenergy": 0.0013,
+      "Hydro": 0.4554,
+      "Solar": 0.2992,
       "Wind": 0.244
     },
     "2021": {
-      "Bioenergy": 0.0015,
-      "Hydro": 0.4555,
-      "Solar": 0.299,
+      "Bioenergy": 0.0013,
+      "Hydro": 0.4554,
+      "Solar": 0.2992,
       "Wind": 0.244
     },
     "2022": {
-      "Bioenergy": 0.0015,
-      "Hydro": 0.4555,
-      "Solar": 0.299,
+      "Bioenergy": 0.0013,
+      "Hydro": 0.4554,
+      "Solar": 0.2992,
       "Wind": 0.244
     },
     "2023": {
-      "Bioenergy": 0.0015,
-      "Hydro": 0.4555,
-      "Solar": 0.299,
+      "Bioenergy": 0.0013,
+      "Hydro": 0.4554,
+      "Solar": 0.2992,
       "Wind": 0.244
     },
     "2024": {
-      "Bioenergy": 0.0015,
-      "Hydro": 0.4555,
-      "Solar": 0.299,
+      "Bioenergy": 0.0013,
+      "Hydro": 0.4554,
+      "Solar": 0.2992,
       "Wind": 0.244
     },
     "2025": {
-      "Bioenergy": 0.0015,
-      "Hydro": 0.4555,
-      "Solar": 0.299,
+      "Bioenergy": 0.0013,
+      "Hydro": 0.4554,
+      "Solar": 0.2992,
       "Wind": 0.244
     },
     "2026": {
-      "Bioenergy": 0.0015,
-      "Hydro": 0.4555,
-      "Solar": 0.299,
+      "Bioenergy": 0.0013,
+      "Hydro": 0.4554,
+      "Solar": 0.2992,
       "Wind": 0.244
     }
   },
@@ -6477,26 +6477,26 @@
     "2023": {
       "Bioenergy": 0.0247,
       "Hydro": 0.1546,
-      "Solar": 0.705,
-      "Wind": 0.1157
+      "Solar": 0.7049,
+      "Wind": 0.1158
     },
     "2024": {
       "Bioenergy": 0.0297,
       "Hydro": 0.1921,
-      "Solar": 0.6451,
-      "Wind": 0.1331
+      "Solar": 0.645,
+      "Wind": 0.1332
     },
     "2025": {
-      "Bioenergy": 0.0302,
-      "Hydro": 0.1791,
-      "Solar": 0.6548,
-      "Wind": 0.1359
+      "Bioenergy": 0.0303,
+      "Hydro": 0.1799,
+      "Solar": 0.6526,
+      "Wind": 0.1372
     },
     "2026": {
-      "Bioenergy": 0.0394,
-      "Hydro": 0.2189,
-      "Solar": 0.5197,
-      "Wind": 0.222
+      "Bioenergy": 0.0418,
+      "Hydro": 0.2343,
+      "Solar": 0.4918,
+      "Wind": 0.232
     }
   },
   "MU": {
@@ -6719,33 +6719,33 @@
       "Wind": 0.0001
     },
     "2022": {
-      "Bioenergy": 0.1133,
-      "Hydro": 0.8438,
-      "Solar": 0.0428,
+      "Bioenergy": 0.1227,
+      "Hydro": 0.8333,
+      "Solar": 0.0439,
       "Wind": 0
     },
     "2023": {
-      "Bioenergy": 0.1133,
-      "Hydro": 0.8311,
-      "Solar": 0.0555,
+      "Bioenergy": 0.1248,
+      "Hydro": 0.817,
+      "Solar": 0.058,
       "Wind": 0.0001
     },
     "2024": {
-      "Bioenergy": 0.1109,
-      "Hydro": 0.8164,
-      "Solar": 0.0726,
+      "Bioenergy": 0.1232,
+      "Hydro": 0.8034,
+      "Solar": 0.0732,
       "Wind": 0.0001
     },
     "2025": {
-      "Bioenergy": 0.1088,
-      "Hydro": 0.8107,
-      "Solar": 0.0802,
+      "Bioenergy": 0.1214,
+      "Hydro": 0.7978,
+      "Solar": 0.0806,
       "Wind": 0.0002
     },
     "2026": {
-      "Bioenergy": 0.109,
-      "Hydro": 0.8165,
-      "Solar": 0.0745,
+      "Bioenergy": 0.1292,
+      "Hydro": 0.78,
+      "Solar": 0.0908,
       "Wind": 0
     }
   },
@@ -6801,51 +6801,51 @@
   },
   "NA": {
     "2019": {
-      "Bioenergy": 0.0058,
-      "Hydro": 0.7432,
-      "Solar": 0.2057,
+      "Bioenergy": 0.0053,
+      "Hydro": 0.7428,
+      "Solar": 0.2065,
       "Wind": 0.0453
     },
     "2020": {
-      "Bioenergy": 0.0058,
-      "Hydro": 0.7432,
-      "Solar": 0.2057,
+      "Bioenergy": 0.0053,
+      "Hydro": 0.7428,
+      "Solar": 0.2065,
       "Wind": 0.0453
     },
     "2021": {
-      "Bioenergy": 0.0058,
-      "Hydro": 0.7432,
-      "Solar": 0.2057,
+      "Bioenergy": 0.0053,
+      "Hydro": 0.7428,
+      "Solar": 0.2065,
       "Wind": 0.0453
     },
     "2022": {
-      "Bioenergy": 0.0058,
-      "Hydro": 0.7432,
-      "Solar": 0.2057,
+      "Bioenergy": 0.0053,
+      "Hydro": 0.7428,
+      "Solar": 0.2065,
       "Wind": 0.0453
     },
     "2023": {
-      "Bioenergy": 0.0058,
-      "Hydro": 0.7432,
-      "Solar": 0.2057,
+      "Bioenergy": 0.0053,
+      "Hydro": 0.7428,
+      "Solar": 0.2065,
       "Wind": 0.0453
     },
     "2024": {
-      "Bioenergy": 0.0058,
-      "Hydro": 0.7432,
-      "Solar": 0.2057,
+      "Bioenergy": 0.0053,
+      "Hydro": 0.7428,
+      "Solar": 0.2065,
       "Wind": 0.0453
     },
     "2025": {
-      "Bioenergy": 0.0058,
-      "Hydro": 0.7432,
-      "Solar": 0.2057,
+      "Bioenergy": 0.0053,
+      "Hydro": 0.7428,
+      "Solar": 0.2065,
       "Wind": 0.0453
     },
     "2026": {
-      "Bioenergy": 0.0058,
-      "Hydro": 0.7432,
-      "Solar": 0.2057,
+      "Bioenergy": 0.0053,
+      "Hydro": 0.7428,
+      "Solar": 0.2065,
       "Wind": 0.0453
     }
   },
@@ -6901,52 +6901,52 @@
   },
   "NE": {
     "2019": {
-      "Bioenergy": 0.0169,
-      "Hydro": 0.7367,
-      "Solar": 0.1442,
-      "Wind": 0.1021
+      "Bioenergy": 0.0155,
+      "Hydro": 0.7357,
+      "Solar": 0.1468,
+      "Wind": 0.102
     },
     "2020": {
-      "Bioenergy": 0.0169,
-      "Hydro": 0.7367,
-      "Solar": 0.1442,
-      "Wind": 0.1021
+      "Bioenergy": 0.0155,
+      "Hydro": 0.7357,
+      "Solar": 0.1468,
+      "Wind": 0.102
     },
     "2021": {
-      "Bioenergy": 0.0169,
-      "Hydro": 0.7367,
-      "Solar": 0.1442,
-      "Wind": 0.1021
+      "Bioenergy": 0.0155,
+      "Hydro": 0.7357,
+      "Solar": 0.1468,
+      "Wind": 0.102
     },
     "2022": {
-      "Bioenergy": 0.0169,
-      "Hydro": 0.7367,
-      "Solar": 0.1442,
-      "Wind": 0.1021
+      "Bioenergy": 0.0155,
+      "Hydro": 0.7357,
+      "Solar": 0.1468,
+      "Wind": 0.102
     },
     "2023": {
-      "Bioenergy": 0.0169,
-      "Hydro": 0.7367,
-      "Solar": 0.1442,
-      "Wind": 0.1021
+      "Bioenergy": 0.0155,
+      "Hydro": 0.7357,
+      "Solar": 0.1468,
+      "Wind": 0.102
     },
     "2024": {
-      "Bioenergy": 0.0169,
-      "Hydro": 0.7367,
-      "Solar": 0.1442,
-      "Wind": 0.1021
+      "Bioenergy": 0.0155,
+      "Hydro": 0.7357,
+      "Solar": 0.1468,
+      "Wind": 0.102
     },
     "2025": {
-      "Bioenergy": 0.0169,
-      "Hydro": 0.7367,
-      "Solar": 0.1442,
-      "Wind": 0.1021
+      "Bioenergy": 0.0155,
+      "Hydro": 0.7357,
+      "Solar": 0.1468,
+      "Wind": 0.102
     },
     "2026": {
-      "Bioenergy": 0.0169,
-      "Hydro": 0.7367,
-      "Solar": 0.1442,
-      "Wind": 0.1021
+      "Bioenergy": 0.0155,
+      "Hydro": 0.7357,
+      "Solar": 0.1468,
+      "Wind": 0.102
     }
   },
   "NG": {
@@ -7001,52 +7001,52 @@
   },
   "NI": {
     "2019": {
-      "Bioenergy": 0.4131,
+      "Bioenergy": 0.4132,
       "Hydro": 0.2053,
       "Solar": 0.018,
       "Wind": 0.3636
     },
     "2020": {
-      "Bioenergy": 0.4119,
-      "Hydro": 0.2053,
+      "Bioenergy": 0.4121,
+      "Hydro": 0.2051,
       "Solar": 0.0195,
-      "Wind": 0.3633
+      "Wind": 0.3634
     },
     "2021": {
-      "Bioenergy": 0.4123,
-      "Hydro": 0.2001,
+      "Bioenergy": 0.4125,
+      "Hydro": 0.1998,
       "Solar": 0.0211,
-      "Wind": 0.3664
+      "Wind": 0.3665
     },
     "2022": {
-      "Bioenergy": 0.4074,
-      "Hydro": 0.2061,
+      "Bioenergy": 0.4075,
+      "Hydro": 0.206,
       "Solar": 0.023,
       "Wind": 0.3635
     },
     "2023": {
-      "Bioenergy": 0.4074,
-      "Hydro": 0.2019,
-      "Solar": 0.0259,
-      "Wind": 0.3649
+      "Bioenergy": 0.4072,
+      "Hydro": 0.2023,
+      "Solar": 0.0258,
+      "Wind": 0.3646
     },
     "2024": {
       "Bioenergy": 0.4072,
-      "Hydro": 0.1978,
-      "Solar": 0.0289,
-      "Wind": 0.3661
+      "Hydro": 0.198,
+      "Solar": 0.0288,
+      "Wind": 0.3659
     },
     "2025": {
       "Bioenergy": 0.4061,
-      "Hydro": 0.1954,
-      "Solar": 0.0315,
-      "Wind": 0.367
+      "Hydro": 0.1958,
+      "Solar": 0.0314,
+      "Wind": 0.3668
     },
     "2026": {
-      "Bioenergy": 0.4055,
-      "Hydro": 0.194,
-      "Solar": 0.0344,
-      "Wind": 0.366
+      "Bioenergy": 0.4033,
+      "Hydro": 0.1988,
+      "Solar": 0.034,
+      "Wind": 0.364
     }
   },
   "NL": {
@@ -7093,10 +7093,10 @@
       "Wind": 0.4685
     },
     "2026": {
-      "Bioenergy": 0.1369,
+      "Bioenergy": 0.1234,
       "Hydro": 0.0019,
-      "Solar": 0.1351,
-      "Wind": 0.7262
+      "Solar": 0.1612,
+      "Wind": 0.7134
     }
   },
   "NO": {
@@ -7143,60 +7143,60 @@
       "Wind": 0.0873
     },
     "2026": {
-      "Bioenergy": 0,
-      "Hydro": 0.91,
-      "Solar": 0,
-      "Wind": 0.09
+      "Bioenergy": 0.0008,
+      "Hydro": 0.9037,
+      "Solar": 0.0013,
+      "Wind": 0.0942
     }
   },
   "NP": {
     "2019": {
-      "Bioenergy": 0.0038,
-      "Hydro": 0.9645,
-      "Solar": 0.0199,
+      "Bioenergy": 0.0039,
+      "Hydro": 0.9647,
+      "Solar": 0.0198,
       "Wind": 0.0117
     },
     "2020": {
       "Bioenergy": 0.0043,
-      "Hydro": 0.9617,
-      "Solar": 0.0213,
-      "Wind": 0.0128
+      "Hydro": 0.962,
+      "Solar": 0.0211,
+      "Wind": 0.0127
     },
     "2021": {
       "Bioenergy": 0.0048,
-      "Hydro": 0.957,
-      "Solar": 0.0227,
+      "Hydro": 0.9573,
+      "Solar": 0.0225,
       "Wind": 0.0155
     },
     "2022": {
       "Bioenergy": 0.0052,
-      "Hydro": 0.9528,
-      "Solar": 0.0249,
-      "Wind": 0.0171
+      "Hydro": 0.9532,
+      "Solar": 0.0247,
+      "Wind": 0.017
     },
     "2023": {
       "Bioenergy": 0.0054,
-      "Hydro": 0.9484,
-      "Solar": 0.0275,
-      "Wind": 0.0187
+      "Hydro": 0.9488,
+      "Solar": 0.0272,
+      "Wind": 0.0186
     },
     "2024": {
       "Bioenergy": 0.0051,
-      "Hydro": 0.9442,
-      "Solar": 0.0312,
-      "Wind": 0.0195
+      "Hydro": 0.9445,
+      "Solar": 0.031,
+      "Wind": 0.0194
     },
     "2025": {
       "Bioenergy": 0.005,
-      "Hydro": 0.937,
-      "Solar": 0.0367,
+      "Hydro": 0.9374,
+      "Solar": 0.0364,
       "Wind": 0.0212
     },
     "2026": {
       "Bioenergy": 0.0056,
-      "Hydro": 0.9367,
-      "Solar": 0.0336,
-      "Wind": 0.0241
+      "Hydro": 0.9335,
+      "Solar": 0.037,
+      "Wind": 0.0239
     }
   },
   "NR": {
@@ -7643,10 +7643,10 @@
       "Wind": 0.0574
     },
     "2026": {
-      "Bioenergy": 0.0779,
-      "Hydro": 0.5929,
-      "Solar": 0.2095,
-      "Wind": 0.1197
+      "Bioenergy": 0.0678,
+      "Hydro": 0.6031,
+      "Solar": 0.2277,
+      "Wind": 0.1014
     }
   },
   "PK": {
@@ -7743,10 +7743,10 @@
       "Wind": 0.4835
     },
     "2026": {
-      "Bioenergy": 0.0861,
-      "Hydro": 0.0307,
-      "Solar": 0.1722,
-      "Wind": 0.711
+      "Bioenergy": 0.0844,
+      "Hydro": 0.0452,
+      "Solar": 0.2239,
+      "Wind": 0.6464
     }
   },
   "PM": {
@@ -7852,51 +7852,51 @@
   "PS": {
     "2019": {
       "Bioenergy": 0.0033,
-      "Hydro": 0.5251,
-      "Solar": 0.4483,
-      "Wind": 0.0233
+      "Hydro": 0.5207,
+      "Solar": 0.4528,
+      "Wind": 0.0231
     },
     "2020": {
       "Bioenergy": 0.0033,
-      "Hydro": 0.5251,
-      "Solar": 0.4483,
-      "Wind": 0.0233
+      "Hydro": 0.5207,
+      "Solar": 0.4528,
+      "Wind": 0.0231
     },
     "2021": {
       "Bioenergy": 0.0033,
-      "Hydro": 0.5251,
-      "Solar": 0.4483,
-      "Wind": 0.0233
+      "Hydro": 0.5207,
+      "Solar": 0.4528,
+      "Wind": 0.0231
     },
     "2022": {
       "Bioenergy": 0.0033,
-      "Hydro": 0.5251,
-      "Solar": 0.4483,
-      "Wind": 0.0233
+      "Hydro": 0.5207,
+      "Solar": 0.4528,
+      "Wind": 0.0231
     },
     "2023": {
       "Bioenergy": 0.0033,
-      "Hydro": 0.5251,
-      "Solar": 0.4483,
-      "Wind": 0.0233
+      "Hydro": 0.5207,
+      "Solar": 0.4528,
+      "Wind": 0.0231
     },
     "2024": {
       "Bioenergy": 0.0033,
-      "Hydro": 0.5251,
-      "Solar": 0.4483,
-      "Wind": 0.0233
+      "Hydro": 0.5207,
+      "Solar": 0.4528,
+      "Wind": 0.0231
     },
     "2025": {
       "Bioenergy": 0.0033,
-      "Hydro": 0.5251,
-      "Solar": 0.4483,
-      "Wind": 0.0233
+      "Hydro": 0.5207,
+      "Solar": 0.4528,
+      "Wind": 0.0231
     },
     "2026": {
       "Bioenergy": 0.0033,
-      "Hydro": 0.5251,
-      "Solar": 0.4483,
-      "Wind": 0.0233
+      "Hydro": 0.5207,
+      "Solar": 0.4528,
+      "Wind": 0.0231
     }
   },
   "PT": {
@@ -7937,16 +7937,16 @@
       "Wind": 0.376
     },
     "2025": {
-      "Bioenergy": 0.0747,
-      "Hydro": 0.3332,
-      "Solar": 0.2386,
-      "Wind": 0.3535
+      "Bioenergy": 0.0746,
+      "Hydro": 0.333,
+      "Solar": 0.239,
+      "Wind": 0.3533
     },
     "2026": {
-      "Bioenergy": 0.0621,
-      "Hydro": 0.4016,
-      "Solar": 0.1147,
-      "Wind": 0.4216
+      "Bioenergy": 0.059,
+      "Hydro": 0.3846,
+      "Solar": 0.1162,
+      "Wind": 0.4402
     }
   },
   "PY": {
@@ -8143,10 +8143,10 @@
       "Wind": 0.2488
     },
     "2026": {
-      "Bioenergy": 0.0237,
-      "Hydro": 0.5828,
-      "Solar": 0.0478,
-      "Wind": 0.3457
+      "Bioenergy": 0.0218,
+      "Hydro": 0.5951,
+      "Solar": 0.06,
+      "Wind": 0.3231
     }
   },
   "RS": {
@@ -8182,9 +8182,9 @@
     },
     "2024": {
       "Bioenergy": 0.025,
-      "Hydro": 0.8495,
+      "Hydro": 0.8494,
       "Solar": 0.0164,
-      "Wind": 0.1091
+      "Wind": 0.1092
     },
     "2025": {
       "Bioenergy": 0.0349,
@@ -8193,10 +8193,10 @@
       "Wind": 0.1477
     },
     "2026": {
-      "Bioenergy": 0.0023,
-      "Hydro": 0.8375,
-      "Solar": 0.0025,
-      "Wind": 0.1577
+      "Bioenergy": 0.0011,
+      "Hydro": 0.8348,
+      "Solar": 0.0013,
+      "Wind": 0.1628
     }
   },
   "RU": {
@@ -8243,57 +8243,57 @@
       "Wind": 0.0212
     },
     "2026": {
-      "Bioenergy": 0.0047,
-      "Hydro": 0.9676,
-      "Solar": 0.0027,
-      "Wind": 0.025
+      "Bioenergy": 0.0049,
+      "Hydro": 0.9679,
+      "Solar": 0.0021,
+      "Wind": 0.0251
     }
   },
   "RW": {
     "2019": {
-      "Bioenergy": 0.0003,
+      "Bioenergy": 0.0002,
       "Hydro": 0.9285,
       "Solar": 0.0697,
       "Wind": 0.0015
     },
     "2020": {
-      "Bioenergy": 0.0003,
+      "Bioenergy": 0.0002,
       "Hydro": 0.9285,
       "Solar": 0.0697,
       "Wind": 0.0015
     },
     "2021": {
-      "Bioenergy": 0.0003,
+      "Bioenergy": 0.0002,
       "Hydro": 0.9285,
       "Solar": 0.0697,
       "Wind": 0.0015
     },
     "2022": {
-      "Bioenergy": 0.0003,
+      "Bioenergy": 0.0002,
       "Hydro": 0.9285,
       "Solar": 0.0697,
       "Wind": 0.0015
     },
     "2023": {
-      "Bioenergy": 0.0003,
+      "Bioenergy": 0.0002,
       "Hydro": 0.9285,
       "Solar": 0.0697,
       "Wind": 0.0015
     },
     "2024": {
-      "Bioenergy": 0.0003,
+      "Bioenergy": 0.0002,
       "Hydro": 0.9285,
       "Solar": 0.0697,
       "Wind": 0.0015
     },
     "2025": {
-      "Bioenergy": 0.0003,
+      "Bioenergy": 0.0002,
       "Hydro": 0.9285,
       "Solar": 0.0697,
       "Wind": 0.0015
     },
     "2026": {
-      "Bioenergy": 0.0003,
+      "Bioenergy": 0.0002,
       "Hydro": 0.9285,
       "Solar": 0.0697,
       "Wind": 0.0015
@@ -8543,10 +8543,10 @@
       "Wind": 0.3314
     },
     "2026": {
-      "Bioenergy": 0.0811,
-      "Hydro": 0.6539,
-      "Solar": 0.0024,
-      "Wind": 0.2626
+      "Bioenergy": 0.0836,
+      "Hydro": 0.6423,
+      "Solar": 0.0034,
+      "Wind": 0.2706
     }
   },
   "SG": {
@@ -8570,15 +8570,15 @@
     },
     "2022": {
       "Bioenergy": 0.0051,
-      "Hydro": 0.0376,
+      "Hydro": 0.0377,
       "Solar": 0.9441,
-      "Wind": 0.0132
+      "Wind": 0.0131
     },
     "2023": {
       "Bioenergy": 0.002,
       "Hydro": 0.0077,
-      "Solar": 0.9842,
-      "Wind": 0.0062
+      "Solar": 0.9843,
+      "Wind": 0.0061
     },
     "2024": {
       "Bioenergy": 0.0004,
@@ -8594,9 +8594,9 @@
     },
     "2026": {
       "Bioenergy": 0.0038,
-      "Hydro": 0.0159,
-      "Solar": 0.9647,
-      "Wind": 0.0155
+      "Hydro": 0.0145,
+      "Solar": 0.9663,
+      "Wind": 0.0154
     }
   },
   "SH": {
@@ -8688,15 +8688,15 @@
     },
     "2025": {
       "Bioenergy": 0.0315,
-      "Hydro": 0.689,
+      "Hydro": 0.6889,
       "Solar": 0.265,
-      "Wind": 0.0145
+      "Wind": 0.0146
     },
     "2026": {
-      "Bioenergy": 0.0791,
-      "Hydro": 0.7173,
-      "Solar": 0.1114,
-      "Wind": 0.0922
+      "Bioenergy": 0.0668,
+      "Hydro": 0.7453,
+      "Solar": 0.1402,
+      "Wind": 0.0477
     }
   },
   "SK": {
@@ -8743,9 +8743,9 @@
       "Wind": 0
     },
     "2026": {
-      "Bioenergy": 0.2122,
-      "Hydro": 0.7576,
-      "Solar": 0.0302,
+      "Bioenergy": 0.1851,
+      "Hydro": 0.7757,
+      "Solar": 0.0391,
       "Wind": 0
     }
   },
@@ -8801,51 +8801,51 @@
   },
   "SN": {
     "2019": {
-      "Bioenergy": 0.1435,
-      "Hydro": 0.4287,
-      "Solar": 0.3959,
+      "Bioenergy": 0.1434,
+      "Hydro": 0.4286,
+      "Solar": 0.3961,
       "Wind": 0.0319
     },
     "2020": {
-      "Bioenergy": 0.1435,
-      "Hydro": 0.4287,
-      "Solar": 0.3959,
+      "Bioenergy": 0.1434,
+      "Hydro": 0.4286,
+      "Solar": 0.3961,
       "Wind": 0.0319
     },
     "2021": {
-      "Bioenergy": 0.1435,
-      "Hydro": 0.4287,
-      "Solar": 0.3959,
+      "Bioenergy": 0.1434,
+      "Hydro": 0.4286,
+      "Solar": 0.3961,
       "Wind": 0.0319
     },
     "2022": {
-      "Bioenergy": 0.1435,
-      "Hydro": 0.4287,
-      "Solar": 0.3959,
+      "Bioenergy": 0.1434,
+      "Hydro": 0.4286,
+      "Solar": 0.3961,
       "Wind": 0.0319
     },
     "2023": {
-      "Bioenergy": 0.1435,
-      "Hydro": 0.4287,
-      "Solar": 0.3959,
+      "Bioenergy": 0.1434,
+      "Hydro": 0.4286,
+      "Solar": 0.3961,
       "Wind": 0.0319
     },
     "2024": {
-      "Bioenergy": 0.1435,
-      "Hydro": 0.4287,
-      "Solar": 0.3959,
+      "Bioenergy": 0.1434,
+      "Hydro": 0.4286,
+      "Solar": 0.3961,
       "Wind": 0.0319
     },
     "2025": {
-      "Bioenergy": 0.1435,
-      "Hydro": 0.4287,
-      "Solar": 0.3959,
+      "Bioenergy": 0.1434,
+      "Hydro": 0.4286,
+      "Solar": 0.3961,
       "Wind": 0.0319
     },
     "2026": {
-      "Bioenergy": 0.1435,
-      "Hydro": 0.4287,
-      "Solar": 0.3959,
+      "Bioenergy": 0.1434,
+      "Hydro": 0.4286,
+      "Solar": 0.3961,
       "Wind": 0.0319
     }
   },
@@ -8951,52 +8951,52 @@
   },
   "SS": {
     "2019": {
-      "Bioenergy": 0,
-      "Hydro": 0,
-      "Solar": 1,
-      "Wind": 0
+      "Bioenergy": null,
+      "Hydro": null,
+      "Solar": null,
+      "Wind": null
     },
     "2020": {
-      "Bioenergy": 0,
-      "Hydro": 0,
-      "Solar": 1,
-      "Wind": 0
+      "Bioenergy": null,
+      "Hydro": null,
+      "Solar": null,
+      "Wind": null
     },
     "2021": {
-      "Bioenergy": 0,
-      "Hydro": 0,
-      "Solar": 1,
-      "Wind": 0
+      "Bioenergy": null,
+      "Hydro": null,
+      "Solar": null,
+      "Wind": null
     },
     "2022": {
-      "Bioenergy": 0,
-      "Hydro": 0,
-      "Solar": 1,
-      "Wind": 0
+      "Bioenergy": null,
+      "Hydro": null,
+      "Solar": null,
+      "Wind": null
     },
     "2023": {
-      "Bioenergy": 0,
-      "Hydro": 0,
-      "Solar": 1,
-      "Wind": 0
+      "Bioenergy": null,
+      "Hydro": null,
+      "Solar": null,
+      "Wind": null
     },
     "2024": {
-      "Bioenergy": 0,
-      "Hydro": 0,
-      "Solar": 1,
-      "Wind": 0
+      "Bioenergy": null,
+      "Hydro": null,
+      "Solar": null,
+      "Wind": null
     },
     "2025": {
-      "Bioenergy": 0,
-      "Hydro": 0,
-      "Solar": 1,
-      "Wind": 0
+      "Bioenergy": null,
+      "Hydro": null,
+      "Solar": null,
+      "Wind": null
     },
     "2026": {
-      "Bioenergy": 0,
-      "Hydro": 0,
-      "Solar": 1,
-      "Wind": 0
+      "Bioenergy": null,
+      "Hydro": null,
+      "Solar": null,
+      "Wind": null
     }
   },
   "ST": {
@@ -9069,8 +9069,8 @@
       "Wind": 0.0426
     },
     "2022": {
-      "Bioenergy": 0.1344,
-      "Hydro": 0.5583,
+      "Bioenergy": 0.1345,
+      "Hydro": 0.5582,
       "Solar": 0.267,
       "Wind": 0.0403
     },
@@ -9082,21 +9082,21 @@
     },
     "2024": {
       "Bioenergy": 0.1332,
-      "Hydro": 0.5323,
+      "Hydro": 0.5324,
       "Solar": 0.298,
       "Wind": 0.0365
     },
     "2025": {
       "Bioenergy": 0.1051,
-      "Hydro": 0.5239,
+      "Hydro": 0.524,
       "Solar": 0.3293,
       "Wind": 0.0416
     },
     "2026": {
-      "Bioenergy": 0.0011,
-      "Hydro": 0.656,
-      "Solar": 0.3093,
-      "Wind": 0.0336
+      "Bioenergy": 0.001,
+      "Hydro": 0.6564,
+      "Solar": 0.3091,
+      "Wind": 0.0335
     }
   },
   "SY": {
@@ -9151,51 +9151,51 @@
   },
   "SZ": {
     "2019": {
-      "Bioenergy": 0.3405,
-      "Hydro": 0.6043,
-      "Solar": 0.0199,
+      "Bioenergy": 0.3398,
+      "Hydro": 0.604,
+      "Solar": 0.0209,
       "Wind": 0.0353
     },
     "2020": {
-      "Bioenergy": 0.3405,
-      "Hydro": 0.6043,
-      "Solar": 0.0199,
+      "Bioenergy": 0.3398,
+      "Hydro": 0.604,
+      "Solar": 0.0209,
       "Wind": 0.0353
     },
     "2021": {
-      "Bioenergy": 0.3405,
-      "Hydro": 0.6043,
-      "Solar": 0.0199,
+      "Bioenergy": 0.3398,
+      "Hydro": 0.604,
+      "Solar": 0.0209,
       "Wind": 0.0353
     },
     "2022": {
-      "Bioenergy": 0.3405,
-      "Hydro": 0.6043,
-      "Solar": 0.0199,
+      "Bioenergy": 0.3398,
+      "Hydro": 0.604,
+      "Solar": 0.0209,
       "Wind": 0.0353
     },
     "2023": {
-      "Bioenergy": 0.3405,
-      "Hydro": 0.6043,
-      "Solar": 0.0199,
+      "Bioenergy": 0.3398,
+      "Hydro": 0.604,
+      "Solar": 0.0209,
       "Wind": 0.0353
     },
     "2024": {
-      "Bioenergy": 0.3405,
-      "Hydro": 0.6043,
-      "Solar": 0.0199,
+      "Bioenergy": 0.3398,
+      "Hydro": 0.604,
+      "Solar": 0.0209,
       "Wind": 0.0353
     },
     "2025": {
-      "Bioenergy": 0.3405,
-      "Hydro": 0.6043,
-      "Solar": 0.0199,
+      "Bioenergy": 0.3398,
+      "Hydro": 0.604,
+      "Solar": 0.0209,
       "Wind": 0.0353
     },
     "2026": {
-      "Bioenergy": 0.3405,
-      "Hydro": 0.6043,
-      "Solar": 0.0199,
+      "Bioenergy": 0.3398,
+      "Hydro": 0.604,
+      "Solar": 0.0209,
       "Wind": 0.0353
     }
   },
@@ -9301,102 +9301,102 @@
   },
   "TG": {
     "2019": {
-      "Bioenergy": 0.0104,
-      "Hydro": 0.8574,
-      "Solar": 0.0692,
+      "Bioenergy": 0.0096,
+      "Hydro": 0.8567,
+      "Solar": 0.0708,
       "Wind": 0.0629
     },
     "2020": {
-      "Bioenergy": 0.0104,
-      "Hydro": 0.8574,
-      "Solar": 0.0692,
+      "Bioenergy": 0.0096,
+      "Hydro": 0.8567,
+      "Solar": 0.0708,
       "Wind": 0.0629
     },
     "2021": {
-      "Bioenergy": 0.0104,
-      "Hydro": 0.8574,
-      "Solar": 0.0692,
+      "Bioenergy": 0.0096,
+      "Hydro": 0.8567,
+      "Solar": 0.0708,
       "Wind": 0.0629
     },
     "2022": {
-      "Bioenergy": 0.0104,
-      "Hydro": 0.8574,
-      "Solar": 0.0692,
+      "Bioenergy": 0.0096,
+      "Hydro": 0.8567,
+      "Solar": 0.0708,
       "Wind": 0.0629
     },
     "2023": {
-      "Bioenergy": 0.0104,
-      "Hydro": 0.8574,
-      "Solar": 0.0692,
+      "Bioenergy": 0.0096,
+      "Hydro": 0.8567,
+      "Solar": 0.0708,
       "Wind": 0.0629
     },
     "2024": {
-      "Bioenergy": 0.0104,
-      "Hydro": 0.8574,
-      "Solar": 0.0692,
+      "Bioenergy": 0.0096,
+      "Hydro": 0.8567,
+      "Solar": 0.0708,
       "Wind": 0.0629
     },
     "2025": {
-      "Bioenergy": 0.0104,
-      "Hydro": 0.8574,
-      "Solar": 0.0692,
+      "Bioenergy": 0.0096,
+      "Hydro": 0.8567,
+      "Solar": 0.0708,
       "Wind": 0.0629
     },
     "2026": {
-      "Bioenergy": 0.0104,
-      "Hydro": 0.8574,
-      "Solar": 0.0692,
+      "Bioenergy": 0.0096,
+      "Hydro": 0.8567,
+      "Solar": 0.0708,
       "Wind": 0.0629
     }
   },
   "TH": {
     "2019": {
-      "Bioenergy": 0.3919,
-      "Hydro": 0.2898,
-      "Solar": 0.1798,
-      "Wind": 0.1385
+      "Bioenergy": 0.3922,
+      "Hydro": 0.2901,
+      "Solar": 0.1794,
+      "Wind": 0.1383
     },
     "2020": {
-      "Bioenergy": 0.4076,
-      "Hydro": 0.2638,
-      "Solar": 0.188,
-      "Wind": 0.1405
+      "Bioenergy": 0.4079,
+      "Hydro": 0.2643,
+      "Solar": 0.1875,
+      "Wind": 0.1403
     },
     "2021": {
-      "Bioenergy": 0.4039,
-      "Hydro": 0.2571,
-      "Solar": 0.1639,
-      "Wind": 0.1751
+      "Bioenergy": 0.4044,
+      "Hydro": 0.2576,
+      "Solar": 0.1631,
+      "Wind": 0.175
     },
     "2022": {
-      "Bioenergy": 0.3869,
-      "Hydro": 0.2969,
-      "Solar": 0.1811,
-      "Wind": 0.1351
+      "Bioenergy": 0.3874,
+      "Hydro": 0.2973,
+      "Solar": 0.1802,
+      "Wind": 0.135
     },
     "2023": {
-      "Bioenergy": 0.3918,
-      "Hydro": 0.2702,
-      "Solar": 0.1855,
-      "Wind": 0.1526
+      "Bioenergy": 0.3922,
+      "Hydro": 0.2705,
+      "Solar": 0.1848,
+      "Wind": 0.1525
     },
     "2024": {
-      "Bioenergy": 0.358,
-      "Hydro": 0.2686,
-      "Solar": 0.216,
-      "Wind": 0.1573
+      "Bioenergy": 0.3584,
+      "Hydro": 0.2692,
+      "Solar": 0.2152,
+      "Wind": 0.1572
     },
     "2025": {
-      "Bioenergy": 0.2492,
-      "Hydro": 0.2848,
-      "Solar": 0.3167,
-      "Wind": 0.1493
+      "Bioenergy": 0.2508,
+      "Hydro": 0.2852,
+      "Solar": 0.3125,
+      "Wind": 0.1515
     },
     "2026": {
-      "Bioenergy": 0.2099,
-      "Hydro": 0.279,
-      "Solar": 0.3213,
-      "Wind": 0.1898
+      "Bioenergy": 0.2455,
+      "Hydro": 0.2678,
+      "Solar": 0.2933,
+      "Wind": 0.1934
     }
   },
   "TJ": {
@@ -9437,16 +9437,16 @@
       "Wind": 0.0001
     },
     "2025": {
-      "Bioenergy": 0.0001,
-      "Hydro": 0.9991,
-      "Solar": 0.0004,
-      "Wind": 0.0004
+      "Bioenergy": 0.0002,
+      "Hydro": 0.9985,
+      "Solar": 0.0007,
+      "Wind": 0.0007
     },
     "2026": {
-      "Bioenergy": 0,
-      "Hydro": 1,
-      "Solar": 0,
-      "Wind": 0
+      "Bioenergy": 0.0003,
+      "Hydro": 0.9972,
+      "Solar": 0.0013,
+      "Wind": 0.0012
     }
   },
   "TL": {
@@ -9802,49 +9802,49 @@
   "TZ": {
     "2019": {
       "Bioenergy": 0.027,
-      "Hydro": 0.9599,
+      "Hydro": 0.9598,
       "Solar": 0.0122,
       "Wind": 0.0009
     },
     "2020": {
       "Bioenergy": 0.027,
-      "Hydro": 0.9599,
+      "Hydro": 0.9598,
       "Solar": 0.0122,
       "Wind": 0.0009
     },
     "2021": {
       "Bioenergy": 0.027,
-      "Hydro": 0.9599,
+      "Hydro": 0.9598,
       "Solar": 0.0122,
       "Wind": 0.0009
     },
     "2022": {
       "Bioenergy": 0.027,
-      "Hydro": 0.9599,
+      "Hydro": 0.9598,
       "Solar": 0.0122,
       "Wind": 0.0009
     },
     "2023": {
       "Bioenergy": 0.027,
-      "Hydro": 0.9599,
+      "Hydro": 0.9598,
       "Solar": 0.0122,
       "Wind": 0.0009
     },
     "2024": {
       "Bioenergy": 0.027,
-      "Hydro": 0.9599,
+      "Hydro": 0.9598,
       "Solar": 0.0122,
       "Wind": 0.0009
     },
     "2025": {
       "Bioenergy": 0.027,
-      "Hydro": 0.9599,
+      "Hydro": 0.9598,
       "Solar": 0.0122,
       "Wind": 0.0009
     },
     "2026": {
       "Bioenergy": 0.027,
-      "Hydro": 0.9599,
+      "Hydro": 0.9598,
       "Solar": 0.0122,
       "Wind": 0.0009
     }
@@ -9993,10 +9993,10 @@
       "Wind": 0.4077
     },
     "2026": {
-      "Bioenergy": 0.0411,
-      "Hydro": 0.2763,
-      "Solar": 0.254,
-      "Wind": 0.4286
+      "Bioenergy": 0.0405,
+      "Hydro": 0.2536,
+      "Solar": 0.2813,
+      "Wind": 0.4246
     }
   },
   "UY": {
@@ -10026,9 +10026,9 @@
     },
     "2023": {
       "Bioenergy": 0.1121,
-      "Hydro": 0.3845,
-      "Solar": 0.0436,
-      "Wind": 0.4599
+      "Hydro": 0.3847,
+      "Solar": 0.0435,
+      "Wind": 0.4597
     },
     "2024": {
       "Bioenergy": 0.1296,
@@ -10039,64 +10039,64 @@
     "2025": {
       "Bioenergy": 0.141,
       "Hydro": 0.4741,
-      "Solar": 0.041,
+      "Solar": 0.0409,
       "Wind": 0.344
     },
     "2026": {
-      "Bioenergy": 0.1468,
-      "Hydro": 0.4495,
-      "Solar": 0.055,
-      "Wind": 0.3486
+      "Bioenergy": 0.156,
+      "Hydro": 0.4432,
+      "Solar": 0.0579,
+      "Wind": 0.3428
     }
   },
   "UZ": {
     "2019": {
       "Bioenergy": 0.003,
-      "Hydro": 0.9812,
-      "Solar": 0.0078,
-      "Wind": 0.008
+      "Hydro": 0.9814,
+      "Solar": 0.0077,
+      "Wind": 0.0079
     },
     "2020": {
       "Bioenergy": 0.0033,
-      "Hydro": 0.979,
-      "Solar": 0.0089,
-      "Wind": 0.0088
+      "Hydro": 0.9792,
+      "Solar": 0.0088,
+      "Wind": 0.0087
     },
     "2021": {
       "Bioenergy": 0.0037,
-      "Hydro": 0.9753,
-      "Solar": 0.0101,
-      "Wind": 0.011
+      "Hydro": 0.9755,
+      "Solar": 0.0099,
+      "Wind": 0.0109
     },
     "2022": {
       "Bioenergy": 0.004,
-      "Hydro": 0.972,
-      "Solar": 0.0118,
-      "Wind": 0.0122
+      "Hydro": 0.9722,
+      "Solar": 0.0116,
+      "Wind": 0.0121
     },
     "2023": {
       "Bioenergy": 0.0042,
-      "Hydro": 0.9685,
-      "Solar": 0.0138,
+      "Hydro": 0.9688,
+      "Solar": 0.0136,
       "Wind": 0.0134
     },
     "2024": {
       "Bioenergy": 0.004,
-      "Hydro": 0.9651,
-      "Solar": 0.0168,
-      "Wind": 0.0141
+      "Hydro": 0.9654,
+      "Solar": 0.0166,
+      "Wind": 0.014
     },
     "2025": {
-      "Bioenergy": 0.0039,
-      "Hydro": 0.9594,
-      "Solar": 0.0212,
-      "Wind": 0.0155
+      "Bioenergy": 0.004,
+      "Hydro": 0.9597,
+      "Solar": 0.021,
+      "Wind": 0.0154
     },
     "2026": {
       "Bioenergy": 0.0044,
-      "Hydro": 0.9593,
-      "Solar": 0.0187,
-      "Wind": 0.0177
+      "Hydro": 0.9567,
+      "Solar": 0.0214,
+      "Wind": 0.0175
     }
   },
   "VC": {
@@ -10476,27 +10476,27 @@
     },
     "2023": {
       "Bioenergy": 0.0235,
-      "Hydro": 0.4804,
+      "Hydro": 0.4803,
       "Solar": 0.041,
-      "Wind": 0.4551
+      "Wind": 0.4552
     },
     "2024": {
       "Bioenergy": 0.0281,
-      "Hydro": 0.3914,
+      "Hydro": 0.3913,
       "Solar": 0.0433,
       "Wind": 0.5373
     },
     "2025": {
-      "Bioenergy": 0.0352,
-      "Hydro": 0.4406,
-      "Solar": 0.1043,
-      "Wind": 0.4199
+      "Bioenergy": 0.035,
+      "Hydro": 0.4405,
+      "Solar": 0.1044,
+      "Wind": 0.4201
     },
     "2026": {
-      "Bioenergy": 0.034,
-      "Hydro": 0.4635,
-      "Solar": 0.0362,
-      "Wind": 0.4662
+      "Bioenergy": 0.0337,
+      "Hydro": 0.4602,
+      "Solar": 0.0478,
+      "Wind": 0.4583
     }
   },
   "YE": {
@@ -10564,39 +10564,39 @@
     },
     "2021": {
       "Bioenergy": 0,
-      "Hydro": 0.0936,
-      "Solar": 0.4126,
-      "Wind": 0.4938
+      "Hydro": 0.0939,
+      "Solar": 0.4105,
+      "Wind": 0.4955
     },
     "2022": {
       "Bioenergy": 0,
-      "Hydro": 0.1352,
-      "Solar": 0.4462,
-      "Wind": 0.4187
+      "Hydro": 0.1399,
+      "Solar": 0.4267,
+      "Wind": 0.4334
     },
     "2023": {
       "Bioenergy": 0,
-      "Hydro": 0.0691,
-      "Solar": 0.5358,
-      "Wind": 0.3951
+      "Hydro": 0.0738,
+      "Solar": 0.5043,
+      "Wind": 0.4219
     },
     "2024": {
       "Bioenergy": 0,
-      "Hydro": 0.0345,
-      "Solar": 0.6205,
-      "Wind": 0.345
+      "Hydro": 0.0376,
+      "Solar": 0.5863,
+      "Wind": 0.3761
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.0521,
-      "Solar": 0.6213,
-      "Wind": 0.3266
+      "Hydro": 0.0571,
+      "Solar": 0.5851,
+      "Wind": 0.3578
     },
     "2026": {
       "Bioenergy": 0,
-      "Hydro": 0.0919,
-      "Solar": 0.6402,
-      "Wind": 0.2679
+      "Hydro": 0.1009,
+      "Solar": 0.605,
+      "Wind": 0.2941
     }
   },
   "ZM": {
@@ -10651,51 +10651,51 @@
   },
   "ZW": {
     "2019": {
-      "Bioenergy": 0.0422,
-      "Hydro": 0.945,
-      "Solar": 0.0075,
+      "Bioenergy": 0.0421,
+      "Hydro": 0.9449,
+      "Solar": 0.0076,
       "Wind": 0.0054
     },
     "2020": {
-      "Bioenergy": 0.0422,
-      "Hydro": 0.945,
-      "Solar": 0.0075,
+      "Bioenergy": 0.0421,
+      "Hydro": 0.9449,
+      "Solar": 0.0076,
       "Wind": 0.0054
     },
     "2021": {
-      "Bioenergy": 0.0422,
-      "Hydro": 0.945,
-      "Solar": 0.0075,
+      "Bioenergy": 0.0421,
+      "Hydro": 0.9449,
+      "Solar": 0.0076,
       "Wind": 0.0054
     },
     "2022": {
-      "Bioenergy": 0.0422,
-      "Hydro": 0.945,
-      "Solar": 0.0075,
+      "Bioenergy": 0.0421,
+      "Hydro": 0.9449,
+      "Solar": 0.0076,
       "Wind": 0.0054
     },
     "2023": {
-      "Bioenergy": 0.0422,
-      "Hydro": 0.945,
-      "Solar": 0.0075,
+      "Bioenergy": 0.0421,
+      "Hydro": 0.9449,
+      "Solar": 0.0076,
       "Wind": 0.0054
     },
     "2024": {
-      "Bioenergy": 0.0422,
-      "Hydro": 0.945,
-      "Solar": 0.0075,
+      "Bioenergy": 0.0421,
+      "Hydro": 0.9449,
+      "Solar": 0.0076,
       "Wind": 0.0054
     },
     "2025": {
-      "Bioenergy": 0.0422,
-      "Hydro": 0.945,
-      "Solar": 0.0075,
+      "Bioenergy": 0.0421,
+      "Hydro": 0.9449,
+      "Solar": 0.0076,
       "Wind": 0.0054
     },
     "2026": {
-      "Bioenergy": 0.0422,
-      "Hydro": 0.945,
-      "Solar": 0.0075,
+      "Bioenergy": 0.0421,
+      "Hydro": 0.9449,
+      "Solar": 0.0076,
       "Wind": 0.0054
     }
   }