npm - @digital4better/data - Versions diffs - 1.1.34 → 1.1.36 - Mend

@digital4better/data 1.1.34 → 1.1.36

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 +182 -176
package/data/factor/continent-monthly-green.json +1576 -1510
package/data/factor/continent-monthly.csv +181 -175
package/data/factor/continent-monthly.json +1500 -1434
package/data/factor/continent-yearly-green.csv +21 -21
package/data/factor/continent-yearly-green.json +178 -178
package/data/factor/continent-yearly.csv +21 -21
package/data/factor/continent-yearly.json +176 -176
package/data/factor/country-monthly-green.csv +1428 -1214
package/data/factor/country-monthly-green.json +12716 -10362
package/data/factor/country-monthly.csv +1430 -1216
package/data/factor/country-monthly.json +11820 -9466
package/data/factor/country-yearly-green.csv +220 -220
package/data/factor/country-yearly-green.json +1977 -1977
package/data/factor/country-yearly.csv +223 -223
package/data/factor/country-yearly.json +1860 -1860
package/data/factor/subdivision-monthly-green.csv +102 -39
package/data/factor/subdivision-monthly-green.json +1031 -338
package/data/factor/subdivision-monthly.csv +102 -39
package/data/factor/subdivision-monthly.json +1044 -351
package/data/factor/subdivision-yearly-green.csv +204 -204
package/data/factor/subdivision-yearly-green.json +1160 -1160
package/data/factor/subdivision-yearly.csv +193 -193
package/data/factor/subdivision-yearly.json +989 -989
package/data/factor/world-monthly-green.csv +53 -52
package/data/factor/world-monthly-green.json +479 -468
package/data/factor/world-monthly.csv +53 -52
package/data/factor/world-monthly.json +479 -468
package/data/factor/world-yearly-green.csv +5 -5
package/data/factor/world-yearly-green.json +45 -45
package/data/factor/world-yearly.csv +5 -5
package/data/factor/world-yearly.json +45 -45
package/data/mix/continent-monthly-green.csv +151 -145
package/data/mix/continent-monthly-green.json +578 -542
package/data/mix/continent-monthly.csv +151 -145
package/data/mix/continent-monthly.json +1029 -963
package/data/mix/continent-yearly-green.csv +15 -15
package/data/mix/continent-yearly-green.json +56 -56
package/data/mix/continent-yearly.csv +15 -15
package/data/mix/continent-yearly.json +99 -99
package/data/mix/country-monthly-green.csv +1253 -1039
package/data/mix/country-monthly-green.json +4490 -3206
package/data/mix/country-monthly.csv +1253 -1039
package/data/mix/country-monthly.json +6658 -4304
package/data/mix/country-yearly-green.csv +159 -159
package/data/mix/country-yearly-green.json +478 -478
package/data/mix/country-yearly.csv +159 -159
package/data/mix/country-yearly.json +808 -808
package/data/mix/subdivision-monthly-green.csv +99 -36
package/data/mix/subdivision-monthly-green.json +476 -98
package/data/mix/subdivision-monthly.csv +99 -36
package/data/mix/subdivision-monthly.json +884 -191
package/data/mix/subdivision-yearly-green.csv +65 -65
package/data/mix/subdivision-yearly-green.json +212 -212
package/data/mix/subdivision-yearly.csv +65 -65
package/data/mix/subdivision-yearly.json +390 -390
package/data/mix/world-monthly-green.csv +53 -52
package/data/mix/world-monthly-green.json +213 -207
package/data/mix/world-monthly.csv +53 -52
package/data/mix/world-monthly.json +409 -398
package/data/mix/world-yearly-green.csv +5 -5
package/data/mix/world-yearly-green.json +20 -20
package/data/mix/world-yearly.csv +5 -5
package/data/mix/world-yearly.json +40 -40
package/package.json +1 -1

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

@@ -104,35 +104,35 @@
     "2022": {
       "Bioenergy": 0.0161,
       "Coal": 0.4753,
-      "Gas": 0.0868,
+      "Gas": 0.0869,
       "Hydro": 0.2468,
       "Nuclear": 0.0438,
       "Other Fossil": 0.0249,
       "Other Renewables": 0.004,
-      "Solar": 0.0502,
+      "Solar": 0.0501,
       "Wind": 0.0521
     },
     "2023": {
       "Bioenergy": 0.0164,
       "Coal": 0.4791,
-      "Gas": 0.0823,
-      "Hydro": 0.2351,
-      "Nuclear": 0.0441,
+      "Gas": 0.0825,
+      "Hydro": 0.235,
+      "Nuclear": 0.044,
       "Other Fossil": 0.0226,
       "Other Renewables": 0.004,
-      "Solar": 0.0587,
+      "Solar": 0.0586,
       "Wind": 0.0577
     },
     "2024": {
-      "Bioenergy": 0.0177,
-      "Coal": 0.4895,
-      "Gas": 0.0828,
-      "Hydro": 0.2087,
-      "Nuclear": 0.0429,
-      "Other Fossil": 0.0219,
-      "Other Renewables": 0.0042,
-      "Solar": 0.0645,
-      "Wind": 0.0677
+      "Bioenergy": 0.0166,
+      "Coal": 0.4814,
+      "Gas": 0.0822,
+      "Hydro": 0.2147,
+      "Nuclear": 0.0439,
+      "Other Fossil": 0.0217,
+      "Other Renewables": 0.0041,
+      "Solar": 0.0677,
+      "Wind": 0.0678
     }
   },
   "AG": {
@@ -250,25 +250,25 @@
     },
     "2023": {
       "Bioenergy": 0.0088,
-      "Coal": 0.0457,
-      "Gas": 0.0763,
-      "Hydro": 0.7355,
-      "Nuclear": 0.0634,
+      "Coal": 0.0463,
+      "Gas": 0.0765,
+      "Hydro": 0.7354,
+      "Nuclear": 0.063,
       "Other Fossil": 0.0062,
       "Other Renewables": 0.0021,
       "Solar": 0.0219,
-      "Wind": 0.0402
+      "Wind": 0.04
     },
     "2024": {
-      "Bioenergy": 0.009,
-      "Coal": 0.0419,
-      "Gas": 0.0731,
-      "Hydro": 0.7399,
+      "Bioenergy": 0.0093,
+      "Coal": 0.041,
+      "Gas": 0.0716,
+      "Hydro": 0.7416,
       "Nuclear": 0.0622,
-      "Other Fossil": 0.0059,
+      "Other Fossil": 0.0058,
       "Other Renewables": 0.002,
-      "Solar": 0.0187,
-      "Wind": 0.0473
+      "Solar": 0.0224,
+      "Wind": 0.0438
     }
   },
   "AM": {
@@ -455,24 +455,24 @@
     "2023": {
       "Bioenergy": 0.0082,
       "Coal": 0.0103,
-      "Gas": 0.4818,
-      "Hydro": 0.2944,
+      "Gas": 0.4819,
+      "Hydro": 0.2943,
       "Nuclear": 0.0616,
       "Other Fossil": 0.0174,
       "Other Renewables": 0.0003,
-      "Solar": 0.0242,
-      "Wind": 0.1017
+      "Solar": 0.0243,
+      "Wind": 0.1018
     },
     "2024": {
-      "Bioenergy": 0.0072,
+      "Bioenergy": 0.0071,
       "Coal": 0.0021,
-      "Gas": 0.5203,
-      "Hydro": 0.2418,
-      "Nuclear": 0.0868,
-      "Other Fossil": 0.0106,
+      "Gas": 0.5153,
+      "Hydro": 0.2398,
+      "Nuclear": 0.09,
+      "Other Fossil": 0.0098,
       "Other Renewables": 0,
-      "Solar": 0.0262,
-      "Wind": 0.1051
+      "Solar": 0.0263,
+      "Wind": 0.1096
     }
   },
   "AS": {
@@ -597,18 +597,18 @@
       "Other Fossil": 0.0181,
       "Other Renewables": 0.0004,
       "Solar": 0.0385,
-      "Wind": 0.1399
+      "Wind": 0.1398
     },
     "2024": {
-      "Bioenergy": 0.0266,
+      "Bioenergy": 0.0275,
       "Coal": 0,
-      "Gas": 0.1088,
-      "Hydro": 0.606,
+      "Gas": 0.0895,
+      "Hydro": 0.6272,
       "Nuclear": 0,
       "Other Fossil": 0.0153,
       "Other Renewables": 0,
-      "Solar": 0.0602,
-      "Wind": 0.1831
+      "Solar": 0.0733,
+      "Wind": 0.1672
     }
   },
   "AU": {
@@ -664,19 +664,19 @@
       "Nuclear": 0,
       "Other Fossil": 0.0001,
       "Other Renewables": 0,
-      "Solar": 0.1811,
+      "Solar": 0.1812,
       "Wind": 0.1345
     },
     "2024": {
       "Bioenergy": 0.0014,
-      "Coal": 0.5483,
-      "Gas": 0.0679,
-      "Hydro": 0.0513,
+      "Coal": 0.5561,
+      "Gas": 0.0735,
+      "Hydro": 0.0529,
       "Nuclear": 0,
-      "Other Fossil": 0.0004,
+      "Other Fossil": 0.0003,
       "Other Renewables": 0,
-      "Solar": 0.2077,
-      "Wind": 0.123
+      "Solar": 0.1941,
+      "Wind": 0.1217
     }
   },
   "AW": {
@@ -873,14 +873,14 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.5843,
+      "Coal": 0.6059,
       "Gas": 0,
-      "Hydro": 0.387,
+      "Hydro": 0.3701,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0135,
-      "Wind": 0.0151
+      "Solar": 0.0093,
+      "Wind": 0.0147
     }
   },
   "BB": {
@@ -989,7 +989,7 @@
       "Bioenergy": 0.0018,
       "Coal": 0.1403,
       "Gas": 0.5194,
-      "Hydro": 0.0209,
+      "Hydro": 0.0208,
       "Nuclear": 0.0049,
       "Other Fossil": 0.297,
       "Other Renewables": 0.0005,
@@ -1008,15 +1008,15 @@
       "Wind": 0.0117
     },
     "2024": {
-      "Bioenergy": 0.0038,
-      "Coal": 0.4052,
-      "Gas": 0.4472,
-      "Hydro": 0.02,
-      "Nuclear": 0.0092,
-      "Other Fossil": 0.0778,
+      "Bioenergy": 0.0035,
+      "Coal": 0.4086,
+      "Gas": 0.4454,
+      "Hydro": 0.0197,
+      "Nuclear": 0.0094,
+      "Other Fossil": 0.0755,
       "Other Renewables": 0.0009,
-      "Solar": 0.0213,
-      "Wind": 0.0146
+      "Solar": 0.0225,
+      "Wind": 0.0145
     }
   },
   "BE": {
@@ -1066,25 +1066,25 @@
     },
     "2023": {
       "Bioenergy": 0.0129,
-      "Coal": 0.0076,
+      "Coal": 0.0077,
       "Gas": 0.1995,
       "Hydro": 0.0118,
-      "Nuclear": 0.3935,
+      "Nuclear": 0.3934,
       "Other Fossil": 0.0994,
       "Other Renewables": 0.0004,
       "Solar": 0.0921,
-      "Wind": 0.1829
+      "Wind": 0.1828
     },
     "2024": {
-      "Bioenergy": 0.0098,
-      "Coal": 0.0174,
-      "Gas": 0.1627,
-      "Hydro": 0.0259,
-      "Nuclear": 0.4,
-      "Other Fossil": 0.0773,
-      "Other Renewables": 0.0008,
-      "Solar": 0.0785,
-      "Wind": 0.2277
+      "Bioenergy": 0.0103,
+      "Coal": 0.0172,
+      "Gas": 0.1561,
+      "Hydro": 0.0266,
+      "Nuclear": 0.4066,
+      "Other Fossil": 0.0805,
+      "Other Renewables": 0.0009,
+      "Solar": 0.0964,
+      "Wind": 0.2054
     }
   },
   "BF": {
@@ -1212,15 +1212,15 @@
       "Wind": 0.0386
     },
     "2024": {
-      "Bioenergy": 0.0037,
-      "Coal": 0.2544,
-      "Gas": 0.0721,
-      "Hydro": 0.082,
-      "Nuclear": 0.4538,
+      "Bioenergy": 0.0038,
+      "Coal": 0.2436,
+      "Gas": 0.0692,
+      "Hydro": 0.1013,
+      "Nuclear": 0.4334,
       "Other Fossil": 0.0005,
       "Other Renewables": 0.0002,
-      "Solar": 0.0879,
-      "Wind": 0.0455
+      "Solar": 0.104,
+      "Wind": 0.044
     }
   },
   "BH": {
@@ -1622,13 +1622,13 @@
     "2024": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.6439,
-      "Hydro": 0.2904,
+      "Gas": 0.6389,
+      "Hydro": 0.2941,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0278,
-      "Wind": 0.0379
+      "Solar": 0.0284,
+      "Wind": 0.0385
     }
   },
   "BR": {
@@ -1679,24 +1679,24 @@
     "2023": {
       "Bioenergy": 0.0135,
       "Coal": 0.0115,
-      "Gas": 0.0531,
+      "Gas": 0.0532,
       "Hydro": 0.6685,
       "Nuclear": 0.0219,
-      "Other Fossil": 0.0116,
+      "Other Fossil": 0.0115,
       "Other Renewables": 0,
       "Solar": 0.0782,
       "Wind": 0.1416
     },
     "2024": {
-      "Bioenergy": 0.0076,
-      "Coal": 0.0093,
-      "Gas": 0.0379,
-      "Hydro": 0.7169,
-      "Nuclear": 0.024,
-      "Other Fossil": 0.0107,
+      "Bioenergy": 0.0096,
+      "Coal": 0.0089,
+      "Gas": 0.04,
+      "Hydro": 0.7035,
+      "Nuclear": 0.0236,
+      "Other Fossil": 0.0105,
       "Other Renewables": 0,
-      "Solar": 0.0968,
-      "Wind": 0.0968
+      "Solar": 0.0963,
+      "Wind": 0.1076
     }
   },
   "BS": {
@@ -1984,10 +1984,10 @@
       "Wind": 0.0251
     },
     "2020": {
-      "Bioenergy": 0.1715,
+      "Bioenergy": 0.1714,
       "Coal": 0.018,
-      "Gas": 0.1097,
-      "Hydro": 0.5287,
+      "Gas": 0.1096,
+      "Hydro": 0.5289,
       "Nuclear": 0.0099,
       "Other Fossil": 0.1086,
       "Other Renewables": 0.0032,
@@ -1995,21 +1995,21 @@
       "Wind": 0.0285
     },
     "2021": {
-      "Bioenergy": 0.1708,
+      "Bioenergy": 0.1707,
       "Coal": 0.018,
-      "Gas": 0.1198,
-      "Hydro": 0.5131,
+      "Gas": 0.1197,
+      "Hydro": 0.5133,
       "Nuclear": 0.0097,
       "Other Fossil": 0.1072,
       "Other Renewables": 0.0029,
       "Solar": 0.0251,
-      "Wind": 0.0334
+      "Wind": 0.0333
     },
     "2022": {
-      "Bioenergy": 0.1706,
+      "Bioenergy": 0.1705,
       "Coal": 0.0143,
-      "Gas": 0.1019,
-      "Hydro": 0.5277,
+      "Gas": 0.1018,
+      "Hydro": 0.5279,
       "Nuclear": 0.0084,
       "Other Fossil": 0.1097,
       "Other Renewables": 0.0029,
@@ -2017,26 +2017,26 @@
       "Wind": 0.0351
     },
     "2023": {
-      "Bioenergy": 0.1703,
-      "Coal": 0.0166,
-      "Gas": 0.1001,
-      "Hydro": 0.5212,
+      "Bioenergy": 0.1707,
+      "Coal": 0.0167,
+      "Gas": 0.1008,
+      "Hydro": 0.5192,
       "Nuclear": 0.0088,
-      "Other Fossil": 0.1071,
-      "Other Renewables": 0.0026,
-      "Solar": 0.0356,
-      "Wind": 0.0378
+      "Other Fossil": 0.1073,
+      "Other Renewables": 0.0027,
+      "Solar": 0.0357,
+      "Wind": 0.0381
     },
     "2024": {
-      "Bioenergy": 0.1699,
-      "Coal": 0.0166,
-      "Gas": 0.0907,
-      "Hydro": 0.5354,
-      "Nuclear": 0.0099,
-      "Other Fossil": 0.1036,
+      "Bioenergy": 0.1701,
+      "Coal": 0.0171,
+      "Gas": 0.0919,
+      "Hydro": 0.5302,
+      "Nuclear": 0.0098,
+      "Other Fossil": 0.105,
       "Other Renewables": 0.0025,
-      "Solar": 0.0407,
-      "Wind": 0.0308
+      "Solar": 0.041,
+      "Wind": 0.0325
     }
   },
   "CA": {
@@ -2096,15 +2096,15 @@
       "Wind": 0.0646
     },
     "2024": {
-      "Bioenergy": 0.0158,
-      "Coal": 0.046,
-      "Gas": 0.1444,
-      "Hydro": 0.5769,
-      "Nuclear": 0.1265,
-      "Other Fossil": 0.0104,
-      "Other Renewables": 0.0004,
-      "Solar": 0.0054,
-      "Wind": 0.0742
+      "Bioenergy": 0.0157,
+      "Coal": 0.0465,
+      "Gas": 0.1465,
+      "Hydro": 0.5673,
+      "Nuclear": 0.1254,
+      "Other Fossil": 0.0102,
+      "Other Renewables": 0.0005,
+      "Solar": 0.0075,
+      "Wind": 0.0804
     }
   },
   "CD": {
@@ -2347,14 +2347,14 @@
     },
     "2022": {
       "Bioenergy": 0.0028,
-      "Coal": 0.016,
+      "Coal": 0.0161,
       "Gas": 0.0248,
       "Hydro": 0.4873,
       "Nuclear": 0.3539,
       "Other Fossil": 0.0545,
       "Other Renewables": 0.0006,
       "Solar": 0.0458,
-      "Wind": 0.0143
+      "Wind": 0.0142
     },
     "2023": {
       "Bioenergy": 0.001,
@@ -2365,18 +2365,18 @@
       "Other Fossil": 0.0501,
       "Other Renewables": 0.0002,
       "Solar": 0.0501,
-      "Wind": 0.0067
+      "Wind": 0.0066
     },
     "2024": {
       "Bioenergy": 0.0001,
-      "Coal": 0.0004,
-      "Gas": 0.0006,
-      "Hydro": 0.5666,
-      "Nuclear": 0.3347,
-      "Other Fossil": 0.0497,
+      "Coal": 0.0003,
+      "Gas": 0.0005,
+      "Hydro": 0.5935,
+      "Nuclear": 0.2994,
+      "Other Fossil": 0.0498,
       "Other Renewables": 0,
-      "Solar": 0.046,
-      "Wind": 0.002
+      "Solar": 0.0545,
+      "Wind": 0.0019
     }
   },
   "CI": {
@@ -2572,15 +2572,15 @@
       "Wind": 0.1187
     },
     "2024": {
-      "Bioenergy": 0.026,
-      "Coal": 0.176,
-      "Gas": 0.1686,
-      "Hydro": 0.2615,
+      "Bioenergy": 0.0256,
+      "Coal": 0.1811,
+      "Gas": 0.1822,
+      "Hydro": 0.2566,
       "Nuclear": 0,
-      "Other Fossil": 0.013,
-      "Other Renewables": 0.0046,
-      "Solar": 0.2355,
-      "Wind": 0.1148
+      "Other Fossil": 0.0134,
+      "Other Renewables": 0.0044,
+      "Solar": 0.2221,
+      "Wind": 0.1145
     }
   },
   "CM": {
@@ -2686,10 +2686,10 @@
       "Wind": 0.0783
     },
     "2022": {
-      "Bioenergy": 0.0189,
+      "Bioenergy": 0.0188,
       "Coal": 0.6238,
       "Gas": 0.0309,
-      "Hydro": 0.1394,
+      "Hydro": 0.1393,
       "Nuclear": 0.0481,
       "Other Fossil": 0.0021,
       "Other Renewables": 0,
@@ -2708,15 +2708,15 @@
       "Wind": 0.0953
     },
     "2024": {
-      "Bioenergy": 0.0186,
-      "Coal": 0.6169,
-      "Gas": 0.0305,
-      "Hydro": 0.0956,
-      "Nuclear": 0.0454,
+      "Bioenergy": 0.0184,
+      "Coal": 0.6095,
+      "Gas": 0.0301,
+      "Hydro": 0.0992,
+      "Nuclear": 0.0462,
       "Other Fossil": 0.002,
       "Other Renewables": 0,
-      "Solar": 0.075,
-      "Wind": 0.1159
+      "Solar": 0.0759,
+      "Wind": 0.1185
     }
   },
   "CO": {
@@ -2777,14 +2777,14 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.1649,
-      "Gas": 0.1023,
-      "Hydro": 0.6805,
+      "Coal": 0.1457,
+      "Gas": 0.0901,
+      "Hydro": 0.7129,
       "Nuclear": 0,
-      "Other Fossil": 0.0085,
+      "Other Fossil": 0.0079,
       "Other Renewables": 0,
-      "Solar": 0.0409,
-      "Wind": 0.003
+      "Solar": 0.0407,
+      "Wind": 0.0027
     }
   },
   "CR": {
@@ -2805,10 +2805,10 @@
       "Gas": 0.0024,
       "Hydro": 0.7191,
       "Nuclear": 0.0003,
-      "Other Fossil": 0.0026,
+      "Other Fossil": 0.0025,
       "Other Renewables": 0.141,
       "Solar": 0.0003,
-      "Wind": 0.1285
+      "Wind": 0.1284
     },
     "2021": {
       "Bioenergy": 0.0066,
@@ -2835,24 +2835,24 @@
     "2023": {
       "Bioenergy": 0.0044,
       "Coal": 0.0013,
-      "Gas": 0.0073,
-      "Hydro": 0.6905,
+      "Gas": 0.0074,
+      "Hydro": 0.6904,
       "Nuclear": 0.0007,
       "Other Fossil": 0.0513,
       "Other Renewables": 0.1206,
-      "Solar": 0.0017,
+      "Solar": 0.0018,
       "Wind": 0.1222
     },
     "2024": {
-      "Bioenergy": 0.0097,
-      "Coal": 0.0017,
-      "Gas": 0.0091,
-      "Hydro": 0.5107,
-      "Nuclear": 0.001,
-      "Other Fossil": 0.1923,
-      "Other Renewables": 0.115,
-      "Solar": 0.003,
-      "Wind": 0.1577
+      "Bioenergy": 0.0077,
+      "Coal": 0.0014,
+      "Gas": 0.0077,
+      "Hydro": 0.5175,
+      "Nuclear": 0.0008,
+      "Other Fossil": 0.2067,
+      "Other Renewables": 0.1173,
+      "Solar": 0.0025,
+      "Wind": 0.1384
     }
   },
   "CU": {
@@ -3053,10 +3053,10 @@
       "Gas": 0,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.8387,
+      "Other Fossil": 0.7861,
       "Other Renewables": 0,
-      "Solar": 0.1291,
-      "Wind": 0.0323
+      "Solar": 0.1658,
+      "Wind": 0.0482
     }
   },
   "CZ": {
@@ -3116,15 +3116,15 @@
       "Wind": 0.0105
     },
     "2024": {
-      "Bioenergy": 0.0337,
-      "Coal": 0.3543,
-      "Gas": 0.051,
-      "Hydro": 0.0437,
-      "Nuclear": 0.4128,
-      "Other Fossil": 0.0141,
-      "Other Renewables": 0.035,
-      "Solar": 0.0427,
-      "Wind": 0.0128
+      "Bioenergy": 0.0355,
+      "Coal": 0.3441,
+      "Gas": 0.0493,
+      "Hydro": 0.0411,
+      "Nuclear": 0.4152,
+      "Other Fossil": 0.0142,
+      "Other Renewables": 0.0362,
+      "Solar": 0.0525,
+      "Wind": 0.012
     }
   },
   "DE": {
@@ -3174,25 +3174,25 @@
     },
     "2023": {
       "Bioenergy": 0.0846,
-      "Coal": 0.2466,
+      "Coal": 0.2467,
       "Gas": 0.1545,
-      "Hydro": 0.0464,
-      "Nuclear": 0.0218,
+      "Hydro": 0.0463,
+      "Nuclear": 0.0217,
       "Other Fossil": 0.0487,
       "Other Renewables": 0.0003,
       "Solar": 0.1251,
       "Wind": 0.2722
     },
     "2024": {
-      "Bioenergy": 0.0882,
-      "Coal": 0.2083,
-      "Gas": 0.1702,
-      "Hydro": 0.0465,
-      "Nuclear": 0.0048,
-      "Other Fossil": 0.0434,
+      "Bioenergy": 0.0897,
+      "Coal": 0.2005,
+      "Gas": 0.1663,
+      "Hydro": 0.0518,
+      "Nuclear": 0.0067,
+      "Other Fossil": 0.0431,
       "Other Renewables": 0.0002,
-      "Solar": 0.1019,
-      "Wind": 0.3365
+      "Solar": 0.1305,
+      "Wind": 0.3111
     }
   },
   "DJ": {
@@ -3310,25 +3310,25 @@
     },
     "2023": {
       "Bioenergy": 0.1058,
-      "Coal": 0.105,
+      "Coal": 0.1052,
       "Gas": 0.0769,
-      "Hydro": 0.0178,
-      "Nuclear": 0.02,
+      "Hydro": 0.0177,
+      "Nuclear": 0.0198,
       "Other Fossil": 0.0358,
       "Other Renewables": 0.0006,
       "Solar": 0.0912,
-      "Wind": 0.5469
+      "Wind": 0.5468
     },
     "2024": {
-      "Bioenergy": 0.1226,
-      "Coal": 0.1084,
-      "Gas": 0.067,
-      "Hydro": 0.004,
-      "Nuclear": 0.0039,
-      "Other Fossil": 0.0337,
-      "Other Renewables": 0.0001,
-      "Solar": 0.0562,
-      "Wind": 0.604
+      "Bioenergy": 0.1174,
+      "Coal": 0.099,
+      "Gas": 0.0659,
+      "Hydro": 0.009,
+      "Nuclear": 0.0084,
+      "Other Fossil": 0.033,
+      "Other Renewables": 0.0003,
+      "Solar": 0.0868,
+      "Wind": 0.58
     }
   },
   "DM": {
@@ -3567,7 +3567,7 @@
       "Other Fossil": 0.151,
       "Other Renewables": 0.0001,
       "Solar": 0.0004,
-      "Wind": 0.0028
+      "Wind": 0.0029
     },
     "2022": {
       "Bioenergy": 0.0115,
@@ -3583,24 +3583,24 @@
     "2023": {
       "Bioenergy": 0.0099,
       "Coal": 0.0013,
-      "Gas": 0.0366,
-      "Hydro": 0.7139,
+      "Gas": 0.0367,
+      "Hydro": 0.7137,
       "Nuclear": 0.0007,
-      "Other Fossil": 0.2265,
+      "Other Fossil": 0.2266,
       "Other Renewables": 0.0002,
       "Solar": 0.0021,
-      "Wind": 0.0087
+      "Wind": 0.0088
     },
     "2024": {
       "Bioenergy": 0.0009,
-      "Coal": 0.0003,
-      "Gas": 0.0276,
-      "Hydro": 0.7389,
-      "Nuclear": 0.0002,
-      "Other Fossil": 0.2279,
-      "Other Renewables": 0,
-      "Solar": 0.0005,
-      "Wind": 0.0039
+      "Coal": 0.0012,
+      "Gas": 0.0329,
+      "Hydro": 0.7158,
+      "Nuclear": 0.0006,
+      "Other Fossil": 0.2392,
+      "Other Renewables": 0.0002,
+      "Solar": 0.002,
+      "Wind": 0.0073
     }
   },
   "EE": {
@@ -3641,7 +3641,7 @@
       "Bioenergy": 0.095,
       "Coal": 0.022,
       "Gas": 0.0357,
-      "Hydro": 0.02,
+      "Hydro": 0.0199,
       "Nuclear": 0.0268,
       "Other Fossil": 0.625,
       "Other Renewables": 0.0009,
@@ -3650,25 +3650,25 @@
     },
     "2023": {
       "Bioenergy": 0.0749,
-      "Coal": 0.0606,
-      "Gas": 0.1001,
-      "Hydro": 0.0707,
-      "Nuclear": 0.0827,
+      "Coal": 0.0612,
+      "Gas": 0.1003,
+      "Hydro": 0.0706,
+      "Nuclear": 0.0822,
       "Other Fossil": 0.3373,
       "Other Renewables": 0.0027,
       "Solar": 0.1152,
-      "Wind": 0.1559
+      "Wind": 0.1556
     },
     "2024": {
-      "Bioenergy": 0.074,
-      "Coal": 0.0591,
-      "Gas": 0.103,
-      "Hydro": 0.0825,
-      "Nuclear": 0.0872,
-      "Other Fossil": 0.3291,
-      "Other Renewables": 0.0028,
-      "Solar": 0.0662,
-      "Wind": 0.1962
+      "Bioenergy": 0.0725,
+      "Coal": 0.0542,
+      "Gas": 0.0945,
+      "Hydro": 0.0767,
+      "Nuclear": 0.0802,
+      "Other Fossil": 0.3275,
+      "Other Renewables": 0.0026,
+      "Solar": 0.1086,
+      "Wind": 0.1831
     }
   },
   "EG": {
@@ -3864,15 +3864,15 @@
       "Wind": 0.249
     },
     "2024": {
-      "Bioenergy": 0.0132,
+      "Bioenergy": 0.0136,
       "Coal": 0.0114,
-      "Gas": 0.1459,
-      "Hydro": 0.182,
-      "Nuclear": 0.2067,
-      "Other Fossil": 0.0092,
-      "Other Renewables": 0.0028,
-      "Solar": 0.1469,
-      "Wind": 0.2819
+      "Gas": 0.1433,
+      "Hydro": 0.1743,
+      "Nuclear": 0.2017,
+      "Other Fossil": 0.0094,
+      "Other Renewables": 0.0029,
+      "Solar": 0.1756,
+      "Wind": 0.2678
     }
   },
   "ET": {
@@ -4000,15 +4000,15 @@
       "Wind": 0.1777
     },
     "2024": {
-      "Bioenergy": 0.1285,
-      "Coal": 0.036,
-      "Gas": 0.0352,
-      "Hydro": 0.1768,
-      "Nuclear": 0.339,
-      "Other Fossil": 0.0517,
+      "Bioenergy": 0.1314,
+      "Coal": 0.0335,
+      "Gas": 0.0313,
+      "Hydro": 0.1892,
+      "Nuclear": 0.3399,
+      "Other Fossil": 0.0492,
       "Other Renewables": 0.0006,
-      "Solar": 0.0117,
-      "Wind": 0.2205
+      "Solar": 0.0115,
+      "Wind": 0.2134
     }
   },
   "FJ": {
@@ -4272,15 +4272,15 @@
       "Wind": 0.1023
     },
     "2024": {
-      "Bioenergy": 0.0055,
-      "Coal": 0.0013,
-      "Gas": 0.0482,
-      "Hydro": 0.1283,
-      "Nuclear": 0.6709,
+      "Bioenergy": 0.0057,
+      "Coal": 0.0011,
+      "Gas": 0.0418,
+      "Hydro": 0.1338,
+      "Nuclear": 0.674,
       "Other Fossil": 0.0057,
       "Other Renewables": 0,
-      "Solar": 0.0336,
-      "Wind": 0.1065
+      "Solar": 0.0381,
+      "Wind": 0.0998
     }
   },
   "GA": {
@@ -4397,26 +4397,26 @@
       "Wind": 0.2817
     },
     "2023": {
-      "Bioenergy": 0.0537,
-      "Coal": 0.0235,
-      "Gas": 0.3522,
+      "Bioenergy": 0.0536,
+      "Coal": 0.0236,
+      "Gas": 0.3523,
       "Hydro": 0.028,
-      "Nuclear": 0.1642,
+      "Nuclear": 0.1641,
       "Other Fossil": 0.0116,
       "Other Renewables": 0.0006,
       "Solar": 0.0521,
-      "Wind": 0.3141
+      "Wind": 0.314
     },
     "2024": {
-      "Bioenergy": 0.0675,
+      "Bioenergy": 0.0706,
       "Coal": 0.029,
-      "Gas": 0.2977,
-      "Hydro": 0.0389,
-      "Nuclear": 0.1451,
-      "Other Fossil": 0.0124,
-      "Other Renewables": 0.0008,
-      "Solar": 0.0412,
-      "Wind": 0.3674
+      "Gas": 0.3013,
+      "Hydro": 0.0416,
+      "Nuclear": 0.1593,
+      "Other Fossil": 0.0131,
+      "Other Renewables": 0.0009,
+      "Solar": 0.0532,
+      "Wind": 0.3308
     }
   },
   "GD": {
@@ -4512,47 +4512,47 @@
     },
     "2021": {
       "Bioenergy": 0.0028,
-      "Coal": 0.0826,
+      "Coal": 0.0825,
       "Gas": 0.1829,
       "Hydro": 0.7006,
       "Nuclear": 0.0072,
       "Other Fossil": 0.0013,
       "Other Renewables": 0.0007,
       "Solar": 0.0055,
-      "Wind": 0.0165
+      "Wind": 0.0166
     },
     "2022": {
       "Bioenergy": 0.0022,
-      "Coal": 0.0601,
+      "Coal": 0.0602,
       "Gas": 0.2365,
       "Hydro": 0.6749,
       "Nuclear": 0.0056,
       "Other Fossil": 0.0011,
       "Other Renewables": 0.0005,
-      "Solar": 0.0048,
-      "Wind": 0.0143
+      "Solar": 0.0047,
+      "Wind": 0.0142
     },
     "2023": {
       "Bioenergy": 0.0013,
-      "Coal": 0.034,
+      "Coal": 0.0341,
       "Gas": 0.249,
       "Hydro": 0.6962,
       "Nuclear": 0.0032,
       "Other Fossil": 0.0005,
       "Other Renewables": 0.0003,
-      "Solar": 0.0033,
-      "Wind": 0.0123
+      "Solar": 0.0031,
+      "Wind": 0.0124
     },
     "2024": {
-      "Bioenergy": 0.0019,
-      "Coal": 0.0514,
-      "Gas": 0.2671,
-      "Hydro": 0.6531,
-      "Nuclear": 0.0046,
-      "Other Fossil": 0.0006,
+      "Bioenergy": 0.0015,
+      "Coal": 0.0422,
+      "Gas": 0.2314,
+      "Hydro": 0.7013,
+      "Nuclear": 0.0037,
+      "Other Fossil": 0.0005,
       "Other Renewables": 0.0004,
-      "Solar": 0.0056,
-      "Wind": 0.0152
+      "Solar": 0.0048,
+      "Wind": 0.0143
     }
   },
   "GF": {
@@ -5146,25 +5146,25 @@
     },
     "2023": {
       "Bioenergy": 0.0031,
-      "Coal": 0.1158,
+      "Coal": 0.116,
       "Gas": 0.3655,
-      "Hydro": 0.0929,
-      "Nuclear": 0.0223,
+      "Hydro": 0.0928,
+      "Nuclear": 0.0221,
       "Other Fossil": 0.0022,
       "Other Renewables": 0.0007,
       "Solar": 0.1779,
-      "Wind": 0.2196
+      "Wind": 0.2195
     },
     "2024": {
-      "Bioenergy": 0.0012,
-      "Coal": 0.0906,
-      "Gas": 0.3675,
-      "Hydro": 0.0677,
-      "Nuclear": 0.0081,
-      "Other Fossil": 0.0008,
-      "Other Renewables": 0.0003,
-      "Solar": 0.1936,
-      "Wind": 0.2702
+      "Bioenergy": 0.0009,
+      "Coal": 0.076,
+      "Gas": 0.3869,
+      "Hydro": 0.0655,
+      "Nuclear": 0.0066,
+      "Other Fossil": 0.0006,
+      "Other Renewables": 0.0002,
+      "Solar": 0.2093,
+      "Wind": 0.2539
     }
   },
   "GT": {
@@ -5476,7 +5476,7 @@
     "2022": {
       "Bioenergy": 0.0078,
       "Coal": 0.5682,
-      "Gas": 0.3416,
+      "Gas": 0.3417,
       "Hydro": 0.0325,
       "Nuclear": 0.0134,
       "Other Fossil": 0.0062,
@@ -5489,21 +5489,21 @@
       "Coal": 0.5694,
       "Gas": 0.3403,
       "Hydro": 0.0289,
-      "Nuclear": 0.0135,
+      "Nuclear": 0.0134,
       "Other Fossil": 0.0055,
       "Other Renewables": 0.0012,
-      "Solar": 0.0158,
+      "Solar": 0.0157,
       "Wind": 0.0176
     },
     "2024": {
-      "Bioenergy": 0.0082,
-      "Coal": 0.5725,
-      "Gas": 0.3404,
-      "Hydro": 0.0209,
-      "Nuclear": 0.0131,
-      "Other Fossil": 0.0053,
+      "Bioenergy": 0.0079,
+      "Coal": 0.5701,
+      "Gas": 0.3402,
+      "Hydro": 0.0227,
+      "Nuclear": 0.0134,
+      "Other Fossil": 0.0052,
       "Other Renewables": 0.0013,
-      "Solar": 0.0175,
+      "Solar": 0.0185,
       "Wind": 0.0207
     }
   },
@@ -5520,10 +5520,10 @@
       "Wind": 0.0736
     },
     "2020": {
-      "Bioenergy": 0.1289,
+      "Bioenergy": 0.1288,
       "Coal": 0.0009,
       "Gas": 0.0057,
-      "Hydro": 0.2248,
+      "Hydro": 0.2249,
       "Nuclear": 0.0005,
       "Other Fossil": 0.4394,
       "Other Renewables": 0.0266,
@@ -5533,7 +5533,7 @@
     "2021": {
       "Bioenergy": 0.1288,
       "Coal": 0.0009,
-      "Gas": 0.0063,
+      "Gas": 0.0062,
       "Hydro": 0.224,
       "Nuclear": 0.0005,
       "Other Fossil": 0.4394,
@@ -5555,24 +5555,24 @@
     "2023": {
       "Bioenergy": 0.1288,
       "Coal": 0.0009,
-      "Gas": 0.0052,
-      "Hydro": 0.2245,
+      "Gas": 0.0053,
+      "Hydro": 0.2244,
       "Nuclear": 0.0005,
       "Other Fossil": 0.4394,
       "Other Renewables": 0.0265,
       "Solar": 0.1,
-      "Wind": 0.0742
+      "Wind": 0.0743
     },
     "2024": {
       "Bioenergy": 0.1288,
       "Coal": 0.0009,
-      "Gas": 0.0047,
-      "Hydro": 0.2252,
+      "Gas": 0.0048,
+      "Hydro": 0.2249,
       "Nuclear": 0.0005,
-      "Other Fossil": 0.4392,
+      "Other Fossil": 0.4393,
       "Other Renewables": 0.0265,
       "Solar": 0.1002,
-      "Wind": 0.0739
+      "Wind": 0.074
     }
   },
   "HR": {
@@ -5611,36 +5611,36 @@
     },
     "2022": {
       "Bioenergy": 0.0449,
-      "Coal": 0.1285,
+      "Coal": 0.1286,
       "Gas": 0.2557,
       "Hydro": 0.2986,
       "Nuclear": 0.0577,
       "Other Fossil": 0.0072,
       "Other Renewables": 0.0245,
       "Solar": 0.0218,
-      "Wind": 0.1611
+      "Wind": 0.161
     },
     "2023": {
       "Bioenergy": 0.0384,
-      "Coal": 0.0892,
-      "Gas": 0.2279,
+      "Coal": 0.0895,
+      "Gas": 0.228,
       "Hydro": 0.4126,
-      "Nuclear": 0.0299,
+      "Nuclear": 0.0297,
       "Other Fossil": 0.009,
       "Other Renewables": 0.0156,
       "Solar": 0.0169,
-      "Wind": 0.1605
+      "Wind": 0.1603
     },
     "2024": {
-      "Bioenergy": 0.0418,
-      "Coal": 0.0216,
-      "Gas": 0.2322,
-      "Hydro": 0.4357,
-      "Nuclear": 0.0327,
-      "Other Fossil": 0.0101,
-      "Other Renewables": 0.0152,
-      "Solar": 0.0175,
-      "Wind": 0.193
+      "Bioenergy": 0.0432,
+      "Coal": 0.0255,
+      "Gas": 0.2289,
+      "Hydro": 0.4215,
+      "Nuclear": 0.04,
+      "Other Fossil": 0.0109,
+      "Other Renewables": 0.0156,
+      "Solar": 0.0246,
+      "Wind": 0.1898
     }
   },
   "HT": {
@@ -5748,7 +5748,7 @@
     "2022": {
       "Bioenergy": 0.0333,
       "Coal": 0.1097,
-      "Gas": 0.2435,
+      "Gas": 0.2436,
       "Hydro": 0.045,
       "Nuclear": 0.3833,
       "Other Fossil": 0.0217,
@@ -5758,25 +5758,25 @@
     },
     "2023": {
       "Bioenergy": 0.0241,
-      "Coal": 0.0986,
-      "Gas": 0.2093,
+      "Coal": 0.099,
+      "Gas": 0.2095,
       "Hydro": 0.0479,
-      "Nuclear": 0.3909,
+      "Nuclear": 0.3906,
       "Other Fossil": 0.0193,
       "Other Renewables": 0.0028,
       "Solar": 0.1596,
-      "Wind": 0.0476
+      "Wind": 0.0474
     },
     "2024": {
-      "Bioenergy": 0.0285,
-      "Coal": 0.0931,
-      "Gas": 0.204,
-      "Hydro": 0.053,
-      "Nuclear": 0.3602,
-      "Other Fossil": 0.019,
-      "Other Renewables": 0.0036,
-      "Solar": 0.1789,
-      "Wind": 0.0597
+      "Bioenergy": 0.0282,
+      "Coal": 0.0948,
+      "Gas": 0.2012,
+      "Hydro": 0.0538,
+      "Nuclear": 0.3773,
+      "Other Fossil": 0.0195,
+      "Other Renewables": 0.0038,
+      "Solar": 0.1652,
+      "Wind": 0.0561
     }
   },
   "ID": {
@@ -5894,25 +5894,25 @@
     },
     "2023": {
       "Bioenergy": 0.0064,
-      "Coal": 0.0518,
-      "Gas": 0.465,
+      "Coal": 0.052,
+      "Gas": 0.4651,
       "Hydro": 0.046,
-      "Nuclear": 0.0203,
+      "Nuclear": 0.0202,
       "Other Fossil": 0.0367,
       "Other Renewables": 0.0007,
       "Solar": 0.0183,
-      "Wind": 0.3546
+      "Wind": 0.3545
     },
     "2024": {
-      "Bioenergy": 0.0063,
-      "Coal": 0.0511,
-      "Gas": 0.4094,
-      "Hydro": 0.0601,
+      "Bioenergy": 0.0064,
+      "Coal": 0.0508,
+      "Gas": 0.4089,
+      "Hydro": 0.0606,
       "Nuclear": 0.0201,
       "Other Fossil": 0.036,
-      "Other Renewables": 0.0006,
-      "Solar": 0.012,
-      "Wind": 0.4044
+      "Other Renewables": 0.0007,
+      "Solar": 0.0132,
+      "Wind": 0.4033
     }
   },
   "IL": {
@@ -6040,15 +6040,15 @@
       "Wind": 0.0482
     },
     "2024": {
-      "Bioenergy": 0.0135,
-      "Coal": 0.7846,
-      "Gas": 0.0171,
-      "Hydro": 0.0487,
-      "Nuclear": 0.0271,
+      "Bioenergy": 0.011,
+      "Coal": 0.7814,
+      "Gas": 0.02,
+      "Hydro": 0.0515,
+      "Nuclear": 0.0278,
       "Other Fossil": 0.0002,
-      "Other Renewables": 0.0017,
-      "Solar": 0.0758,
-      "Wind": 0.0313
+      "Other Renewables": 0.0016,
+      "Solar": 0.0753,
+      "Wind": 0.0311
     }
   },
   "IQ": {
@@ -6302,25 +6302,25 @@
     },
     "2023": {
       "Bioenergy": 0.0561,
-      "Coal": 0.0665,
-      "Gas": 0.4229,
+      "Coal": 0.0668,
+      "Gas": 0.423,
       "Hydro": 0.1518,
-      "Nuclear": 0.0348,
+      "Nuclear": 0.0346,
       "Other Fossil": 0.0329,
       "Other Renewables": 0.0193,
       "Solar": 0.1139,
-      "Wind": 0.1018
+      "Wind": 0.1016
     },
     "2024": {
-      "Bioenergy": 0.0594,
-      "Coal": 0.0424,
-      "Gas": 0.3909,
-      "Hydro": 0.1724,
-      "Nuclear": 0.0414,
-      "Other Fossil": 0.0348,
+      "Bioenergy": 0.0597,
+      "Coal": 0.04,
+      "Gas": 0.3728,
+      "Hydro": 0.1881,
+      "Nuclear": 0.0396,
+      "Other Fossil": 0.0338,
       "Other Renewables": 0.0199,
-      "Solar": 0.1075,
-      "Wind": 0.1313
+      "Solar": 0.1234,
+      "Wind": 0.1227
     }
   },
   "JM": {
@@ -6516,15 +6516,15 @@
       "Wind": 0.0183
     },
     "2024": {
-      "Bioenergy": 0.061,
-      "Coal": 0.31,
-      "Gas": 0.3307,
-      "Hydro": 0.0635,
-      "Nuclear": 0.083,
-      "Other Fossil": 0.0455,
-      "Other Renewables": 0.0102,
-      "Solar": 0.0848,
-      "Wind": 0.0112
+      "Bioenergy": 0.0571,
+      "Coal": 0.2915,
+      "Gas": 0.3133,
+      "Hydro": 0.0682,
+      "Nuclear": 0.0825,
+      "Other Fossil": 0.0391,
+      "Other Renewables": 0.0088,
+      "Solar": 0.1187,
+      "Wind": 0.0208
     }
   },
   "KE": {
@@ -6688,7 +6688,7 @@
     },
     "2021": {
       "Bioenergy": 0.0133,
-      "Coal": 0.4781,
+      "Coal": 0.478,
       "Gas": 0.0286,
       "Hydro": 0.3725,
       "Nuclear": 0.0138,
@@ -6720,15 +6720,15 @@
       "Wind": 0.0181
     },
     "2024": {
-      "Bioenergy": 0.0139,
-      "Coal": 0.4798,
-      "Gas": 0.026,
-      "Hydro": 0.3603,
-      "Nuclear": 0.0135,
-      "Other Fossil": 0.0563,
+      "Bioenergy": 0.0136,
+      "Coal": 0.4772,
+      "Gas": 0.0258,
+      "Hydro": 0.3622,
+      "Nuclear": 0.0138,
+      "Other Fossil": 0.0562,
       "Other Renewables": 0.0013,
-      "Solar": 0.0277,
-      "Wind": 0.0212
+      "Solar": 0.0287,
+      "Wind": 0.0213
     }
   },
   "KI": {
@@ -7060,15 +7060,15 @@
       "Wind": 0.0058
     },
     "2024": {
-      "Bioenergy": 0.0219,
-      "Coal": 0.2931,
-      "Gas": 0.2953,
-      "Hydro": 0.0053,
-      "Nuclear": 0.3079,
-      "Other Fossil": 0.0073,
-      "Other Renewables": 0.0131,
-      "Solar": 0.0485,
-      "Wind": 0.0074
+      "Bioenergy": 0.022,
+      "Coal": 0.2867,
+      "Gas": 0.2966,
+      "Hydro": 0.0054,
+      "Nuclear": 0.3103,
+      "Other Fossil": 0.0072,
+      "Other Renewables": 0.0132,
+      "Solar": 0.051,
+      "Wind": 0.0076
     }
   },
   "KW": {
@@ -7265,14 +7265,14 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.6786,
-      "Gas": 0.2088,
-      "Hydro": 0.062,
+      "Coal": 0.6631,
+      "Gas": 0.2041,
+      "Hydro": 0.0791,
       "Nuclear": 0,
-      "Other Fossil": 0.0009,
+      "Other Fossil": 0.0006,
       "Other Renewables": 0,
-      "Solar": 0.0116,
-      "Wind": 0.0382
+      "Solar": 0.0143,
+      "Wind": 0.0388
     }
   },
   "LA": {
@@ -7719,36 +7719,36 @@
     },
     "2022": {
       "Bioenergy": 0.0516,
-      "Coal": 0.1199,
+      "Coal": 0.12,
       "Gas": 0.2272,
       "Hydro": 0.1433,
       "Nuclear": 0.1415,
       "Other Fossil": 0.0465,
       "Other Renewables": 0.0047,
       "Solar": 0.0635,
-      "Wind": 0.2018
+      "Wind": 0.2017
     },
     "2023": {
       "Bioenergy": 0.0386,
-      "Coal": 0.088,
-      "Gas": 0.196,
-      "Hydro": 0.1355,
-      "Nuclear": 0.1205,
+      "Coal": 0.089,
+      "Gas": 0.1963,
+      "Hydro": 0.1353,
+      "Nuclear": 0.1198,
       "Other Fossil": 0.0571,
       "Other Renewables": 0.0039,
       "Solar": 0.0882,
-      "Wind": 0.2723
+      "Wind": 0.2718
     },
     "2024": {
-      "Bioenergy": 0.0315,
-      "Coal": 0.0645,
-      "Gas": 0.1793,
-      "Hydro": 0.1335,
-      "Nuclear": 0.0945,
-      "Other Fossil": 0.0669,
+      "Bioenergy": 0.032,
+      "Coal": 0.0614,
+      "Gas": 0.166,
+      "Hydro": 0.1304,
+      "Nuclear": 0.0915,
+      "Other Fossil": 0.071,
       "Other Renewables": 0.003,
-      "Solar": 0.0739,
-      "Wind": 0.353
+      "Solar": 0.1107,
+      "Wind": 0.334
     }
   },
   "LU": {
@@ -7787,36 +7787,36 @@
     },
     "2022": {
       "Bioenergy": 0.0844,
-      "Coal": 0.1274,
-      "Gas": 0.2281,
+      "Coal": 0.1275,
+      "Gas": 0.2282,
       "Hydro": 0.1307,
       "Nuclear": 0.1504,
       "Other Fossil": 0.0376,
       "Other Renewables": 0.005,
       "Solar": 0.0873,
-      "Wind": 0.149
+      "Wind": 0.1489
     },
     "2023": {
       "Bioenergy": 0.0551,
-      "Coal": 0.1096,
-      "Gas": 0.1992,
-      "Hydro": 0.1449,
-      "Nuclear": 0.1509,
+      "Coal": 0.1108,
+      "Gas": 0.1997,
+      "Hydro": 0.1447,
+      "Nuclear": 0.1501,
       "Other Fossil": 0.0362,
       "Other Renewables": 0.0049,
       "Solar": 0.0979,
-      "Wind": 0.2013
+      "Wind": 0.2007
     },
     "2024": {
-      "Bioenergy": 0.0509,
-      "Coal": 0.098,
-      "Gas": 0.1951,
-      "Hydro": 0.161,
-      "Nuclear": 0.1448,
-      "Other Fossil": 0.0376,
-      "Other Renewables": 0.0046,
-      "Solar": 0.0782,
-      "Wind": 0.2298
+      "Bioenergy": 0.0555,
+      "Coal": 0.0956,
+      "Gas": 0.1864,
+      "Hydro": 0.1646,
+      "Nuclear": 0.1441,
+      "Other Fossil": 0.0378,
+      "Other Renewables": 0.0047,
+      "Solar": 0.0977,
+      "Wind": 0.2137
     }
   },
   "LV": {
@@ -7866,25 +7866,25 @@
     },
     "2023": {
       "Bioenergy": 0.0374,
-      "Coal": 0.0389,
-      "Gas": 0.2535,
-      "Hydro": 0.4974,
-      "Nuclear": 0.0581,
+      "Coal": 0.0396,
+      "Gas": 0.2537,
+      "Hydro": 0.4973,
+      "Nuclear": 0.0576,
       "Other Fossil": 0.0243,
       "Other Renewables": 0.0019,
       "Solar": 0.0231,
-      "Wind": 0.0653
+      "Wind": 0.065
     },
     "2024": {
-      "Bioenergy": 0.0251,
-      "Coal": 0,
-      "Gas": 0.3078,
-      "Hydro": 0.6258,
-      "Nuclear": 0,
-      "Other Fossil": 0.0125,
-      "Other Renewables": 0,
-      "Solar": 0,
-      "Wind": 0.0287
+      "Bioenergy": 0.0287,
+      "Coal": 0.0021,
+      "Gas": 0.2607,
+      "Hydro": 0.6592,
+      "Nuclear": 0.0036,
+      "Other Fossil": 0.0144,
+      "Other Renewables": 0.0001,
+      "Solar": 0.002,
+      "Wind": 0.0293
     }
   },
   "LY": {
@@ -8059,7 +8059,7 @@
     },
     "2022": {
       "Bioenergy": 0.0048,
-      "Coal": 0.0276,
+      "Coal": 0.0277,
       "Gas": 0.8344,
       "Hydro": 0.0718,
       "Nuclear": 0.0309,
@@ -8080,15 +8080,15 @@
       "Wind": 0.0094
     },
     "2024": {
-      "Bioenergy": 0.0014,
-      "Coal": 0.0073,
-      "Gas": 0.8994,
-      "Hydro": 0.0503,
-      "Nuclear": 0.0101,
-      "Other Fossil": 0.001,
+      "Bioenergy": 0.0012,
+      "Coal": 0.006,
+      "Gas": 0.9049,
+      "Hydro": 0.0496,
+      "Nuclear": 0.0083,
+      "Other Fossil": 0.0008,
       "Other Renewables": 0.0003,
-      "Solar": 0.0015,
-      "Wind": 0.0286
+      "Solar": 0.0012,
+      "Wind": 0.0277
     }
   },
   "ME": {
@@ -8127,7 +8127,7 @@
     },
     "2022": {
       "Bioenergy": 0.0008,
-      "Coal": 0.4678,
+      "Coal": 0.4679,
       "Gas": 0.0079,
       "Hydro": 0.4114,
       "Nuclear": 0.0058,
@@ -8138,25 +8138,25 @@
     },
     "2023": {
       "Bioenergy": 0.0008,
-      "Coal": 0.3958,
+      "Coal": 0.3959,
       "Gas": 0.0073,
       "Hydro": 0.4976,
-      "Nuclear": 0.0061,
+      "Nuclear": 0.006,
       "Other Fossil": 0.0006,
       "Other Renewables": 0.0002,
       "Solar": 0.0028,
-      "Wind": 0.089
+      "Wind": 0.0889
     },
     "2024": {
-      "Bioenergy": 0,
-      "Coal": 0.3405,
-      "Gas": 0,
-      "Hydro": 0.5477,
-      "Nuclear": 0,
-      "Other Fossil": 0,
-      "Other Renewables": 0,
-      "Solar": 0.0154,
-      "Wind": 0.0964
+      "Bioenergy": 0.0012,
+      "Coal": 0.3118,
+      "Gas": 0.0075,
+      "Hydro": 0.5578,
+      "Nuclear": 0.0075,
+      "Other Fossil": 0.0007,
+      "Other Renewables": 0.0003,
+      "Solar": 0.0042,
+      "Wind": 0.1092
     }
   },
   "MG": {
@@ -8284,15 +8284,15 @@
       "Wind": 0.0285
     },
     "2024": {
-      "Bioenergy": 0.0015,
-      "Coal": 0.4388,
-      "Gas": 0.2698,
-      "Hydro": 0.2172,
-      "Nuclear": 0.0111,
-      "Other Fossil": 0.0011,
+      "Bioenergy": 0.0012,
+      "Coal": 0.4486,
+      "Gas": 0.2686,
+      "Hydro": 0.2126,
+      "Nuclear": 0.009,
+      "Other Fossil": 0.0009,
       "Other Renewables": 0.0003,
-      "Solar": 0.018,
-      "Wind": 0.0423
+      "Solar": 0.0179,
+      "Wind": 0.0409
     }
   },
   "ML": {
@@ -8489,14 +8489,14 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.9105,
+      "Coal": 0.9088,
       "Gas": 0,
       "Hydro": 0,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
       "Solar": 0,
-      "Wind": 0.0895
+      "Wind": 0.0912
     }
   },
   "MO": {
@@ -8531,14 +8531,14 @@
       "Other Fossil": 0.0372,
       "Other Renewables": 0.0041,
       "Solar": 0.0357,
-      "Wind": 0.0488
+      "Wind": 0.0489
     },
     "2022": {
       "Bioenergy": 0.0546,
-      "Coal": 0.4813,
+      "Coal": 0.4814,
       "Gas": 0.1678,
-      "Hydro": 0.1109,
-      "Nuclear": 0.0457,
+      "Hydro": 0.1108,
+      "Nuclear": 0.0456,
       "Other Fossil": 0.0377,
       "Other Renewables": 0.0042,
       "Solar": 0.0436,
@@ -8546,25 +8546,25 @@
     },
     "2023": {
       "Bioenergy": 0.0549,
-      "Coal": 0.4853,
-      "Gas": 0.1631,
-      "Hydro": 0.0987,
-      "Nuclear": 0.046,
-      "Other Fossil": 0.0353,
+      "Coal": 0.4854,
+      "Gas": 0.1633,
+      "Hydro": 0.0986,
+      "Nuclear": 0.0458,
+      "Other Fossil": 0.0354,
       "Other Renewables": 0.0042,
-      "Solar": 0.0525,
+      "Solar": 0.0524,
       "Wind": 0.0601
     },
     "2024": {
-      "Bioenergy": 0.0562,
-      "Coal": 0.4961,
-      "Gas": 0.1636,
-      "Hydro": 0.0711,
-      "Nuclear": 0.0448,
-      "Other Fossil": 0.0346,
-      "Other Renewables": 0.0044,
-      "Solar": 0.0585,
-      "Wind": 0.0706
+      "Bioenergy": 0.0551,
+      "Coal": 0.4877,
+      "Gas": 0.163,
+      "Hydro": 0.0774,
+      "Nuclear": 0.0457,
+      "Other Fossil": 0.0343,
+      "Other Renewables": 0.0043,
+      "Solar": 0.0618,
+      "Wind": 0.0707
     }
   },
   "MQ": {
@@ -8818,25 +8818,25 @@
     },
     "2023": {
       "Bioenergy": 0.006,
-      "Coal": 0.0317,
-      "Gas": 0.7207,
+      "Coal": 0.0321,
+      "Gas": 0.7208,
       "Hydro": 0.0376,
-      "Nuclear": 0.044,
+      "Nuclear": 0.0437,
       "Other Fossil": 0.0111,
       "Other Renewables": 0.0014,
       "Solar": 0.119,
-      "Wind": 0.0284
+      "Wind": 0.0282
     },
     "2024": {
-      "Bioenergy": 0.0072,
-      "Coal": 0.0341,
-      "Gas": 0.6929,
-      "Hydro": 0.0473,
-      "Nuclear": 0.0502,
-      "Other Fossil": 0.0048,
+      "Bioenergy": 0.0073,
+      "Coal": 0.0327,
+      "Gas": 0.6911,
+      "Hydro": 0.0476,
+      "Nuclear": 0.0491,
+      "Other Fossil": 0.0046,
       "Other Renewables": 0.0016,
-      "Solar": 0.1233,
-      "Wind": 0.0385
+      "Solar": 0.1308,
+      "Wind": 0.0351
     }
   },
   "MU": {
@@ -9100,15 +9100,15 @@
       "Wind": 0.0598
     },
     "2024": {
-      "Bioenergy": 0.0006,
-      "Coal": 0.0751,
-      "Gas": 0.5684,
-      "Hydro": 0.0437,
-      "Nuclear": 0.0365,
-      "Other Fossil": 0.1414,
-      "Other Renewables": 0.012,
-      "Solar": 0.0537,
-      "Wind": 0.0687
+      "Bioenergy": 0.0005,
+      "Coal": 0.0736,
+      "Gas": 0.569,
+      "Hydro": 0.0483,
+      "Nuclear": 0.0303,
+      "Other Fossil": 0.1419,
+      "Other Renewables": 0.0116,
+      "Solar": 0.0553,
+      "Wind": 0.0696
     }
   },
   "MY": {
@@ -9510,8 +9510,8 @@
     "2024": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.7469,
-      "Hydro": 0.2531,
+      "Gas": 0.7627,
+      "Hydro": 0.2373,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
@@ -9545,7 +9545,7 @@
     "2021": {
       "Bioenergy": 0.1685,
       "Coal": 0.0037,
-      "Gas": 0.0244,
+      "Gas": 0.0243,
       "Hydro": 0.0847,
       "Nuclear": 0.002,
       "Other Fossil": 0.3992,
@@ -9565,26 +9565,26 @@
       "Wind": 0.1528
     },
     "2023": {
-      "Bioenergy": 0.1684,
+      "Bioenergy": 0.1685,
       "Coal": 0.0034,
-      "Gas": 0.0203,
-      "Hydro": 0.0863,
+      "Gas": 0.0205,
+      "Hydro": 0.0859,
       "Nuclear": 0.0018,
-      "Other Fossil": 0.3991,
+      "Other Fossil": 0.3992,
       "Other Renewables": 0.1562,
       "Solar": 0.011,
-      "Wind": 0.1534
+      "Wind": 0.1535
     },
     "2024": {
-      "Bioenergy": 0.1683,
-      "Coal": 0.0034,
-      "Gas": 0.0184,
-      "Hydro": 0.0892,
+      "Bioenergy": 0.1684,
+      "Coal": 0.0035,
+      "Gas": 0.0187,
+      "Hydro": 0.0882,
       "Nuclear": 0.002,
-      "Other Fossil": 0.3984,
+      "Other Fossil": 0.3987,
       "Other Renewables": 0.1562,
       "Solar": 0.0121,
-      "Wind": 0.152
+      "Wind": 0.1523
     }
   },
   "NL": {
@@ -9644,15 +9644,15 @@
       "Wind": 0.2466
     },
     "2024": {
-      "Bioenergy": 0.0454,
-      "Coal": 0.0835,
-      "Gas": 0.3664,
-      "Hydro": 0,
-      "Nuclear": 0.0263,
-      "Other Fossil": 0.013,
-      "Other Renewables": 0.0033,
-      "Solar": 0.1249,
-      "Wind": 0.3371
+      "Bioenergy": 0.0617,
+      "Coal": 0.0587,
+      "Gas": 0.368,
+      "Hydro": 0.004,
+      "Nuclear": 0.0242,
+      "Other Fossil": 0.012,
+      "Other Renewables": 0.004,
+      "Solar": 0.1645,
+      "Wind": 0.3031
     }
   },
   "NO": {
@@ -9714,13 +9714,13 @@
     "2024": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.0105,
-      "Hydro": 0.8824,
+      "Gas": 0.0107,
+      "Hydro": 0.8878,
       "Nuclear": 0,
-      "Other Fossil": 0.0016,
-      "Other Renewables": 0.0023,
+      "Other Fossil": 0.0017,
+      "Other Renewables": 0.0025,
       "Solar": 0,
-      "Wind": 0.1032
+      "Wind": 0.0972
     }
   },
   "NP": {
@@ -9748,7 +9748,7 @@
     },
     "2021": {
       "Bioenergy": 0.004,
-      "Coal": 0.1197,
+      "Coal": 0.1196,
       "Gas": 0.0232,
       "Hydro": 0.8082,
       "Nuclear": 0.0112,
@@ -9765,13 +9765,13 @@
       "Nuclear": 0.0111,
       "Other Fossil": 0.0021,
       "Other Renewables": 0.001,
-      "Solar": 0.0197,
+      "Solar": 0.0196,
       "Wind": 0.0145
     },
     "2023": {
       "Bioenergy": 0.0042,
       "Coal": 0.1184,
-      "Gas": 0.0209,
+      "Gas": 0.021,
       "Hydro": 0.805,
       "Nuclear": 0.0112,
       "Other Fossil": 0.0015,
@@ -9780,14 +9780,14 @@
       "Wind": 0.0159
     },
     "2024": {
-      "Bioenergy": 0.0045,
-      "Coal": 0.121,
-      "Gas": 0.0211,
-      "Hydro": 0.7983,
-      "Nuclear": 0.0109,
+      "Bioenergy": 0.0042,
+      "Coal": 0.119,
+      "Gas": 0.0209,
+      "Hydro": 0.7998,
+      "Nuclear": 0.0112,
       "Other Fossil": 0.0013,
       "Other Renewables": 0.0011,
-      "Solar": 0.0233,
+      "Solar": 0.0241,
       "Wind": 0.0185
     }
   },
@@ -9985,14 +9985,14 @@
     },
     "2024": {
       "Bioenergy": 0.0061,
-      "Coal": 0.0359,
-      "Gas": 0.1108,
-      "Hydro": 0.5707,
+      "Coal": 0.0391,
+      "Gas": 0.1093,
+      "Hydro": 0.5687,
       "Nuclear": 0,
       "Other Fossil": 0,
-      "Other Renewables": 0.1895,
+      "Other Renewables": 0.1918,
       "Solar": 0,
-      "Wind": 0.0871
+      "Wind": 0.0849
     }
   },
   "OM": {
@@ -10188,15 +10188,15 @@
       "Wind": 0.0404
     },
     "2024": {
-      "Bioenergy": 0.005,
+      "Bioenergy": 0.0052,
       "Coal": 0,
-      "Gas": 0.2899,
-      "Hydro": 0.6312,
+      "Gas": 0.2833,
+      "Hydro": 0.6358,
       "Nuclear": 0,
-      "Other Fossil": 0.002,
+      "Other Fossil": 0.0024,
       "Other Renewables": 0,
-      "Solar": 0.019,
-      "Wind": 0.053
+      "Solar": 0.0188,
+      "Wind": 0.0545
     }
   },
   "PF": {
@@ -10392,15 +10392,15 @@
       "Wind": 0.0112
     },
     "2024": {
-      "Bioenergy": 0.0103,
-      "Coal": 0.6149,
-      "Gas": 0.1462,
-      "Hydro": 0.0808,
+      "Bioenergy": 0.0102,
+      "Coal": 0.6198,
+      "Gas": 0.1437,
+      "Hydro": 0.0788,
       "Nuclear": 0,
-      "Other Fossil": 0.0068,
-      "Other Renewables": 0.0915,
-      "Solar": 0.0324,
-      "Wind": 0.0172
+      "Other Fossil": 0.007,
+      "Other Renewables": 0.091,
+      "Solar": 0.0327,
+      "Wind": 0.0168
     }
   },
   "PK": {
@@ -10460,15 +10460,15 @@
       "Wind": 0.0338
     },
     "2024": {
-      "Bioenergy": 0.0118,
-      "Coal": 0.153,
-      "Gas": 0.3089,
-      "Hydro": 0.2273,
-      "Nuclear": 0.2401,
-      "Other Fossil": 0.0271,
+      "Bioenergy": 0.0101,
+      "Coal": 0.1415,
+      "Gas": 0.3327,
+      "Hydro": 0.223,
+      "Nuclear": 0.2351,
+      "Other Fossil": 0.0209,
       "Other Renewables": 0,
-      "Solar": 0.0115,
-      "Wind": 0.0204
+      "Solar": 0.0116,
+      "Wind": 0.0251
     }
   },
   "PL": {
@@ -10528,15 +10528,15 @@
       "Wind": 0.1447
     },
     "2024": {
-      "Bioenergy": 0.0107,
-      "Coal": 0.5799,
-      "Gas": 0.1026,
-      "Hydro": 0.0221,
-      "Nuclear": 0.0054,
-      "Other Fossil": 0.0222,
+      "Bioenergy": 0.0111,
+      "Coal": 0.5759,
+      "Gas": 0.094,
+      "Hydro": 0.0211,
+      "Nuclear": 0.0053,
+      "Other Fossil": 0.0219,
       "Other Renewables": 0.0002,
-      "Solar": 0.0725,
-      "Wind": 0.1843
+      "Solar": 0.098,
+      "Wind": 0.1725
     }
   },
   "PM": {
@@ -10632,47 +10632,47 @@
     },
     "2021": {
       "Bioenergy": 0,
-      "Coal": 0.1762,
-      "Gas": 0.4323,
+      "Coal": 0.1744,
+      "Gas": 0.4279,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.3687,
+      "Other Fossil": 0.3714,
       "Other Renewables": 0,
-      "Solar": 0.0131,
-      "Wind": 0.0098
+      "Solar": 0.0167,
+      "Wind": 0.0097
     },
     "2022": {
       "Bioenergy": 0,
-      "Coal": 0.17,
-      "Gas": 0.3217,
+      "Coal": 0.167,
+      "Gas": 0.3251,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.486,
+      "Other Fossil": 0.4837,
       "Other Renewables": 0,
-      "Solar": 0.0131,
-      "Wind": 0.0091
+      "Solar": 0.0151,
+      "Wind": 0.009
     },
     "2023": {
       "Bioenergy": 0,
-      "Coal": 0.1556,
-      "Gas": 0.4345,
+      "Coal": 0.1555,
+      "Gas": 0.4343,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.3918,
+      "Other Fossil": 0.3916,
       "Other Renewables": 0,
-      "Solar": 0.0129,
+      "Solar": 0.0134,
       "Wind": 0.0053
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.1981,
-      "Gas": 0.4646,
+      "Coal": 0.2314,
+      "Gas": 0.4732,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.3184,
+      "Other Fossil": 0.2729,
       "Other Renewables": 0,
-      "Solar": 0.0094,
-      "Wind": 0.0094
+      "Solar": 0.0138,
+      "Wind": 0.0086
     }
   },
   "PS": {
@@ -10789,26 +10789,26 @@
       "Wind": 0.2774
     },
     "2023": {
-      "Bioenergy": 0.064,
-      "Coal": 0.0289,
-      "Gas": 0.2488,
+      "Bioenergy": 0.0639,
+      "Coal": 0.0294,
+      "Gas": 0.249,
       "Hydro": 0.2345,
-      "Nuclear": 0.0425,
+      "Nuclear": 0.0422,
       "Other Fossil": 0.0079,
       "Other Renewables": 0.0014,
       "Solar": 0.0881,
-      "Wind": 0.2839
+      "Wind": 0.2837
     },
     "2024": {
-      "Bioenergy": 0.0601,
-      "Coal": 0.0031,
-      "Gas": 0.1076,
-      "Hydro": 0.4213,
-      "Nuclear": 0.0043,
-      "Other Fossil": 0.0052,
-      "Other Renewables": 0.0001,
-      "Solar": 0.0714,
-      "Wind": 0.3269
+      "Bioenergy": 0.0659,
+      "Coal": 0.0037,
+      "Gas": 0.0992,
+      "Hydro": 0.3997,
+      "Nuclear": 0.0055,
+      "Other Fossil": 0.0056,
+      "Other Renewables": 0.0002,
+      "Solar": 0.0879,
+      "Wind": 0.3324
     }
   },
   "PY": {
@@ -10824,10 +10824,10 @@
       "Wind": 0
     },
     "2020": {
-      "Bioenergy": 0.0051,
+      "Bioenergy": 0.0028,
       "Coal": 0,
       "Gas": 0,
-      "Hydro": 0.9949,
+      "Hydro": 0.9972,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
@@ -10835,10 +10835,10 @@
       "Wind": 0
     },
     "2021": {
-      "Bioenergy": 0.006,
+      "Bioenergy": 0.0028,
       "Coal": 0,
       "Gas": 0,
-      "Hydro": 0.994,
+      "Hydro": 0.9972,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
@@ -10846,10 +10846,10 @@
       "Wind": 0
     },
     "2022": {
-      "Bioenergy": 0.0057,
+      "Bioenergy": 0.0028,
       "Coal": 0,
       "Gas": 0,
-      "Hydro": 0.9943,
+      "Hydro": 0.9972,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
@@ -10857,10 +10857,10 @@
       "Wind": 0
     },
     "2023": {
-      "Bioenergy": 0.0046,
+      "Bioenergy": 0.0028,
       "Coal": 0,
       "Gas": 0,
-      "Hydro": 0.9954,
+      "Hydro": 0.9972,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
@@ -10868,10 +10868,10 @@
       "Wind": 0
     },
     "2024": {
-      "Bioenergy": 0.0046,
+      "Bioenergy": 0.0028,
       "Coal": 0,
       "Gas": 0,
-      "Hydro": 0.9954,
+      "Hydro": 0.9972,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
@@ -11072,15 +11072,15 @@
       "Wind": 0.1314
     },
     "2024": {
-      "Bioenergy": 0.0085,
-      "Coal": 0.1137,
-      "Gas": 0.197,
-      "Hydro": 0.3066,
-      "Nuclear": 0.208,
-      "Other Fossil": 0.0002,
-      "Other Renewables": 0.0001,
-      "Solar": 0.029,
-      "Wind": 0.137
+      "Bioenergy": 0.0094,
+      "Coal": 0.1192,
+      "Gas": 0.1799,
+      "Hydro": 0.3156,
+      "Nuclear": 0.2053,
+      "Other Fossil": 0.0005,
+      "Other Renewables": 0.0002,
+      "Solar": 0.0363,
+      "Wind": 0.1335
     }
   },
   "RS": {
@@ -11140,15 +11140,15 @@
       "Wind": 0.0268
     },
     "2024": {
-      "Bioenergy": 0.0074,
-      "Coal": 0.59,
-      "Gas": 0.0113,
-      "Hydro": 0.3486,
-      "Nuclear": 0,
-      "Other Fossil": 0.0066,
-      "Other Renewables": 0,
-      "Solar": 0,
-      "Wind": 0.0361
+      "Bioenergy": 0.008,
+      "Coal": 0.5832,
+      "Gas": 0.0124,
+      "Hydro": 0.3453,
+      "Nuclear": 0.0031,
+      "Other Fossil": 0.0071,
+      "Other Renewables": 0.0001,
+      "Solar": 0.0017,
+      "Wind": 0.039
     }
   },
   "RU": {
@@ -11209,14 +11209,14 @@
     },
     "2024": {
       "Bioenergy": 0.0008,
-      "Coal": 0.1753,
-      "Gas": 0.4867,
-      "Hydro": 0.1519,
-      "Nuclear": 0.1688,
+      "Coal": 0.1747,
+      "Gas": 0.485,
+      "Hydro": 0.1535,
+      "Nuclear": 0.1696,
       "Other Fossil": 0.0108,
       "Other Renewables": 0,
-      "Solar": 0.001,
-      "Wind": 0.0047
+      "Solar": 0.0011,
+      "Wind": 0.0046
     }
   },
   "RW": {
@@ -11616,15 +11616,15 @@
       "Wind": 0.2198
     },
     "2024": {
-      "Bioenergy": 0.0496,
+      "Bioenergy": 0.0479,
       "Coal": 0,
       "Gas": 0,
-      "Hydro": 0.411,
-      "Nuclear": 0.2972,
+      "Hydro": 0.4196,
+      "Nuclear": 0.2963,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0044,
-      "Wind": 0.2378
+      "Solar": 0.008,
+      "Wind": 0.2282
     }
   },
   "SG": {
@@ -11799,7 +11799,7 @@
     },
     "2022": {
       "Bioenergy": 0.0089,
-      "Coal": 0.2262,
+      "Coal": 0.2263,
       "Gas": 0.0593,
       "Hydro": 0.241,
       "Nuclear": 0.4159,
@@ -11817,18 +11817,18 @@
       "Other Fossil": 0.0092,
       "Other Renewables": 0.0003,
       "Solar": 0.0222,
-      "Wind": 0.0059
+      "Wind": 0.0058
     },
     "2024": {
-      "Bioenergy": 0.0095,
-      "Coal": 0.234,
-      "Gas": 0.0411,
-      "Hydro": 0.3608,
-      "Nuclear": 0.3104,
-      "Other Fossil": 0.0049,
-      "Other Renewables": 0.0003,
-      "Solar": 0.0327,
-      "Wind": 0.0064
+      "Bioenergy": 0.0093,
+      "Coal": 0.2041,
+      "Gas": 0.0385,
+      "Hydro": 0.3794,
+      "Nuclear": 0.3236,
+      "Other Fossil": 0.004,
+      "Other Renewables": 0.0002,
+      "Solar": 0.0355,
+      "Wind": 0.0053
     }
   },
   "SK": {
@@ -11888,14 +11888,14 @@
       "Wind": 0
     },
     "2024": {
-      "Bioenergy": 0.0296,
-      "Coal": 0.0207,
-      "Gas": 0.0684,
-      "Hydro": 0.1881,
-      "Nuclear": 0.6164,
-      "Other Fossil": 0.0479,
-      "Other Renewables": 0.0148,
-      "Solar": 0.0141,
+      "Bioenergy": 0.0314,
+      "Coal": 0.0169,
+      "Gas": 0.0676,
+      "Hydro": 0.1861,
+      "Nuclear": 0.6181,
+      "Other Fossil": 0.0463,
+      "Other Renewables": 0.0157,
+      "Solar": 0.0178,
       "Wind": 0
     }
   },
@@ -12344,10 +12344,10 @@
     "2022": {
       "Bioenergy": 0.0757,
       "Coal": 0.002,
-      "Gas": 0.1526,
-      "Hydro": 0.3217,
+      "Gas": 0.1525,
+      "Hydro": 0.3218,
       "Nuclear": 0.0012,
-      "Other Fossil": 0.0729,
+      "Other Fossil": 0.0728,
       "Other Renewables": 0.197,
       "Solar": 0.1536,
       "Wind": 0.0233
@@ -12356,23 +12356,23 @@
       "Bioenergy": 0.0659,
       "Coal": 0.0001,
       "Gas": 0.3046,
-      "Hydro": 0.1934,
+      "Hydro": 0.1933,
       "Nuclear": 0.0001,
       "Other Fossil": 0.0835,
       "Other Renewables": 0.1819,
       "Solar": 0.149,
-      "Wind": 0.0215
+      "Wind": 0.0216
     },
     "2024": {
       "Bioenergy": 0.1616,
       "Coal": 0.0013,
-      "Gas": 0.265,
-      "Hydro": 0.1776,
-      "Nuclear": 0.0008,
-      "Other Fossil": 0.002,
+      "Gas": 0.2651,
+      "Hydro": 0.1772,
+      "Nuclear": 0.0007,
+      "Other Fossil": 0.0021,
       "Other Renewables": 0.1776,
       "Solar": 0.1636,
-      "Wind": 0.0507
+      "Wind": 0.0509
     }
   },
   "SY": {
@@ -12751,36 +12751,36 @@
     },
     "2022": {
       "Bioenergy": 0.0679,
-      "Coal": 0.2534,
+      "Coal": 0.2533,
       "Gas": 0.5526,
       "Hydro": 0.0521,
-      "Nuclear": 0.0083,
+      "Nuclear": 0.0082,
       "Other Fossil": 0.0096,
       "Other Renewables": 0.0008,
-      "Solar": 0.0316,
+      "Solar": 0.0317,
       "Wind": 0.0238
     },
     "2023": {
       "Bioenergy": 0.0674,
       "Coal": 0.2158,
-      "Gas": 0.5991,
+      "Gas": 0.5992,
       "Hydro": 0.0465,
       "Nuclear": 0.0074,
-      "Other Fossil": 0.005,
+      "Other Fossil": 0.0051,
       "Other Renewables": 0.0007,
       "Solar": 0.0318,
       "Wind": 0.0263
     },
     "2024": {
-      "Bioenergy": 0.0718,
-      "Coal": 0.2151,
-      "Gas": 0.6061,
-      "Hydro": 0.0432,
-      "Nuclear": 0.0055,
-      "Other Fossil": 0.0011,
-      "Other Renewables": 0.0005,
-      "Solar": 0.0311,
-      "Wind": 0.0258
+      "Bioenergy": 0.0536,
+      "Coal": 0.22,
+      "Gas": 0.6107,
+      "Hydro": 0.0438,
+      "Nuclear": 0.0071,
+      "Other Fossil": 0.0009,
+      "Other Renewables": 0.0007,
+      "Solar": 0.0382,
+      "Wind": 0.0251
     }
   },
   "TJ": {
@@ -13170,7 +13170,7 @@
     },
     "2023": {
       "Bioenergy": 0.0257,
-      "Coal": 0.3663,
+      "Coal": 0.3664,
       "Gas": 0.2083,
       "Hydro": 0.1989,
       "Nuclear": 0.0024,
@@ -13180,15 +13180,15 @@
       "Wind": 0.1063
     },
     "2024": {
-      "Bioenergy": 0.0274,
-      "Coal": 0.3395,
-      "Gas": 0.1293,
-      "Hydro": 0.2898,
-      "Nuclear": 0.0007,
-      "Other Fossil": 0.0037,
-      "Other Renewables": 0.0335,
-      "Solar": 0.0616,
-      "Wind": 0.1146
+      "Bioenergy": 0.0275,
+      "Coal": 0.3335,
+      "Gas": 0.1302,
+      "Hydro": 0.2936,
+      "Nuclear": 0.0006,
+      "Other Fossil": 0.0038,
+      "Other Renewables": 0.0331,
+      "Solar": 0.0675,
+      "Wind": 0.1102
     }
   },
   "TT": {
@@ -13555,48 +13555,48 @@
       "Wind": 0.0835
     },
     "2021": {
-      "Bioenergy": 0.0133,
-      "Coal": 0.2159,
-      "Gas": 0.3784,
-      "Hydro": 0.062,
-      "Nuclear": 0.187,
-      "Other Fossil": 0.0083,
+      "Bioenergy": 0.0131,
+      "Coal": 0.216,
+      "Gas": 0.3799,
+      "Hydro": 0.06,
+      "Nuclear": 0.1877,
+      "Other Fossil": 0.0085,
       "Other Renewables": 0.0044,
-      "Solar": 0.0393,
-      "Wind": 0.0913
+      "Solar": 0.0396,
+      "Wind": 0.091
     },
     "2022": {
-      "Bioenergy": 0.0125,
-      "Coal": 0.1925,
-      "Gas": 0.3926,
-      "Hydro": 0.061,
-      "Nuclear": 0.1792,
-      "Other Fossil": 0.0091,
-      "Other Renewables": 0.0044,
-      "Solar": 0.0475,
+      "Bioenergy": 0.0121,
+      "Coal": 0.1938,
+      "Gas": 0.3933,
+      "Hydro": 0.0587,
+      "Nuclear": 0.1799,
+      "Other Fossil": 0.009,
+      "Other Renewables": 0.0042,
+      "Solar": 0.0478,
       "Wind": 0.1012
     },
     "2023": {
       "Bioenergy": 0.0112,
-      "Coal": 0.1583,
-      "Gas": 0.4238,
-      "Hydro": 0.056,
-      "Nuclear": 0.1824,
+      "Coal": 0.1588,
+      "Gas": 0.4239,
+      "Hydro": 0.0554,
+      "Nuclear": 0.1825,
       "Other Fossil": 0.0078,
       "Other Renewables": 0.0044,
-      "Solar": 0.0562,
-      "Wind": 0.0998
+      "Solar": 0.056,
+      "Wind": 0.1001
     },
     "2024": {
-      "Bioenergy": 0.0108,
-      "Coal": 0.1433,
-      "Gas": 0.4025,
-      "Hydro": 0.0596,
-      "Nuclear": 0.188,
-      "Other Fossil": 0.0071,
-      "Other Renewables": 0.0044,
-      "Solar": 0.0572,
-      "Wind": 0.1271
+      "Bioenergy": 0.0109,
+      "Coal": 0.1413,
+      "Gas": 0.401,
+      "Hydro": 0.0626,
+      "Nuclear": 0.1864,
+      "Other Fossil": 0.0083,
+      "Other Renewables": 0.0043,
+      "Solar": 0.0639,
+      "Wind": 0.1213
     }
   },
   "UY": {
@@ -13615,7 +13615,7 @@
       "Bioenergy": 0.0863,
       "Coal": 0.0009,
       "Gas": 0.0605,
-      "Hydro": 0.3417,
+      "Hydro": 0.3418,
       "Nuclear": 0.0006,
       "Other Fossil": 0.0105,
       "Other Renewables": 0.0002,
@@ -13645,26 +13645,26 @@
       "Wind": 0.374
     },
     "2023": {
-      "Bioenergy": 0.0959,
+      "Bioenergy": 0.0958,
       "Coal": 0.0049,
-      "Gas": 0.0927,
-      "Hydro": 0.3414,
+      "Gas": 0.0929,
+      "Hydro": 0.3412,
       "Nuclear": 0.0025,
-      "Other Fossil": 0.0167,
-      "Other Renewables": 0.0007,
+      "Other Fossil": 0.0168,
+      "Other Renewables": 0.0008,
       "Solar": 0.0387,
       "Wind": 0.4065
     },
     "2024": {
-      "Bioenergy": 0.1419,
+      "Bioenergy": 0.133,
       "Coal": 0,
-      "Gas": 0,
-      "Hydro": 0.4734,
+      "Gas": 0.0124,
+      "Hydro": 0.4923,
       "Nuclear": 0,
-      "Other Fossil": 0,
+      "Other Fossil": 0.0016,
       "Other Renewables": 0,
-      "Solar": 0.0366,
-      "Wind": 0.3481
+      "Solar": 0.0318,
+      "Wind": 0.3289
     }
   },
   "UZ": {
@@ -13725,13 +13725,13 @@
     },
     "2024": {
       "Bioenergy": 0.0004,
-      "Coal": 0.0481,
+      "Coal": 0.0479,
       "Gas": 0.8347,
-      "Hydro": 0.1013,
+      "Hydro": 0.1015,
       "Nuclear": 0.0011,
       "Other Fossil": 0.0111,
       "Other Renewables": 0.0001,
-      "Solar": 0.0016,
+      "Solar": 0.0017,
       "Wind": 0.0017
     }
   },
@@ -14065,14 +14065,14 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.6062,
-      "Gas": 0.0907,
-      "Hydro": 0.1535,
+      "Coal": 0.615,
+      "Gas": 0.0914,
+      "Hydro": 0.1517,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0985,
-      "Wind": 0.0509
+      "Solar": 0.0991,
+      "Wind": 0.0428
     }
   },
   "VU": {
@@ -14254,29 +14254,29 @@
       "Other Fossil": 0.0018,
       "Other Renewables": 0.0005,
       "Solar": 0.0017,
-      "Wind": 0.0611
+      "Wind": 0.061
     },
     "2023": {
-      "Bioenergy": 0.0038,
-      "Coal": 0.778,
-      "Gas": 0.0328,
+      "Bioenergy": 0.0037,
+      "Coal": 0.7782,
+      "Gas": 0.0329,
       "Hydro": 0.0752,
-      "Nuclear": 0.0265,
+      "Nuclear": 0.0264,
       "Other Fossil": 0.0026,
       "Other Renewables": 0.0008,
       "Solar": 0.0062,
-      "Wind": 0.0741
+      "Wind": 0.074
     },
     "2024": {
-      "Bioenergy": 0.0027,
-      "Coal": 0.8277,
-      "Gas": 0.0238,
-      "Hydro": 0.0458,
-      "Nuclear": 0.019,
+      "Bioenergy": 0.0026,
+      "Coal": 0.83,
+      "Gas": 0.0224,
+      "Hydro": 0.046,
+      "Nuclear": 0.0183,
       "Other Fossil": 0.0018,
       "Other Renewables": 0.0006,
-      "Solar": 0.003,
-      "Wind": 0.0757
+      "Solar": 0.0038,
+      "Wind": 0.0746
     }
   },
   "YE": {
@@ -14405,14 +14405,14 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.8286,
-      "Gas": 0.001,
-      "Hydro": 0.0092,
-      "Nuclear": 0.0369,
-      "Other Fossil": 0.0245,
-      "Other Renewables": 0.0006,
-      "Solar": 0.0525,
-      "Wind": 0.0467
+      "Coal": 0.7901,
+      "Gas": 0.0008,
+      "Hydro": 0.0083,
+      "Nuclear": 0.0368,
+      "Other Fossil": 0.0246,
+      "Other Renewables": 0.0005,
+      "Solar": 0.093,
+      "Wind": 0.0458
     }
   },
   "ZM": {