@digital4better/data 1.1.48 → 1.1.50

package/data/mix/country-yearly.json

@@ -124,15 +124,15 @@
       "Wind": 0.0577
     },
     "2024": {
-      "Bioenergy": 0.0164,
-      "Coal": 0.4616,
-      "Gas": 0.0806,
-      "Hydro": 0.2393,
-      "Nuclear": 0.0429,
-      "Other Fossil": 0.0212,
-      "Other Renewables": 0.0042,
-      "Solar": 0.0708,
-      "Wind": 0.063
+      "Bioenergy": 0.0165,
+      "Coal": 0.4633,
+      "Gas": 0.0803,
+      "Hydro": 0.2408,
+      "Nuclear": 0.0426,
+      "Other Fossil": 0.0214,
+      "Other Renewables": 0.004,
+      "Solar": 0.0691,
+      "Wind": 0.0619
     }
   },
   "AG": {
@@ -228,8 +228,8 @@
     },
     "2021": {
       "Bioenergy": 0.0095,
-      "Coal": 0.049,
-      "Gas": 0.0815,
+      "Coal": 0.0493,
+      "Gas": 0.0811,
       "Hydro": 0.7349,
       "Nuclear": 0.0696,
       "Other Fossil": 0.0065,
@@ -239,8 +239,8 @@
     },
     "2022": {
       "Bioenergy": 0.0096,
-      "Coal": 0.0527,
-      "Gas": 0.0821,
+      "Coal": 0.0531,
+      "Gas": 0.0817,
       "Hydro": 0.7301,
       "Nuclear": 0.0622,
       "Other Fossil": 0.0066,
@@ -250,25 +250,25 @@
     },
     "2023": {
       "Bioenergy": 0.0088,
-      "Coal": 0.0462,
-      "Gas": 0.0766,
+      "Coal": 0.0466,
+      "Gas": 0.0762,
       "Hydro": 0.7354,
       "Nuclear": 0.063,
-      "Other Fossil": 0.0062,
+      "Other Fossil": 0.0063,
       "Other Renewables": 0.0021,
       "Solar": 0.0218,
       "Wind": 0.0399
     },
     "2024": {
       "Bioenergy": 0.0089,
-      "Coal": 0.04,
-      "Gas": 0.0699,
-      "Hydro": 0.7427,
-      "Nuclear": 0.0625,
-      "Other Fossil": 0.006,
+      "Coal": 0.0407,
+      "Gas": 0.0698,
+      "Hydro": 0.7418,
+      "Nuclear": 0.0626,
+      "Other Fossil": 0.0061,
       "Other Renewables": 0.002,
-      "Solar": 0.0291,
-      "Wind": 0.0388
+      "Solar": 0.0289,
+      "Wind": 0.0392
     }
   },
   "AM": {
@@ -465,14 +465,14 @@
     },
     "2024": {
       "Bioenergy": 0.0082,
-      "Coal": 0.0024,
-      "Gas": 0.5181,
-      "Hydro": 0.2387,
-      "Nuclear": 0.0914,
-      "Other Fossil": 0.0122,
-      "Other Renewables": 0.0001,
-      "Solar": 0.0233,
-      "Wind": 0.1055
+      "Coal": 0.0052,
+      "Gas": 0.5034,
+      "Hydro": 0.2531,
+      "Nuclear": 0.0885,
+      "Other Fossil": 0.013,
+      "Other Renewables": 0.0002,
+      "Solar": 0.0238,
+      "Wind": 0.1046
     }
   },
   "AS": {
@@ -568,8 +568,8 @@
     },
     "2021": {
       "Bioenergy": 0.0258,
-      "Coal": 0.0228,
-      "Gas": 0.1785,
+      "Coal": 0.0229,
+      "Gas": 0.1784,
       "Hydro": 0.588,
       "Nuclear": 0.0309,
       "Other Fossil": 0.0187,
@@ -579,8 +579,8 @@
     },
     "2022": {
       "Bioenergy": 0.0421,
-      "Coal": 0.0248,
-      "Gas": 0.1902,
+      "Coal": 0.025,
+      "Gas": 0.19,
       "Hydro": 0.5494,
       "Nuclear": 0.0284,
       "Other Fossil": 0.019,
@@ -590,8 +590,8 @@
     },
     "2023": {
       "Bioenergy": 0.0241,
-      "Coal": 0.0104,
-      "Gas": 0.1197,
+      "Coal": 0.0105,
+      "Gas": 0.1196,
       "Hydro": 0.6361,
       "Nuclear": 0.0129,
       "Other Fossil": 0.0181,
@@ -600,15 +600,15 @@
       "Wind": 0.1398
     },
     "2024": {
-      "Bioenergy": 0.0245,
-      "Coal": 0,
-      "Gas": 0.0564,
-      "Hydro": 0.6726,
-      "Nuclear": 0,
-      "Other Fossil": 0.0149,
-      "Other Renewables": 0,
-      "Solar": 0.0982,
-      "Wind": 0.1333
+      "Bioenergy": 0.0247,
+      "Coal": 0.0012,
+      "Gas": 0.0594,
+      "Hydro": 0.6646,
+      "Nuclear": 0.0019,
+      "Other Fossil": 0.0153,
+      "Other Renewables": 0.0001,
+      "Solar": 0.1006,
+      "Wind": 0.1323
     }
   },
   "AU": {
@@ -669,14 +669,14 @@
     },
     "2024": {
       "Bioenergy": 0.0016,
-      "Coal": 0.562,
-      "Gas": 0.0876,
-      "Hydro": 0.0555,
+      "Coal": 0.5586,
+      "Gas": 0.0853,
+      "Hydro": 0.0552,
       "Nuclear": 0,
       "Other Fossil": 0.0003,
       "Other Renewables": 0,
-      "Solar": 0.1656,
-      "Wind": 0.1275
+      "Solar": 0.1707,
+      "Wind": 0.1284
     }
   },
   "AW": {
@@ -873,14 +873,14 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.6293,
+      "Coal": 0.6039,
       "Gas": 0,
-      "Hydro": 0.3332,
+      "Hydro": 0.3595,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.024,
-      "Wind": 0.0135
+      "Solar": 0.0236,
+      "Wind": 0.0131
     }
   },
   "BB": {
@@ -1009,14 +1009,14 @@
     },
     "2024": {
       "Bioenergy": 0.0031,
-      "Coal": 0.3519,
-      "Gas": 0.4708,
-      "Hydro": 0.022,
-      "Nuclear": 0.0082,
-      "Other Fossil": 0.11,
+      "Coal": 0.3677,
+      "Gas": 0.4473,
+      "Hydro": 0.0248,
+      "Nuclear": 0.0081,
+      "Other Fossil": 0.1164,
       "Other Renewables": 0.0008,
-      "Solar": 0.0212,
-      "Wind": 0.0121
+      "Solar": 0.02,
+      "Wind": 0.0118
     }
   },
   "BE": {
@@ -1076,15 +1076,15 @@
       "Wind": 0.1828
     },
     "2024": {
-      "Bioenergy": 0.0101,
-      "Coal": 0.0124,
-      "Gas": 0.1451,
-      "Hydro": 0.0197,
-      "Nuclear": 0.4195,
-      "Other Fossil": 0.0869,
-      "Other Renewables": 0.0006,
-      "Solar": 0.1324,
-      "Wind": 0.1732
+      "Bioenergy": 0.0102,
+      "Coal": 0.0131,
+      "Gas": 0.1448,
+      "Hydro": 0.0203,
+      "Nuclear": 0.4168,
+      "Other Fossil": 0.086,
+      "Other Renewables": 0.0007,
+      "Solar": 0.1331,
+      "Wind": 0.1752
     }
   },
   "BF": {
@@ -1212,15 +1212,15 @@
       "Wind": 0.0386
     },
     "2024": {
-      "Bioenergy": 0.0045,
-      "Coal": 0.2457,
-      "Gas": 0.0608,
-      "Hydro": 0.1038,
-      "Nuclear": 0.4101,
+      "Bioenergy": 0.0042,
+      "Coal": 0.2397,
+      "Gas": 0.0614,
+      "Hydro": 0.1018,
+      "Nuclear": 0.4185,
       "Other Fossil": 0.0005,
       "Other Renewables": 0.0002,
-      "Solar": 0.1362,
-      "Wind": 0.0383
+      "Solar": 0.1361,
+      "Wind": 0.0377
     }
   },
   "BH": {
@@ -1622,13 +1622,13 @@
     "2024": {
       "Bioenergy": 0.0092,
       "Coal": 0,
-      "Gas": 0.6487,
-      "Hydro": 0.2658,
+      "Gas": 0.6496,
+      "Hydro": 0.2651,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
       "Solar": 0.0302,
-      "Wind": 0.0461
+      "Wind": 0.0459
     }
   },
   "BR": {
@@ -2028,15 +2028,15 @@
       "Wind": 0.0381
     },
     "2024": {
-      "Bioenergy": 0.1707,
-      "Coal": 0.0148,
-      "Gas": 0.1043,
-      "Hydro": 0.518,
-      "Nuclear": 0.0102,
-      "Other Fossil": 0.1031,
+      "Bioenergy": 0.1708,
+      "Coal": 0.0145,
+      "Gas": 0.1048,
+      "Hydro": 0.5171,
+      "Nuclear": 0.01,
+      "Other Fossil": 0.1027,
       "Other Renewables": 0.0025,
-      "Solar": 0.0395,
-      "Wind": 0.0368
+      "Solar": 0.0397,
+      "Wind": 0.0378
     }
   },
   "CA": {
@@ -2336,8 +2336,8 @@
     },
     "2021": {
       "Bioenergy": 0.0031,
-      "Coal": 0.0171,
-      "Gas": 0.028,
+      "Coal": 0.0172,
+      "Gas": 0.0278,
       "Hydro": 0.557,
       "Nuclear": 0.2896,
       "Other Fossil": 0.0537,
@@ -2347,8 +2347,8 @@
     },
     "2022": {
       "Bioenergy": 0.0028,
-      "Coal": 0.0161,
-      "Gas": 0.0248,
+      "Coal": 0.0162,
+      "Gas": 0.0247,
       "Hydro": 0.4873,
       "Nuclear": 0.3539,
       "Other Fossil": 0.0545,
@@ -2360,23 +2360,23 @@
       "Bioenergy": 0.001,
       "Coal": 0.0056,
       "Gas": 0.0088,
-      "Hydro": 0.5525,
-      "Nuclear": 0.325,
+      "Hydro": 0.5522,
+      "Nuclear": 0.3252,
       "Other Fossil": 0.0501,
       "Other Renewables": 0.0002,
-      "Solar": 0.0501,
+      "Solar": 0.0502,
       "Wind": 0.0066
     },
     "2024": {
       "Bioenergy": 0,
       "Coal": 0.0002,
       "Gas": 0.0003,
-      "Hydro": 0.6153,
-      "Nuclear": 0.2734,
-      "Other Fossil": 0.0455,
+      "Hydro": 0.6129,
+      "Nuclear": 0.2752,
+      "Other Fossil": 0.0458,
       "Other Renewables": 0,
-      "Solar": 0.0636,
-      "Wind": 0.0017
+      "Solar": 0.064,
+      "Wind": 0.0016
     }
   },
   "CI": {
@@ -2572,15 +2572,15 @@
       "Wind": 0.1187
     },
     "2024": {
-      "Bioenergy": 0.0232,
-      "Coal": 0.1652,
-      "Gas": 0.177,
-      "Hydro": 0.2909,
+      "Bioenergy": 0.0236,
+      "Coal": 0.1647,
+      "Gas": 0.1763,
+      "Hydro": 0.29,
       "Nuclear": 0,
-      "Other Fossil": 0.0135,
-      "Other Renewables": 0.0043,
-      "Solar": 0.2024,
-      "Wind": 0.1235
+      "Other Fossil": 0.0136,
+      "Other Renewables": 0.0042,
+      "Solar": 0.2043,
+      "Wind": 0.1234
     }
   },
   "CM": {
@@ -2844,15 +2844,15 @@
       "Wind": 0.1222
     },
     "2024": {
-      "Bioenergy": 0.0048,
-      "Coal": 0.0008,
-      "Gas": 0.0051,
-      "Hydro": 0.6098,
-      "Nuclear": 0.0005,
-      "Other Fossil": 0.1439,
+      "Bioenergy": 0.0049,
+      "Coal": 0.001,
+      "Gas": 0.0067,
+      "Hydro": 0.6052,
+      "Nuclear": 0.0007,
+      "Other Fossil": 0.1478,
       "Other Renewables": 0.1206,
-      "Solar": 0.0016,
-      "Wind": 0.1128
+      "Solar": 0.0019,
+      "Wind": 0.1111
     }
   },
   "CU": {
@@ -3053,10 +3053,10 @@
       "Gas": 0,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.745,
+      "Other Fossil": 0.769,
       "Other Renewables": 0,
-      "Solar": 0.2047,
-      "Wind": 0.0504
+      "Solar": 0.1972,
+      "Wind": 0.0338
     }
   },
   "CZ": {
@@ -3116,14 +3116,14 @@
       "Wind": 0.0105
     },
     "2024": {
-      "Bioenergy": 0.0323,
-      "Coal": 0.326,
-      "Gas": 0.0447,
-      "Hydro": 0.0357,
-      "Nuclear": 0.4297,
+      "Bioenergy": 0.0331,
+      "Coal": 0.3277,
+      "Gas": 0.0459,
+      "Hydro": 0.0356,
+      "Nuclear": 0.4266,
       "Other Fossil": 0.0143,
-      "Other Renewables": 0.0371,
-      "Solar": 0.0705,
+      "Other Renewables": 0.037,
+      "Solar": 0.07,
       "Wind": 0.0099
     }
   },
@@ -3174,7 +3174,7 @@
     },
     "2023": {
       "Bioenergy": 0.0841,
-      "Coal": 0.2455,
+      "Coal": 0.2456,
       "Gas": 0.1585,
       "Hydro": 0.0461,
       "Nuclear": 0.0216,
@@ -3185,14 +3185,14 @@
     },
     "2024": {
       "Bioenergy": 0.088,
-      "Coal": 0.1913,
-      "Gas": 0.1676,
-      "Hydro": 0.0617,
-      "Nuclear": 0.0115,
-      "Other Fossil": 0.0417,
+      "Coal": 0.1936,
+      "Gas": 0.1685,
+      "Hydro": 0.0603,
+      "Nuclear": 0.0116,
+      "Other Fossil": 0.0419,
       "Other Renewables": 0.0004,
-      "Solar": 0.1767,
-      "Wind": 0.2611
+      "Solar": 0.1755,
+      "Wind": 0.2601
     }
   },
   "DJ": {
@@ -3288,8 +3288,8 @@
     },
     "2021": {
       "Bioenergy": 0.1338,
-      "Coal": 0.175,
-      "Gas": 0.1023,
+      "Coal": 0.1751,
+      "Gas": 0.1021,
       "Hydro": 0.0234,
       "Nuclear": 0.0287,
       "Other Fossil": 0.0507,
@@ -3299,8 +3299,8 @@
     },
     "2022": {
       "Bioenergy": 0.1136,
-      "Coal": 0.1509,
-      "Gas": 0.0777,
+      "Coal": 0.151,
+      "Gas": 0.0776,
       "Hydro": 0.013,
       "Nuclear": 0.015,
       "Other Fossil": 0.0456,
@@ -3310,8 +3310,8 @@
     },
     "2023": {
       "Bioenergy": 0.1058,
-      "Coal": 0.1052,
-      "Gas": 0.077,
+      "Coal": 0.1053,
+      "Gas": 0.0769,
       "Hydro": 0.0177,
       "Nuclear": 0.0198,
       "Other Fossil": 0.0358,
@@ -3320,15 +3320,15 @@
       "Wind": 0.5468
     },
     "2024": {
-      "Bioenergy": 0.0923,
-      "Coal": 0.0996,
-      "Gas": 0.066,
-      "Hydro": 0.0173,
-      "Nuclear": 0.0167,
-      "Other Fossil": 0.0337,
-      "Other Renewables": 0.0005,
-      "Solar": 0.1265,
-      "Wind": 0.5475
+      "Bioenergy": 0.0928,
+      "Coal": 0.1006,
+      "Gas": 0.0675,
+      "Hydro": 0.0183,
+      "Nuclear": 0.0184,
+      "Other Fossil": 0.0332,
+      "Other Renewables": 0.0006,
+      "Solar": 0.1263,
+      "Wind": 0.5424
     }
   },
   "DM": {
@@ -3592,15 +3592,15 @@
       "Wind": 0.0088
     },
     "2024": {
-      "Bioenergy": 0.0006,
-      "Coal": 0.0006,
-      "Gas": 0.03,
-      "Hydro": 0.6987,
-      "Nuclear": 0.0004,
-      "Other Fossil": 0.2636,
+      "Bioenergy": 0.0079,
+      "Coal": 0.0005,
+      "Gas": 0.0296,
+      "Hydro": 0.7384,
+      "Nuclear": 0.0003,
+      "Other Fossil": 0.2158,
       "Other Renewables": 0.0001,
-      "Solar": 0.0011,
-      "Wind": 0.005
+      "Solar": 0.001,
+      "Wind": 0.0065
     }
   },
   "EE": {
@@ -3628,8 +3628,8 @@
     },
     "2021": {
       "Bioenergy": 0.065,
-      "Coal": 0.0466,
-      "Gas": 0.079,
+      "Coal": 0.0469,
+      "Gas": 0.0786,
       "Hydro": 0.0538,
       "Nuclear": 0.0676,
       "Other Fossil": 0.5133,
@@ -3639,8 +3639,8 @@
     },
     "2022": {
       "Bioenergy": 0.095,
-      "Coal": 0.022,
-      "Gas": 0.0357,
+      "Coal": 0.0222,
+      "Gas": 0.0355,
       "Hydro": 0.0199,
       "Nuclear": 0.0268,
       "Other Fossil": 0.6251,
@@ -3650,8 +3650,8 @@
     },
     "2023": {
       "Bioenergy": 0.0749,
-      "Coal": 0.0612,
-      "Gas": 0.1004,
+      "Coal": 0.0617,
+      "Gas": 0.0999,
       "Hydro": 0.0706,
       "Nuclear": 0.0822,
       "Other Fossil": 0.3373,
@@ -3660,15 +3660,15 @@
       "Wind": 0.1556
     },
     "2024": {
-      "Bioenergy": 0.0665,
-      "Coal": 0.0472,
-      "Gas": 0.0825,
-      "Hydro": 0.0692,
-      "Nuclear": 0.0715,
-      "Other Fossil": 0.3261,
-      "Other Renewables": 0.0023,
-      "Solar": 0.1694,
-      "Wind": 0.1653
+      "Bioenergy": 0.0664,
+      "Coal": 0.0492,
+      "Gas": 0.0845,
+      "Hydro": 0.0701,
+      "Nuclear": 0.0736,
+      "Other Fossil": 0.3185,
+      "Other Renewables": 0.0024,
+      "Solar": 0.1676,
+      "Wind": 0.1678
     }
   },
   "EG": {
@@ -3833,7 +3833,7 @@
     "2021": {
       "Bioenergy": 0.017,
       "Coal": 0.0227,
-      "Gas": 0.2485,
+      "Gas": 0.2484,
       "Hydro": 0.1332,
       "Nuclear": 0.2198,
       "Other Fossil": 0.0173,
@@ -3864,15 +3864,15 @@
       "Wind": 0.249
     },
     "2024": {
-      "Bioenergy": 0.0143,
-      "Coal": 0.0107,
-      "Gas": 0.1527,
-      "Hydro": 0.1422,
-      "Nuclear": 0.2118,
+      "Bioenergy": 0.0141,
+      "Coal": 0.0108,
+      "Gas": 0.1547,
+      "Hydro": 0.1411,
+      "Nuclear": 0.2133,
       "Other Fossil": 0.01,
       "Other Renewables": 0.0027,
-      "Solar": 0.216,
-      "Wind": 0.2396
+      "Solar": 0.2145,
+      "Wind": 0.2386
     }
   },
   "ET": {
@@ -3968,19 +3968,19 @@
     },
     "2021": {
       "Bioenergy": 0.1402,
-      "Coal": 0.0713,
-      "Gas": 0.0929,
+      "Coal": 0.0715,
+      "Gas": 0.0927,
       "Hydro": 0.2113,
       "Nuclear": 0.3034,
-      "Other Fossil": 0.0552,
+      "Other Fossil": 0.0553,
       "Other Renewables": 0.0029,
       "Solar": 0.0122,
       "Wind": 0.1106
     },
     "2022": {
       "Bioenergy": 0.1502,
-      "Coal": 0.0707,
-      "Gas": 0.0515,
+      "Coal": 0.0709,
+      "Gas": 0.0513,
       "Hydro": 0.185,
       "Nuclear": 0.321,
       "Other Fossil": 0.0569,
@@ -4000,15 +4000,15 @@
       "Wind": 0.1777
     },
     "2024": {
-      "Bioenergy": 0.1117,
-      "Coal": 0.0237,
-      "Gas": 0.0231,
-      "Hydro": 0.1922,
-      "Nuclear": 0.3921,
-      "Other Fossil": 0.0423,
+      "Bioenergy": 0.1134,
+      "Coal": 0.0239,
+      "Gas": 0.0264,
+      "Hydro": 0.1956,
+      "Nuclear": 0.3788,
+      "Other Fossil": 0.0426,
       "Other Renewables": 0.0004,
-      "Solar": 0.0209,
-      "Wind": 0.1935
+      "Solar": 0.02,
+      "Wind": 0.199
     }
   },
   "FJ": {
@@ -4252,7 +4252,7 @@
     "2022": {
       "Bioenergy": 0.0092,
       "Coal": 0.0141,
-      "Gas": 0.106,
+      "Gas": 0.1059,
       "Hydro": 0.1027,
       "Nuclear": 0.6301,
       "Other Fossil": 0.0081,
@@ -4272,15 +4272,15 @@
       "Wind": 0.1023
     },
     "2024": {
-      "Bioenergy": 0.006,
+      "Bioenergy": 0.0061,
       "Coal": 0.0007,
-      "Gas": 0.0324,
-      "Hydro": 0.1345,
-      "Nuclear": 0.6841,
+      "Gas": 0.0326,
+      "Hydro": 0.1309,
+      "Nuclear": 0.6868,
       "Other Fossil": 0.006,
       "Other Renewables": 0,
-      "Solar": 0.0502,
-      "Wind": 0.086
+      "Solar": 0.0505,
+      "Wind": 0.0865
     }
   },
   "GA": {
@@ -4354,9 +4354,9 @@
   "GB": {
     "2019": {
       "Bioenergy": 0.0617,
-      "Coal": 0.0328,
-      "Gas": 0.4162,
-      "Hydro": 0.0246,
+      "Coal": 0.0329,
+      "Gas": 0.4161,
+      "Hydro": 0.0247,
       "Nuclear": 0.1996,
       "Other Fossil": 0.0042,
       "Other Renewables": 0.0005,
@@ -4376,30 +4376,30 @@
     },
     "2021": {
       "Bioenergy": 0.0712,
-      "Coal": 0.0316,
+      "Coal": 0.0317,
       "Gas": 0.4095,
       "Hydro": 0.0272,
       "Nuclear": 0.1763,
       "Other Fossil": 0.0084,
       "Other Renewables": 0.0006,
       "Solar": 0.0443,
-      "Wind": 0.2308
+      "Wind": 0.2307
     },
     "2022": {
       "Bioenergy": 0.055,
-      "Coal": 0.0198,
-      "Gas": 0.4073,
+      "Coal": 0.0199,
+      "Gas": 0.4072,
       "Hydro": 0.0157,
       "Nuclear": 0.1667,
       "Other Fossil": 0.0096,
       "Other Renewables": 0.0002,
       "Solar": 0.0458,
-      "Wind": 0.2798
+      "Wind": 0.28
     },
     "2023": {
       "Bioenergy": 0.0538,
-      "Coal": 0.0237,
-      "Gas": 0.353,
+      "Coal": 0.0238,
+      "Gas": 0.3528,
       "Hydro": 0.028,
       "Nuclear": 0.1644,
       "Other Fossil": 0.0116,
@@ -4408,15 +4408,15 @@
       "Wind": 0.3128
     },
     "2024": {
-      "Bioenergy": 0.073,
-      "Coal": 0.0266,
-      "Gas": 0.2911,
-      "Hydro": 0.0407,
-      "Nuclear": 0.1736,
+      "Bioenergy": 0.0718,
+      "Coal": 0.0257,
+      "Gas": 0.278,
+      "Hydro": 0.0394,
+      "Nuclear": 0.1733,
       "Other Fossil": 0.0145,
       "Other Renewables": 0.0009,
-      "Solar": 0.0741,
-      "Wind": 0.3055
+      "Solar": 0.0721,
+      "Wind": 0.3243
     }
   },
   "GD": {
@@ -4545,14 +4545,14 @@
     },
     "2024": {
       "Bioenergy": 0.001,
-      "Coal": 0.0262,
-      "Gas": 0.1366,
-      "Hydro": 0.8194,
-      "Nuclear": 0.0023,
+      "Coal": 0.0254,
+      "Gas": 0.1341,
+      "Hydro": 0.823,
+      "Nuclear": 0.0022,
       "Other Fossil": 0.0003,
       "Other Renewables": 0.0002,
       "Solar": 0.0029,
-      "Wind": 0.0111
+      "Wind": 0.011
     }
   },
   "GF": {
@@ -5115,7 +5115,7 @@
       "Bioenergy": 0.0055,
       "Coal": 0.1502,
       "Gas": 0.4454,
-      "Hydro": 0.0859,
+      "Hydro": 0.0858,
       "Nuclear": 0.0403,
       "Other Fossil": 0.0038,
       "Other Renewables": 0.0012,
@@ -5124,8 +5124,8 @@
     },
     "2021": {
       "Bioenergy": 0.0024,
-      "Coal": 0.1223,
-      "Gas": 0.4656,
+      "Coal": 0.1224,
+      "Gas": 0.4655,
       "Hydro": 0.1067,
       "Nuclear": 0.0179,
       "Other Fossil": 0.0017,
@@ -5135,8 +5135,8 @@
     },
     "2022": {
       "Bioenergy": 0.0028,
-      "Coal": 0.1325,
-      "Gas": 0.4242,
+      "Coal": 0.1327,
+      "Gas": 0.4241,
       "Hydro": 0.0858,
       "Nuclear": 0.0186,
       "Other Fossil": 0.0019,
@@ -5146,8 +5146,8 @@
     },
     "2023": {
       "Bioenergy": 0.0031,
-      "Coal": 0.116,
-      "Gas": 0.3656,
+      "Coal": 0.1161,
+      "Gas": 0.3654,
       "Hydro": 0.0928,
       "Nuclear": 0.0221,
       "Other Fossil": 0.0022,
@@ -5156,15 +5156,15 @@
       "Wind": 0.2195
     },
     "2024": {
-      "Bioenergy": 0.0007,
-      "Coal": 0.0698,
-      "Gas": 0.4073,
-      "Hydro": 0.0666,
-      "Nuclear": 0.0051,
-      "Other Fossil": 0.0005,
+      "Bioenergy": 0.0008,
+      "Coal": 0.0684,
+      "Gas": 0.4087,
+      "Hydro": 0.0673,
+      "Nuclear": 0.0058,
+      "Other Fossil": 0.0006,
       "Other Renewables": 0.0002,
-      "Solar": 0.2284,
-      "Wind": 0.2215
+      "Solar": 0.2318,
+      "Wind": 0.2164
     }
   },
   "GT": {
@@ -5497,14 +5497,14 @@
     },
     "2024": {
       "Bioenergy": 0.0079,
-      "Coal": 0.564,
+      "Coal": 0.5646,
       "Gas": 0.3397,
-      "Hydro": 0.0302,
-      "Nuclear": 0.0131,
+      "Hydro": 0.0307,
+      "Nuclear": 0.013,
       "Other Fossil": 0.0051,
-      "Other Renewables": 0.0013,
-      "Solar": 0.0195,
-      "Wind": 0.0193
+      "Other Renewables": 0.0012,
+      "Solar": 0.0189,
+      "Wind": 0.0189
     }
   },
   "HN": {
@@ -5566,10 +5566,10 @@
     "2024": {
       "Bioenergy": 0.1288,
       "Coal": 0.0008,
-      "Gas": 0.0054,
-      "Hydro": 0.2243,
+      "Gas": 0.0055,
+      "Hydro": 0.2242,
       "Nuclear": 0.0005,
-      "Other Fossil": 0.4392,
+      "Other Fossil": 0.4391,
       "Other Renewables": 0.0265,
       "Solar": 0.1002,
       "Wind": 0.0742
@@ -5591,7 +5591,7 @@
       "Bioenergy": 0.0377,
       "Coal": 0.1105,
       "Gas": 0.2531,
-      "Hydro": 0.3435,
+      "Hydro": 0.3434,
       "Nuclear": 0.0649,
       "Other Fossil": 0.0086,
       "Other Renewables": 0.0308,
@@ -5600,8 +5600,8 @@
     },
     "2021": {
       "Bioenergy": 0.0403,
-      "Coal": 0.1126,
-      "Gas": 0.2101,
+      "Coal": 0.1128,
+      "Gas": 0.2098,
       "Hydro": 0.391,
       "Nuclear": 0.0551,
       "Other Fossil": 0.0073,
@@ -5611,8 +5611,8 @@
     },
     "2022": {
       "Bioenergy": 0.045,
-      "Coal": 0.1286,
-      "Gas": 0.2557,
+      "Coal": 0.1289,
+      "Gas": 0.2553,
       "Hydro": 0.2986,
       "Nuclear": 0.0577,
       "Other Fossil": 0.0072,
@@ -5622,8 +5622,8 @@
     },
     "2023": {
       "Bioenergy": 0.0384,
-      "Coal": 0.0895,
-      "Gas": 0.228,
+      "Coal": 0.0897,
+      "Gas": 0.2278,
       "Hydro": 0.4126,
       "Nuclear": 0.0297,
       "Other Fossil": 0.009,
@@ -5632,15 +5632,15 @@
       "Wind": 0.1603
     },
     "2024": {
-      "Bioenergy": 0.0432,
-      "Coal": 0.0492,
-      "Gas": 0.2282,
-      "Hydro": 0.3924,
-      "Nuclear": 0.0505,
-      "Other Fossil": 0.0102,
-      "Other Renewables": 0.0157,
-      "Solar": 0.0377,
-      "Wind": 0.1728
+      "Bioenergy": 0.0424,
+      "Coal": 0.0572,
+      "Gas": 0.2276,
+      "Hydro": 0.3764,
+      "Nuclear": 0.06,
+      "Other Fossil": 0.0108,
+      "Other Renewables": 0.0152,
+      "Solar": 0.0432,
+      "Wind": 0.167
     }
   },
   "HT": {
@@ -5736,8 +5736,8 @@
     },
     "2021": {
       "Bioenergy": 0.0326,
-      "Coal": 0.109,
-      "Gas": 0.2586,
+      "Coal": 0.1093,
+      "Gas": 0.2582,
       "Hydro": 0.0511,
       "Nuclear": 0.3879,
       "Other Fossil": 0.0224,
@@ -5747,8 +5747,8 @@
     },
     "2022": {
       "Bioenergy": 0.0333,
-      "Coal": 0.1097,
-      "Gas": 0.2436,
+      "Coal": 0.1101,
+      "Gas": 0.2432,
       "Hydro": 0.045,
       "Nuclear": 0.3833,
       "Other Fossil": 0.0217,
@@ -5758,25 +5758,25 @@
     },
     "2023": {
       "Bioenergy": 0.0241,
-      "Coal": 0.0989,
-      "Gas": 0.2095,
+      "Coal": 0.0992,
+      "Gas": 0.2092,
       "Hydro": 0.0479,
       "Nuclear": 0.3906,
       "Other Fossil": 0.0193,
       "Other Renewables": 0.0027,
       "Solar": 0.1597,
-      "Wind": 0.0473
+      "Wind": 0.0474
     },
     "2024": {
-      "Bioenergy": 0.0231,
-      "Coal": 0.0854,
-      "Gas": 0.1716,
-      "Hydro": 0.0491,
-      "Nuclear": 0.3653,
-      "Other Fossil": 0.0184,
+      "Bioenergy": 0.0232,
+      "Coal": 0.0863,
+      "Gas": 0.1728,
+      "Hydro": 0.0464,
+      "Nuclear": 0.3657,
+      "Other Fossil": 0.0176,
       "Other Renewables": 0.0037,
-      "Solar": 0.2395,
-      "Wind": 0.0438
+      "Solar": 0.241,
+      "Wind": 0.0434
     }
   },
   "ID": {
@@ -5837,7 +5837,7 @@
     },
     "2024": {
       "Bioenergy": 0.0411,
-      "Coal": 0.5903,
+      "Coal": 0.5904,
       "Gas": 0.2103,
       "Hydro": 0.0719,
       "Nuclear": 0.0003,
@@ -5872,8 +5872,8 @@
     },
     "2021": {
       "Bioenergy": 0.0066,
-      "Coal": 0.0992,
-      "Gas": 0.4478,
+      "Coal": 0.0993,
+      "Gas": 0.4477,
       "Hydro": 0.0397,
       "Nuclear": 0.022,
       "Other Fossil": 0.0757,
@@ -5883,8 +5883,8 @@
     },
     "2022": {
       "Bioenergy": 0.006,
-      "Coal": 0.0869,
-      "Gas": 0.4647,
+      "Coal": 0.087,
+      "Gas": 0.4646,
       "Hydro": 0.0325,
       "Nuclear": 0.0163,
       "Other Fossil": 0.0582,
@@ -5894,8 +5894,8 @@
     },
     "2023": {
       "Bioenergy": 0.0069,
-      "Coal": 0.054,
-      "Gas": 0.4511,
+      "Coal": 0.0541,
+      "Gas": 0.4509,
       "Hydro": 0.0485,
       "Nuclear": 0.0245,
       "Other Fossil": 0.0359,
@@ -5905,14 +5905,14 @@
     },
     "2024": {
       "Bioenergy": 0.0083,
-      "Coal": 0.0475,
-      "Gas": 0.4355,
-      "Hydro": 0.0559,
-      "Nuclear": 0.033,
+      "Coal": 0.0479,
+      "Gas": 0.4354,
+      "Hydro": 0.0554,
+      "Nuclear": 0.0331,
       "Other Fossil": 0.0423,
       "Other Renewables": 0.0011,
-      "Solar": 0.0382,
-      "Wind": 0.3382
+      "Solar": 0.038,
+      "Wind": 0.3385
     }
   },
   "IL": {
@@ -6041,14 +6041,14 @@
     },
     "2024": {
       "Bioenergy": 0.0073,
-      "Coal": 0.7499,
-      "Gas": 0.0243,
-      "Hydro": 0.0707,
-      "Nuclear": 0.0268,
+      "Coal": 0.7408,
+      "Gas": 0.0212,
+      "Hydro": 0.0775,
+      "Nuclear": 0.0279,
       "Other Fossil": 0.0002,
-      "Other Renewables": 0.0015,
-      "Solar": 0.0732,
-      "Wind": 0.046
+      "Other Renewables": 0.0016,
+      "Solar": 0.0717,
+      "Wind": 0.0519
     }
   },
   "IQ": {
@@ -6178,10 +6178,10 @@
     "2024": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.8031,
-      "Hydro": 0.0602,
+      "Gas": 0.8025,
+      "Hydro": 0.0678,
       "Nuclear": 0,
-      "Other Fossil": 0.1367,
+      "Other Fossil": 0.1297,
       "Other Renewables": 0,
       "Solar": 0,
       "Wind": 0
@@ -6280,8 +6280,8 @@
     },
     "2021": {
       "Bioenergy": 0.0615,
-      "Coal": 0.0646,
-      "Gas": 0.4755,
+      "Coal": 0.0648,
+      "Gas": 0.4753,
       "Hydro": 0.1583,
       "Nuclear": 0.0309,
       "Other Fossil": 0.022,
@@ -6291,10 +6291,10 @@
     },
     "2022": {
       "Bioenergy": 0.0573,
-      "Coal": 0.092,
-      "Gas": 0.4823,
+      "Coal": 0.0922,
+      "Gas": 0.482,
       "Hydro": 0.1091,
-      "Nuclear": 0.0276,
+      "Nuclear": 0.0277,
       "Other Fossil": 0.0319,
       "Other Renewables": 0.0189,
       "Solar": 0.0987,
@@ -6302,8 +6302,8 @@
     },
     "2023": {
       "Bioenergy": 0.0561,
-      "Coal": 0.0668,
-      "Gas": 0.4231,
+      "Coal": 0.067,
+      "Gas": 0.4228,
       "Hydro": 0.1518,
       "Nuclear": 0.0346,
       "Other Fossil": 0.0329,
@@ -6312,15 +6312,15 @@
       "Wind": 0.1016
     },
     "2024": {
-      "Bioenergy": 0.0561,
-      "Coal": 0.0344,
-      "Gas": 0.3787,
-      "Hydro": 0.2038,
-      "Nuclear": 0.0349,
-      "Other Fossil": 0.032,
-      "Other Renewables": 0.0185,
+      "Bioenergy": 0.0564,
+      "Coal": 0.0347,
+      "Gas": 0.3829,
+      "Hydro": 0.1979,
+      "Nuclear": 0.0345,
+      "Other Fossil": 0.0331,
+      "Other Renewables": 0.0187,
       "Solar": 0.1459,
-      "Wind": 0.0957
+      "Wind": 0.0959
     }
   },
   "JM": {
@@ -6585,14 +6585,14 @@
     },
     "2024": {
       "Bioenergy": 0.0092,
-      "Coal": 0.0333,
-      "Gas": 0.0452,
-      "Hydro": 0.2981,
-      "Nuclear": 0.0017,
-      "Other Fossil": 0.0736,
-      "Other Renewables": 0.3928,
+      "Coal": 0.0324,
+      "Gas": 0.044,
+      "Hydro": 0.2886,
+      "Nuclear": 0.0016,
+      "Other Fossil": 0.0703,
+      "Other Renewables": 0.3875,
       "Solar": 0.0365,
-      "Wind": 0.1098
+      "Wind": 0.1299
     }
   },
   "KG": {
@@ -6720,15 +6720,15 @@
       "Wind": 0.0181
     },
     "2024": {
-      "Bioenergy": 0.0135,
-      "Coal": 0.471,
-      "Gas": 0.0253,
-      "Hydro": 0.3699,
+      "Bioenergy": 0.0136,
+      "Coal": 0.4716,
+      "Gas": 0.0252,
+      "Hydro": 0.3704,
       "Nuclear": 0.0134,
       "Other Fossil": 0.0561,
       "Other Renewables": 0.0013,
-      "Solar": 0.0297,
-      "Wind": 0.0197
+      "Solar": 0.0291,
+      "Wind": 0.0194
     }
   },
   "KI": {
@@ -7708,8 +7708,8 @@
     },
     "2021": {
       "Bioenergy": 0.0534,
-      "Coal": 0.1132,
-      "Gas": 0.2759,
+      "Coal": 0.114,
+      "Gas": 0.275,
       "Hydro": 0.1489,
       "Nuclear": 0.1597,
       "Other Fossil": 0.0362,
@@ -7719,8 +7719,8 @@
     },
     "2022": {
       "Bioenergy": 0.0517,
-      "Coal": 0.12,
-      "Gas": 0.2272,
+      "Coal": 0.1208,
+      "Gas": 0.2263,
       "Hydro": 0.1433,
       "Nuclear": 0.1415,
       "Other Fossil": 0.0465,
@@ -7730,8 +7730,8 @@
     },
     "2023": {
       "Bioenergy": 0.0386,
-      "Coal": 0.0889,
-      "Gas": 0.1965,
+      "Coal": 0.0896,
+      "Gas": 0.1958,
       "Hydro": 0.1353,
       "Nuclear": 0.1197,
       "Other Fossil": 0.0571,
@@ -7740,15 +7740,15 @@
       "Wind": 0.2718
     },
     "2024": {
-      "Bioenergy": 0.0318,
-      "Coal": 0.0584,
-      "Gas": 0.1629,
-      "Hydro": 0.1224,
-      "Nuclear": 0.0899,
-      "Other Fossil": 0.0716,
+      "Bioenergy": 0.0319,
+      "Coal": 0.0596,
+      "Gas": 0.1618,
+      "Hydro": 0.1212,
+      "Nuclear": 0.0902,
+      "Other Fossil": 0.0741,
       "Other Renewables": 0.0029,
-      "Solar": 0.1684,
-      "Wind": 0.2916
+      "Solar": 0.1671,
+      "Wind": 0.2912
     }
   },
   "LU": {
@@ -7776,47 +7776,47 @@
     },
     "2021": {
       "Bioenergy": 0.0795,
-      "Coal": 0.1193,
-      "Gas": 0.2395,
+      "Coal": 0.1202,
+      "Gas": 0.2385,
       "Hydro": 0.1481,
       "Nuclear": 0.1688,
-      "Other Fossil": 0.0371,
+      "Other Fossil": 0.0372,
       "Other Renewables": 0.0049,
       "Solar": 0.0653,
-      "Wind": 0.1375
+      "Wind": 0.1376
     },
     "2022": {
       "Bioenergy": 0.0844,
-      "Coal": 0.1275,
-      "Gas": 0.2282,
+      "Coal": 0.1284,
+      "Gas": 0.2272,
       "Hydro": 0.1307,
       "Nuclear": 0.1504,
-      "Other Fossil": 0.0376,
+      "Other Fossil": 0.0377,
       "Other Renewables": 0.005,
       "Solar": 0.0874,
       "Wind": 0.1488
     },
     "2023": {
       "Bioenergy": 0.0551,
-      "Coal": 0.1108,
-      "Gas": 0.1999,
+      "Coal": 0.1117,
+      "Gas": 0.199,
       "Hydro": 0.1447,
       "Nuclear": 0.15,
       "Other Fossil": 0.0362,
       "Other Renewables": 0.0049,
       "Solar": 0.0978,
-      "Wind": 0.2006
+      "Wind": 0.2007
     },
     "2024": {
-      "Bioenergy": 0.0606,
-      "Coal": 0.0929,
-      "Gas": 0.175,
-      "Hydro": 0.1674,
-      "Nuclear": 0.1444,
-      "Other Fossil": 0.0385,
-      "Other Renewables": 0.0047,
-      "Solar": 0.1368,
-      "Wind": 0.1796
+      "Bioenergy": 0.0639,
+      "Coal": 0.0939,
+      "Gas": 0.1736,
+      "Hydro": 0.1646,
+      "Nuclear": 0.1435,
+      "Other Fossil": 0.0387,
+      "Other Renewables": 0.0046,
+      "Solar": 0.1362,
+      "Wind": 0.181
     }
   },
   "LV": {
@@ -7844,8 +7844,8 @@
     },
     "2021": {
       "Bioenergy": 0.0761,
-      "Coal": 0.0412,
-      "Gas": 0.3109,
+      "Coal": 0.0414,
+      "Gas": 0.3106,
       "Hydro": 0.3885,
       "Nuclear": 0.0578,
       "Other Fossil": 0.0711,
@@ -7855,8 +7855,8 @@
     },
     "2022": {
       "Bioenergy": 0.0582,
-      "Coal": 0.0583,
-      "Gas": 0.2519,
+      "Coal": 0.0587,
+      "Gas": 0.2514,
       "Hydro": 0.4339,
       "Nuclear": 0.0682,
       "Other Fossil": 0.0447,
@@ -7866,25 +7866,25 @@
     },
     "2023": {
       "Bioenergy": 0.0374,
-      "Coal": 0.0396,
-      "Gas": 0.2539,
+      "Coal": 0.04,
+      "Gas": 0.2535,
       "Hydro": 0.4973,
-      "Nuclear": 0.0576,
+      "Nuclear": 0.0577,
       "Other Fossil": 0.0244,
       "Other Renewables": 0.0019,
       "Solar": 0.0229,
       "Wind": 0.065
     },
     "2024": {
-      "Bioenergy": 0.0355,
-      "Coal": 0.024,
-      "Gas": 0.2478,
-      "Hydro": 0.543,
-      "Nuclear": 0.0396,
+      "Bioenergy": 0.0378,
+      "Coal": 0.0241,
+      "Gas": 0.2523,
+      "Hydro": 0.5405,
+      "Nuclear": 0.0386,
       "Other Fossil": 0.0178,
       "Other Renewables": 0.0012,
-      "Solar": 0.0422,
-      "Wind": 0.0489
+      "Solar": 0.0413,
+      "Wind": 0.0465
     }
   },
   "LY": {
@@ -8059,8 +8059,8 @@
     },
     "2022": {
       "Bioenergy": 0.0048,
-      "Coal": 0.0277,
-      "Gas": 0.8344,
+      "Coal": 0.0278,
+      "Gas": 0.8342,
       "Hydro": 0.0718,
       "Nuclear": 0.0309,
       "Other Fossil": 0.0033,
@@ -8070,8 +8070,8 @@
     },
     "2023": {
       "Bioenergy": 0.0008,
-      "Coal": 0.0045,
-      "Gas": 0.9148,
+      "Coal": 0.0046,
+      "Gas": 0.9147,
       "Hydro": 0.0628,
       "Nuclear": 0.0058,
       "Other Fossil": 0.0006,
@@ -8080,15 +8080,15 @@
       "Wind": 0.0094
     },
     "2024": {
-      "Bioenergy": 0.0012,
-      "Coal": 0.0059,
-      "Gas": 0.9065,
-      "Hydro": 0.0497,
-      "Nuclear": 0.0088,
-      "Other Fossil": 0.0009,
-      "Other Renewables": 0.0003,
-      "Solar": 0.0081,
-      "Wind": 0.0187
+      "Bioenergy": 0.0011,
+      "Coal": 0.0054,
+      "Gas": 0.9096,
+      "Hydro": 0.0491,
+      "Nuclear": 0.0078,
+      "Other Fossil": 0.0008,
+      "Other Renewables": 0.0002,
+      "Solar": 0.0076,
+      "Wind": 0.0184
     }
   },
   "ME": {
@@ -8116,8 +8116,8 @@
     },
     "2021": {
       "Bioenergy": 0.0042,
-      "Coal": 0.3609,
-      "Gas": 0.0352,
+      "Coal": 0.3611,
+      "Gas": 0.0351,
       "Hydro": 0.4625,
       "Nuclear": 0.0317,
       "Other Fossil": 0.0029,
@@ -8148,15 +8148,15 @@
       "Wind": 0.0889
     },
     "2024": {
-      "Bioenergy": 0.0046,
-      "Coal": 0.3532,
-      "Gas": 0.036,
-      "Hydro": 0.4485,
-      "Nuclear": 0.0337,
-      "Other Fossil": 0.0033,
+      "Bioenergy": 0.0047,
+      "Coal": 0.3582,
+      "Gas": 0.0377,
+      "Hydro": 0.44,
+      "Nuclear": 0.0353,
+      "Other Fossil": 0.0035,
       "Other Renewables": 0.0011,
-      "Solar": 0.0199,
-      "Wind": 0.0998
+      "Solar": 0.0204,
+      "Wind": 0.0992
     }
   },
   "MG": {
@@ -8252,8 +8252,8 @@
     },
     "2021": {
       "Bioenergy": 0.0112,
-      "Coal": 0.3171,
-      "Gas": 0.2862,
+      "Coal": 0.3175,
+      "Gas": 0.2858,
       "Hydro": 0.2445,
       "Nuclear": 0.0711,
       "Other Fossil": 0.0066,
@@ -8263,19 +8263,19 @@
     },
     "2022": {
       "Bioenergy": 0.0101,
-      "Coal": 0.4232,
-      "Gas": 0.1916,
+      "Coal": 0.4235,
+      "Gas": 0.1912,
       "Hydro": 0.2267,
       "Nuclear": 0.0483,
-      "Other Fossil": 0.0402,
+      "Other Fossil": 0.0403,
       "Other Renewables": 0.0016,
       "Solar": 0.0127,
       "Wind": 0.0456
     },
     "2023": {
       "Bioenergy": 0.0086,
-      "Coal": 0.3903,
-      "Gas": 0.2125,
+      "Coal": 0.3904,
+      "Gas": 0.2124,
       "Hydro": 0.2497,
       "Nuclear": 0.0061,
       "Other Fossil": 0.0556,
@@ -8285,11 +8285,11 @@
     },
     "2024": {
       "Bioenergy": 0.0183,
-      "Coal": 0.4559,
+      "Coal": 0.456,
       "Gas": 0.1326,
       "Hydro": 0.2996,
       "Nuclear": 0.011,
-      "Other Fossil": 0.001,
+      "Other Fossil": 0.0011,
       "Other Renewables": 0.0003,
       "Solar": 0.0416,
       "Wind": 0.0397
@@ -8556,15 +8556,15 @@
       "Wind": 0.0601
     },
     "2024": {
-      "Bioenergy": 0.0549,
-      "Coal": 0.4671,
-      "Gas": 0.1613,
-      "Hydro": 0.1031,
-      "Nuclear": 0.0447,
-      "Other Fossil": 0.0339,
-      "Other Renewables": 0.0043,
-      "Solar": 0.0651,
-      "Wind": 0.0656
+      "Bioenergy": 0.055,
+      "Coal": 0.4689,
+      "Gas": 0.161,
+      "Hydro": 0.1046,
+      "Nuclear": 0.0444,
+      "Other Fossil": 0.0341,
+      "Other Renewables": 0.0042,
+      "Solar": 0.0633,
+      "Wind": 0.0645
     }
   },
   "MQ": {
@@ -8796,19 +8796,19 @@
     },
     "2021": {
       "Bioenergy": 0.0065,
-      "Coal": 0.0353,
-      "Gas": 0.8219,
+      "Coal": 0.0355,
+      "Gas": 0.8216,
       "Hydro": 0.036,
       "Nuclear": 0.0482,
-      "Other Fossil": 0.021,
+      "Other Fossil": 0.0211,
       "Other Renewables": 0.0014,
       "Solar": 0.0079,
       "Wind": 0.0218
     },
     "2022": {
       "Bioenergy": 0.0074,
-      "Coal": 0.0405,
-      "Gas": 0.774,
+      "Coal": 0.0408,
+      "Gas": 0.7736,
       "Hydro": 0.0378,
       "Nuclear": 0.048,
       "Other Fossil": 0.0239,
@@ -8818,8 +8818,8 @@
     },
     "2023": {
       "Bioenergy": 0.006,
-      "Coal": 0.0321,
-      "Gas": 0.7209,
+      "Coal": 0.0323,
+      "Gas": 0.7206,
       "Hydro": 0.0376,
       "Nuclear": 0.0437,
       "Other Fossil": 0.0111,
@@ -8829,14 +8829,14 @@
     },
     "2024": {
       "Bioenergy": 0.008,
-      "Coal": 0.0358,
-      "Gas": 0.6586,
-      "Hydro": 0.0559,
-      "Nuclear": 0.0563,
-      "Other Fossil": 0.0054,
+      "Coal": 0.0365,
+      "Gas": 0.6585,
+      "Hydro": 0.0549,
+      "Nuclear": 0.0564,
+      "Other Fossil": 0.0055,
       "Other Renewables": 0.0018,
-      "Solar": 0.1439,
-      "Wind": 0.0343
+      "Solar": 0.1437,
+      "Wind": 0.0347
     }
   },
   "MU": {
@@ -9510,8 +9510,8 @@
     "2024": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.7693,
-      "Hydro": 0.2307,
+      "Gas": 0.765,
+      "Hydro": 0.235,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
@@ -9578,13 +9578,13 @@
     "2024": {
       "Bioenergy": 0.1685,
       "Coal": 0.003,
-      "Gas": 0.0212,
-      "Hydro": 0.0857,
-      "Nuclear": 0.0021,
-      "Other Fossil": 0.3983,
+      "Gas": 0.0213,
+      "Hydro": 0.0855,
+      "Nuclear": 0.002,
+      "Other Fossil": 0.3982,
       "Other Renewables": 0.1562,
-      "Solar": 0.0118,
-      "Wind": 0.1532
+      "Solar": 0.0119,
+      "Wind": 0.1534
     }
   },
   "NL": {
@@ -9612,7 +9612,7 @@
     },
     "2021": {
       "Bioenergy": 0.0828,
-      "Coal": 0.1417,
+      "Coal": 0.1418,
       "Gas": 0.4679,
       "Hydro": 0.0054,
       "Nuclear": 0.0362,
@@ -9634,7 +9634,7 @@
     },
     "2023": {
       "Bioenergy": 0.0582,
-      "Coal": 0.0878,
+      "Coal": 0.0879,
       "Gas": 0.3833,
       "Hydro": 0.0012,
       "Nuclear": 0.0332,
@@ -9644,15 +9644,15 @@
       "Wind": 0.2525
     },
     "2024": {
-      "Bioenergy": 0.0491,
-      "Coal": 0.0523,
-      "Gas": 0.3471,
-      "Hydro": 0.0037,
-      "Nuclear": 0.0272,
-      "Other Fossil": 0.0153,
-      "Other Renewables": 0.0047,
-      "Solar": 0.2368,
-      "Wind": 0.2638
+      "Bioenergy": 0.0428,
+      "Coal": 0.0615,
+      "Gas": 0.3505,
+      "Hydro": 0.0036,
+      "Nuclear": 0.0271,
+      "Other Fossil": 0.01,
+      "Other Renewables": 0.0049,
+      "Solar": 0.2374,
+      "Wind": 0.2622
     }
   },
   "NO": {
@@ -9715,12 +9715,12 @@
       "Bioenergy": 0,
       "Coal": 0,
       "Gas": 0.011,
-      "Hydro": 0.8964,
+      "Hydro": 0.8918,
       "Nuclear": 0,
-      "Other Fossil": 0.002,
-      "Other Renewables": 0.0028,
+      "Other Fossil": 0.0019,
+      "Other Renewables": 0.0027,
       "Solar": 0,
-      "Wind": 0.0879
+      "Wind": 0.0926
     }
   },
   "NP": {
@@ -9781,14 +9781,14 @@
     },
     "2024": {
       "Bioenergy": 0.0042,
-      "Coal": 0.114,
-      "Gas": 0.0205,
-      "Hydro": 0.8061,
-      "Nuclear": 0.0109,
-      "Other Fossil": 0.0011,
-      "Other Renewables": 0.0011,
-      "Solar": 0.0249,
-      "Wind": 0.0173
+      "Coal": 0.1144,
+      "Gas": 0.0204,
+      "Hydro": 0.8065,
+      "Nuclear": 0.0108,
+      "Other Fossil": 0.0012,
+      "Other Renewables": 0.001,
+      "Solar": 0.0245,
+      "Wind": 0.017
     }
   },
   "NR": {
@@ -10392,15 +10392,15 @@
       "Wind": 0.0112
     },
     "2024": {
-      "Bioenergy": 0.0101,
-      "Coal": 0.6271,
-      "Gas": 0.1401,
-      "Hydro": 0.0758,
+      "Bioenergy": 0.0082,
+      "Coal": 0.6335,
+      "Gas": 0.1577,
+      "Hydro": 0.066,
       "Nuclear": 0,
-      "Other Fossil": 0.0072,
-      "Other Renewables": 0.0904,
-      "Solar": 0.0331,
-      "Wind": 0.0162
+      "Other Fossil": 0.0114,
+      "Other Renewables": 0.0835,
+      "Solar": 0.0311,
+      "Wind": 0.0087
     }
   },
   "PK": {
@@ -10460,15 +10460,15 @@
       "Wind": 0.0338
     },
     "2024": {
-      "Bioenergy": 0.007,
-      "Coal": 0.153,
-      "Gas": 0.2952,
-      "Hydro": 0.2957,
-      "Nuclear": 0.187,
-      "Other Fossil": 0.0199,
+      "Bioenergy": 0.0065,
+      "Coal": 0.1598,
+      "Gas": 0.2982,
+      "Hydro": 0.3001,
+      "Nuclear": 0.1808,
+      "Other Fossil": 0.0156,
       "Other Renewables": 0,
-      "Solar": 0.0099,
-      "Wind": 0.0323
+      "Solar": 0.0093,
+      "Wind": 0.0296
     }
   },
   "PL": {
@@ -10497,7 +10497,7 @@
     "2021": {
       "Bioenergy": 0.0123,
       "Coal": 0.7475,
-      "Gas": 0.08,
+      "Gas": 0.0799,
       "Hydro": 0.0148,
       "Nuclear": 0.0043,
       "Other Fossil": 0.0167,
@@ -10518,7 +10518,7 @@
     },
     "2023": {
       "Bioenergy": 0.0143,
-      "Coal": 0.6248,
+      "Coal": 0.6249,
       "Gas": 0.0861,
       "Hydro": 0.0173,
       "Nuclear": 0.0053,
@@ -10528,15 +10528,15 @@
       "Wind": 0.1447
     },
     "2024": {
-      "Bioenergy": 0.0124,
-      "Coal": 0.557,
-      "Gas": 0.0954,
-      "Hydro": 0.0195,
-      "Nuclear": 0.0058,
-      "Other Fossil": 0.0356,
-      "Other Renewables": 0.0008,
-      "Solar": 0.1325,
-      "Wind": 0.141
+      "Bioenergy": 0.013,
+      "Coal": 0.5582,
+      "Gas": 0.096,
+      "Hydro": 0.0188,
+      "Nuclear": 0.0051,
+      "Other Fossil": 0.0349,
+      "Other Renewables": 0.0007,
+      "Solar": 0.1314,
+      "Wind": 0.1419
     }
   },
   "PM": {
@@ -10665,14 +10665,14 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.1608,
-      "Gas": 0.397,
+      "Coal": 0.1575,
+      "Gas": 0.415,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.4206,
+      "Other Fossil": 0.4035,
       "Other Renewables": 0,
-      "Solar": 0.0137,
-      "Wind": 0.0078
+      "Solar": 0.0134,
+      "Wind": 0.0106
     }
   },
   "PS": {
@@ -10768,8 +10768,8 @@
     },
     "2021": {
       "Bioenergy": 0.0739,
-      "Coal": 0.0333,
-      "Gas": 0.3295,
+      "Coal": 0.0335,
+      "Gas": 0.3293,
       "Hydro": 0.2144,
       "Nuclear": 0.0258,
       "Other Fossil": 0.0073,
@@ -10779,8 +10779,8 @@
     },
     "2022": {
       "Bioenergy": 0.0711,
-      "Coal": 0.0318,
-      "Gas": 0.3752,
+      "Coal": 0.0321,
+      "Gas": 0.375,
       "Hydro": 0.1355,
       "Nuclear": 0.0383,
       "Other Fossil": 0.008,
@@ -10790,8 +10790,8 @@
     },
     "2023": {
       "Bioenergy": 0.0639,
-      "Coal": 0.0294,
-      "Gas": 0.2491,
+      "Coal": 0.0296,
+      "Gas": 0.2488,
       "Hydro": 0.2344,
       "Nuclear": 0.0422,
       "Other Fossil": 0.0079,
@@ -10800,15 +10800,15 @@
       "Wind": 0.2837
     },
     "2024": {
-      "Bioenergy": 0.0685,
-      "Coal": 0.0237,
+      "Bioenergy": 0.0691,
+      "Coal": 0.0239,
       "Gas": 0.1246,
-      "Hydro": 0.3242,
-      "Nuclear": 0.0389,
+      "Hydro": 0.3202,
+      "Nuclear": 0.0382,
       "Other Fossil": 0.0086,
       "Other Renewables": 0.0012,
-      "Solar": 0.1272,
-      "Wind": 0.283
+      "Solar": 0.1268,
+      "Wind": 0.2875
     }
   },
   "PY": {
@@ -11041,7 +11041,7 @@
     "2021": {
       "Bioenergy": 0.0109,
       "Coal": 0.1855,
-      "Gas": 0.1861,
+      "Gas": 0.186,
       "Hydro": 0.2889,
       "Nuclear": 0.1939,
       "Other Fossil": 0.0009,
@@ -11063,7 +11063,7 @@
     "2023": {
       "Bioenergy": 0.0066,
       "Coal": 0.1445,
-      "Gas": 0.1705,
+      "Gas": 0.1704,
       "Hydro": 0.3217,
       "Nuclear": 0.199,
       "Other Fossil": 0.0001,
@@ -11072,15 +11072,15 @@
       "Wind": 0.1314
     },
     "2024": {
-      "Bioenergy": 0.01,
-      "Coal": 0.136,
-      "Gas": 0.1871,
-      "Hydro": 0.3024,
-      "Nuclear": 0.1978,
+      "Bioenergy": 0.0101,
+      "Coal": 0.1342,
+      "Gas": 0.1887,
+      "Hydro": 0.2979,
+      "Nuclear": 0.2015,
       "Other Fossil": 0.0011,
       "Other Renewables": 0.0004,
-      "Solar": 0.0501,
-      "Wind": 0.115
+      "Solar": 0.0498,
+      "Wind": 0.1163
     }
   },
   "RS": {
@@ -11119,8 +11119,8 @@
     },
     "2022": {
       "Bioenergy": 0.0098,
-      "Coal": 0.6147,
-      "Gas": 0.047,
+      "Coal": 0.6148,
+      "Gas": 0.0469,
       "Hydro": 0.2548,
       "Nuclear": 0.0207,
       "Other Fossil": 0.0091,
@@ -11131,7 +11131,7 @@
     "2023": {
       "Bioenergy": 0.0069,
       "Coal": 0.6015,
-      "Gas": 0.0162,
+      "Gas": 0.0161,
       "Hydro": 0.3403,
       "Nuclear": 0.001,
       "Other Fossil": 0.0069,
@@ -11140,15 +11140,15 @@
       "Wind": 0.0268
     },
     "2024": {
-      "Bioenergy": 0.0089,
-      "Coal": 0.5733,
-      "Gas": 0.0255,
-      "Hydro": 0.3286,
-      "Nuclear": 0.0119,
-      "Other Fossil": 0.008,
+      "Bioenergy": 0.009,
+      "Coal": 0.5788,
+      "Gas": 0.0267,
+      "Hydro": 0.3219,
+      "Nuclear": 0.012,
+      "Other Fossil": 0.0082,
       "Other Renewables": 0.0004,
-      "Solar": 0.007,
-      "Wind": 0.0363
+      "Solar": 0.0069,
+      "Wind": 0.0361
     }
   },
   "RU": {
@@ -11176,47 +11176,47 @@
     },
     "2021": {
       "Bioenergy": 0.0007,
-      "Coal": 0.1539,
-      "Gas": 0.4414,
+      "Coal": 0.1589,
+      "Gas": 0.4359,
       "Hydro": 0.188,
       "Nuclear": 0.1994,
-      "Other Fossil": 0.0113,
+      "Other Fossil": 0.0118,
       "Other Renewables": 0,
       "Solar": 0.002,
       "Wind": 0.0032
     },
     "2022": {
       "Bioenergy": 0.0007,
-      "Coal": 0.1621,
-      "Gas": 0.4501,
+      "Coal": 0.1671,
+      "Gas": 0.4448,
       "Hydro": 0.1714,
-      "Nuclear": 0.1988,
-      "Other Fossil": 0.0101,
+      "Nuclear": 0.1987,
+      "Other Fossil": 0.0104,
       "Other Renewables": 0,
       "Solar": 0.0022,
       "Wind": 0.0046
     },
     "2023": {
       "Bioenergy": 0.0007,
-      "Coal": 0.1641,
-      "Gas": 0.4555,
-      "Hydro": 0.1723,
+      "Coal": 0.1687,
+      "Gas": 0.4505,
+      "Hydro": 0.1724,
       "Nuclear": 0.1914,
-      "Other Fossil": 0.0102,
+      "Other Fossil": 0.0105,
       "Other Renewables": 0,
       "Solar": 0.0019,
       "Wind": 0.0039
     },
     "2024": {
       "Bioenergy": 0.0007,
-      "Coal": 0.1619,
-      "Gas": 0.4497,
-      "Hydro": 0.1932,
-      "Nuclear": 0.1776,
-      "Other Fossil": 0.01,
+      "Coal": 0.1709,
+      "Gas": 0.4459,
+      "Hydro": 0.1857,
+      "Nuclear": 0.1797,
+      "Other Fossil": 0.0104,
       "Other Renewables": 0,
       "Solar": 0.0022,
-      "Wind": 0.0046
+      "Wind": 0.0044
     }
   },
   "RW": {
@@ -11616,15 +11616,15 @@
       "Wind": 0.2198
     },
     "2024": {
-      "Bioenergy": 0.0429,
+      "Bioenergy": 0.0421,
       "Coal": 0,
       "Gas": 0,
-      "Hydro": 0.4163,
-      "Nuclear": 0.3073,
+      "Hydro": 0.4101,
+      "Nuclear": 0.3093,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0141,
-      "Wind": 0.2195
+      "Solar": 0.0138,
+      "Wind": 0.2247
     }
   },
   "SG": {
@@ -11767,68 +11767,68 @@
     "2019": {
       "Bioenergy": 0.0086,
       "Coal": 0.2702,
-      "Gas": 0.0374,
-      "Hydro": 0.2839,
-      "Nuclear": 0.37,
+      "Gas": 0.0376,
+      "Hydro": 0.2837,
+      "Nuclear": 0.3698,
       "Other Fossil": 0.0082,
       "Other Renewables": 0.0003,
-      "Solar": 0.0168,
-      "Wind": 0.0047
+      "Solar": 0.0169,
+      "Wind": 0.0048
     },
     "2020": {
       "Bioenergy": 0.0083,
-      "Coal": 0.2455,
-      "Gas": 0.0337,
+      "Coal": 0.2453,
+      "Gas": 0.0339,
       "Hydro": 0.2968,
       "Nuclear": 0.3867,
       "Other Fossil": 0.0081,
       "Other Renewables": 0.0002,
       "Solar": 0.0171,
-      "Wind": 0.0036
+      "Wind": 0.0037
     },
     "2021": {
-      "Bioenergy": 0.0054,
-      "Coal": 0.2376,
-      "Gas": 0.0448,
-      "Hydro": 0.3071,
-      "Nuclear": 0.3712,
+      "Bioenergy": 0.0053,
+      "Coal": 0.2377,
+      "Gas": 0.0446,
+      "Hydro": 0.3072,
+      "Nuclear": 0.3713,
       "Other Fossil": 0.0089,
       "Other Renewables": 0.0003,
       "Solar": 0.0203,
-      "Wind": 0.0045
+      "Wind": 0.0044
     },
     "2022": {
-      "Bioenergy": 0.0092,
-      "Coal": 0.2256,
-      "Gas": 0.0616,
-      "Hydro": 0.24,
-      "Nuclear": 0.4134,
-      "Other Fossil": 0.0112,
+      "Bioenergy": 0.0089,
+      "Coal": 0.2264,
+      "Gas": 0.0592,
+      "Hydro": 0.241,
+      "Nuclear": 0.4159,
+      "Other Fossil": 0.0111,
       "Other Renewables": 0.0007,
-      "Solar": 0.0239,
-      "Wind": 0.0144
+      "Solar": 0.0236,
+      "Wind": 0.0133
     },
     "2023": {
       "Bioenergy": 0.0053,
-      "Coal": 0.2062,
-      "Gas": 0.0378,
-      "Hydro": 0.339,
-      "Nuclear": 0.3741,
+      "Coal": 0.2063,
+      "Gas": 0.0376,
+      "Hydro": 0.3391,
+      "Nuclear": 0.3742,
       "Other Fossil": 0.0092,
       "Other Renewables": 0.0003,
       "Solar": 0.0222,
-      "Wind": 0.006
+      "Wind": 0.0058
     },
     "2024": {
       "Bioenergy": 0.0087,
-      "Coal": 0.1933,
-      "Gas": 0.0323,
-      "Hydro": 0.3727,
-      "Nuclear": 0.3426,
-      "Other Fossil": 0.0035,
-      "Other Renewables": 0.0002,
-      "Solar": 0.0431,
-      "Wind": 0.0037
+      "Coal": 0.198,
+      "Gas": 0.0309,
+      "Hydro": 0.3589,
+      "Nuclear": 0.3522,
+      "Other Fossil": 0.0034,
+      "Other Renewables": 0.0001,
+      "Solar": 0.0446,
+      "Wind": 0.0031
     }
   },
   "SK": {
@@ -11857,7 +11857,7 @@
     "2021": {
       "Bioenergy": 0.0308,
       "Coal": 0.0511,
-      "Gas": 0.1407,
+      "Gas": 0.1406,
       "Hydro": 0.1457,
       "Nuclear": 0.533,
       "Other Fossil": 0.0602,
@@ -11867,8 +11867,8 @@
     },
     "2022": {
       "Bioenergy": 0.0294,
-      "Coal": 0.0527,
-      "Gas": 0.0777,
+      "Coal": 0.0528,
+      "Gas": 0.0776,
       "Hydro": 0.142,
       "Nuclear": 0.5908,
       "Other Fossil": 0.0639,
@@ -11888,14 +11888,14 @@
       "Wind": 0
     },
     "2024": {
-      "Bioenergy": 0.0341,
+      "Bioenergy": 0.0334,
       "Coal": 0.011,
-      "Gas": 0.0737,
-      "Hydro": 0.1927,
-      "Nuclear": 0.6041,
-      "Other Fossil": 0.045,
-      "Other Renewables": 0.0159,
-      "Solar": 0.0235,
+      "Gas": 0.0734,
+      "Hydro": 0.185,
+      "Nuclear": 0.612,
+      "Other Fossil": 0.0454,
+      "Other Renewables": 0.0164,
+      "Solar": 0.0234,
       "Wind": 0
     }
   },
@@ -12367,12 +12367,12 @@
       "Bioenergy": 0.1616,
       "Coal": 0.0011,
       "Gas": 0.2661,
-      "Hydro": 0.1763,
+      "Hydro": 0.1762,
       "Nuclear": 0.0008,
       "Other Fossil": 0.0019,
       "Other Renewables": 0.1776,
       "Solar": 0.1635,
-      "Wind": 0.0512
+      "Wind": 0.0513
     }
   },
   "SY": {
@@ -12772,15 +12772,15 @@
       "Wind": 0.0263
     },
     "2024": {
-      "Bioenergy": 0.0578,
-      "Coal": 0.2058,
-      "Gas": 0.6228,
-      "Hydro": 0.0457,
-      "Nuclear": 0.0062,
-      "Other Fossil": 0.0012,
+      "Bioenergy": 0.0589,
+      "Coal": 0.205,
+      "Gas": 0.6223,
+      "Hydro": 0.0451,
+      "Nuclear": 0.0065,
+      "Other Fossil": 0.0009,
       "Other Renewables": 0.0006,
-      "Solar": 0.0362,
-      "Wind": 0.0237
+      "Solar": 0.0366,
+      "Wind": 0.0241
     }
   },
   "TJ": {
@@ -13181,7 +13181,7 @@
     },
     "2024": {
       "Bioenergy": 0.0254,
-      "Coal": 0.3345,
+      "Coal": 0.3344,
       "Gas": 0.1609,
       "Hydro": 0.2527,
       "Nuclear": 0.0005,
@@ -13430,15 +13430,15 @@
       "Wind": 0.0615
     },
     "2022": {
-      "Bioenergy": 0.0002,
+      "Bioenergy": 0.0001,
       "Coal": 0.2257,
-      "Gas": 0.0452,
-      "Hydro": 0.0784,
-      "Nuclear": 0.5892,
-      "Other Fossil": 0.0002,
+      "Gas": 0.0443,
+      "Hydro": 0.0785,
+      "Nuclear": 0.5907,
+      "Other Fossil": 0.0001,
       "Other Renewables": 0,
-      "Solar": 0.0002,
-      "Wind": 0.0609
+      "Solar": 0.0001,
+      "Wind": 0.0605
     },
     "2023": {
       "Bioenergy": 0,
@@ -13588,15 +13588,15 @@
       "Wind": 0.1001
     },
     "2024": {
-      "Bioenergy": 0.0103,
-      "Coal": 0.1517,
-      "Gas": 0.4227,
-      "Hydro": 0.0546,
-      "Nuclear": 0.1766,
-      "Other Fossil": 0.008,
+      "Bioenergy": 0.0104,
+      "Coal": 0.1491,
+      "Gas": 0.4247,
+      "Hydro": 0.055,
+      "Nuclear": 0.1768,
+      "Other Fossil": 0.0079,
       "Other Renewables": 0.0039,
-      "Solar": 0.0711,
-      "Wind": 0.1011
+      "Solar": 0.0706,
+      "Wind": 0.1017
     }
   },
   "UY": {
@@ -13656,15 +13656,15 @@
       "Wind": 0.4065
     },
     "2024": {
-      "Bioenergy": 0.1283,
+      "Bioenergy": 0.1268,
       "Coal": 0,
-      "Gas": 0.0095,
-      "Hydro": 0.5207,
+      "Gas": 0.0085,
+      "Hydro": 0.5107,
       "Nuclear": 0,
       "Other Fossil": 0.0009,
       "Other Renewables": 0,
-      "Solar": 0.0273,
-      "Wind": 0.3133
+      "Solar": 0.0269,
+      "Wind": 0.3262
     }
   },
   "UZ": {
@@ -13728,7 +13728,7 @@
       "Coal": 0.0474,
       "Gas": 0.8346,
       "Hydro": 0.1021,
-      "Nuclear": 0.0011,
+      "Nuclear": 0.001,
       "Other Fossil": 0.0111,
       "Other Renewables": 0.0001,
       "Solar": 0.0017,
@@ -14247,8 +14247,8 @@
     },
     "2022": {
       "Bioenergy": 0.0026,
-      "Coal": 0.8592,
-      "Gas": 0.0233,
+      "Coal": 0.8593,
+      "Gas": 0.0232,
       "Hydro": 0.0323,
       "Nuclear": 0.0176,
       "Other Fossil": 0.0018,
@@ -14258,8 +14258,8 @@
     },
     "2023": {
       "Bioenergy": 0.0037,
-      "Coal": 0.7781,
-      "Gas": 0.0329,
+      "Coal": 0.7783,
+      "Gas": 0.0328,
       "Hydro": 0.0752,
       "Nuclear": 0.0263,
       "Other Fossil": 0.0027,
@@ -14268,15 +14268,15 @@
       "Wind": 0.074
     },
     "2024": {
-      "Bioenergy": 0.0015,
-      "Coal": 0.8531,
-      "Gas": 0.0137,
-      "Hydro": 0.0565,
-      "Nuclear": 0.0108,
+      "Bioenergy": 0.0016,
+      "Coal": 0.8641,
+      "Gas": 0.0141,
+      "Hydro": 0.0479,
+      "Nuclear": 0.0111,
       "Other Fossil": 0.0011,
       "Other Renewables": 0.0003,
-      "Solar": 0.0015,
-      "Wind": 0.0615
+      "Solar": 0.0016,
+      "Wind": 0.0582
     }
   },
   "YE": {