@digital4better/data 1.1.33 → 1.1.35

package/data/mix/country-yearly.json

@@ -124,15 +124,15 @@
       "Wind": 0.0577
     },
     "2024": {
-      "Bioenergy": 0.0177,
-      "Coal": 0.4895,
-      "Gas": 0.0828,
-      "Hydro": 0.2087,
-      "Nuclear": 0.0429,
+      "Bioenergy": 0.0176,
+      "Coal": 0.4873,
+      "Gas": 0.0825,
+      "Hydro": 0.2089,
+      "Nuclear": 0.043,
       "Other Fossil": 0.0219,
       "Other Renewables": 0.0042,
-      "Solar": 0.0645,
-      "Wind": 0.0677
+      "Solar": 0.0658,
+      "Wind": 0.0688
     }
   },
   "AG": {
@@ -260,15 +260,15 @@
       "Wind": 0.0402
     },
     "2024": {
-      "Bioenergy": 0.009,
-      "Coal": 0.0419,
-      "Gas": 0.0731,
-      "Hydro": 0.7399,
-      "Nuclear": 0.0622,
-      "Other Fossil": 0.0059,
+      "Bioenergy": 0.0091,
+      "Coal": 0.0406,
+      "Gas": 0.0711,
+      "Hydro": 0.741,
+      "Nuclear": 0.0624,
+      "Other Fossil": 0.0058,
       "Other Renewables": 0.002,
-      "Solar": 0.0187,
-      "Wind": 0.0473
+      "Solar": 0.021,
+      "Wind": 0.0469
     }
   },
   "AM": {
@@ -464,15 +464,15 @@
       "Wind": 0.1017
     },
     "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": {
@@ -600,15 +600,15 @@
       "Wind": 0.1399
     },
     "2024": {
-      "Bioenergy": 0.0266,
+      "Bioenergy": 0.0278,
       "Coal": 0,
-      "Gas": 0.1088,
-      "Hydro": 0.606,
+      "Gas": 0.0949,
+      "Hydro": 0.6122,
       "Nuclear": 0,
-      "Other Fossil": 0.0153,
+      "Other Fossil": 0.0154,
       "Other Renewables": 0,
-      "Solar": 0.0602,
-      "Wind": 0.1831
+      "Solar": 0.0709,
+      "Wind": 0.1789
     }
   },
   "AU": {
@@ -668,15 +668,15 @@
       "Wind": 0.1345
     },
     "2024": {
-      "Bioenergy": 0.0014,
-      "Coal": 0.5483,
-      "Gas": 0.0679,
-      "Hydro": 0.0513,
+      "Bioenergy": 0.0015,
+      "Coal": 0.5515,
+      "Gas": 0.0685,
+      "Hydro": 0.0532,
       "Nuclear": 0,
-      "Other Fossil": 0.0004,
+      "Other Fossil": 0.0003,
       "Other Renewables": 0,
-      "Solar": 0.2077,
-      "Wind": 0.123
+      "Solar": 0.2027,
+      "Wind": 0.1224
     }
   },
   "AW": {
@@ -873,14 +873,14 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.5843,
+      "Coal": 0.5918,
       "Gas": 0,
-      "Hydro": 0.387,
+      "Hydro": 0.3786,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0135,
-      "Wind": 0.0151
+      "Solar": 0.0152,
+      "Wind": 0.0145
     }
   },
   "BB": {
@@ -1009,14 +1009,14 @@
     },
     "2024": {
       "Bioenergy": 0.0038,
-      "Coal": 0.4052,
-      "Gas": 0.4472,
-      "Hydro": 0.02,
+      "Coal": 0.4048,
+      "Gas": 0.4478,
+      "Hydro": 0.0198,
       "Nuclear": 0.0092,
-      "Other Fossil": 0.0778,
+      "Other Fossil": 0.0772,
       "Other Renewables": 0.0009,
-      "Solar": 0.0213,
-      "Wind": 0.0146
+      "Solar": 0.0217,
+      "Wind": 0.0148
     }
   },
   "BE": {
@@ -1076,15 +1076,15 @@
       "Wind": 0.1829
     },
     "2024": {
-      "Bioenergy": 0.0098,
-      "Coal": 0.0174,
-      "Gas": 0.1627,
-      "Hydro": 0.0259,
-      "Nuclear": 0.4,
-      "Other Fossil": 0.0773,
+      "Bioenergy": 0.0093,
+      "Coal": 0.0169,
+      "Gas": 0.1546,
+      "Hydro": 0.0261,
+      "Nuclear": 0.3949,
+      "Other Fossil": 0.075,
       "Other Renewables": 0.0008,
-      "Solar": 0.0785,
-      "Wind": 0.2277
+      "Solar": 0.0918,
+      "Wind": 0.2306
     }
   },
   "BF": {
@@ -1212,15 +1212,15 @@
       "Wind": 0.0386
     },
     "2024": {
-      "Bioenergy": 0.0037,
-      "Coal": 0.2544,
-      "Gas": 0.0721,
-      "Hydro": 0.082,
-      "Nuclear": 0.4538,
-      "Other Fossil": 0.0005,
-      "Other Renewables": 0.0002,
-      "Solar": 0.0879,
-      "Wind": 0.0455
+      "Bioenergy": 0.0036,
+      "Coal": 0.2417,
+      "Gas": 0.0675,
+      "Hydro": 0.0889,
+      "Nuclear": 0.4565,
+      "Other Fossil": 0.0004,
+      "Other Renewables": 0.0001,
+      "Solar": 0.0971,
+      "Wind": 0.0443
     }
   },
   "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": {
@@ -1688,15 +1688,15 @@
       "Wind": 0.1416
     },
     "2024": {
-      "Bioenergy": 0.0076,
-      "Coal": 0.0093,
+      "Bioenergy": 0.0085,
+      "Coal": 0.0082,
       "Gas": 0.0379,
-      "Hydro": 0.7169,
-      "Nuclear": 0.024,
-      "Other Fossil": 0.0107,
+      "Hydro": 0.7159,
+      "Nuclear": 0.0242,
+      "Other Fossil": 0.0105,
       "Other Renewables": 0,
-      "Solar": 0.0968,
-      "Wind": 0.0968
+      "Solar": 0.0969,
+      "Wind": 0.0979
     }
   },
   "BS": {
@@ -2029,14 +2029,14 @@
     },
     "2024": {
       "Bioenergy": 0.1699,
-      "Coal": 0.0166,
-      "Gas": 0.0907,
-      "Hydro": 0.5354,
-      "Nuclear": 0.0099,
-      "Other Fossil": 0.1036,
-      "Other Renewables": 0.0025,
-      "Solar": 0.0407,
-      "Wind": 0.0308
+      "Coal": 0.0167,
+      "Gas": 0.0905,
+      "Hydro": 0.5357,
+      "Nuclear": 0.0098,
+      "Other Fossil": 0.1037,
+      "Other Renewables": 0.0024,
+      "Solar": 0.0408,
+      "Wind": 0.0305
     }
   },
   "CA": {
@@ -2097,14 +2097,14 @@
     },
     "2024": {
       "Bioenergy": 0.0158,
-      "Coal": 0.046,
-      "Gas": 0.1444,
-      "Hydro": 0.5769,
-      "Nuclear": 0.1265,
-      "Other Fossil": 0.0104,
+      "Coal": 0.0459,
+      "Gas": 0.1442,
+      "Hydro": 0.5765,
+      "Nuclear": 0.1267,
+      "Other Fossil": 0.0103,
       "Other Renewables": 0.0004,
-      "Solar": 0.0054,
-      "Wind": 0.0742
+      "Solar": 0.0056,
+      "Wind": 0.0746
     }
   },
   "CD": {
@@ -2369,14 +2369,14 @@
     },
     "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.5612,
+      "Nuclear": 0.3339,
+      "Other Fossil": 0.0496,
       "Other Renewables": 0,
-      "Solar": 0.046,
-      "Wind": 0.002
+      "Solar": 0.0525,
+      "Wind": 0.0019
     }
   },
   "CI": {
@@ -2572,14 +2572,14 @@
       "Wind": 0.1187
     },
     "2024": {
-      "Bioenergy": 0.026,
-      "Coal": 0.176,
-      "Gas": 0.1686,
-      "Hydro": 0.2615,
+      "Bioenergy": 0.0258,
+      "Coal": 0.1858,
+      "Gas": 0.1761,
+      "Hydro": 0.2489,
       "Nuclear": 0,
-      "Other Fossil": 0.013,
-      "Other Renewables": 0.0046,
-      "Solar": 0.2355,
+      "Other Fossil": 0.0136,
+      "Other Renewables": 0.0045,
+      "Solar": 0.2304,
       "Wind": 0.1148
     }
   },
@@ -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.6092,
+      "Gas": 0.0301,
+      "Hydro": 0.0992,
+      "Nuclear": 0.0462,
       "Other Fossil": 0.002,
       "Other Renewables": 0,
-      "Solar": 0.075,
-      "Wind": 0.1159
+      "Solar": 0.0776,
+      "Wind": 0.1172
     }
   },
   "CO": {
@@ -2777,14 +2777,14 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.1649,
-      "Gas": 0.1023,
-      "Hydro": 0.6805,
+      "Coal": 0.1725,
+      "Gas": 0.0857,
+      "Hydro": 0.6859,
       "Nuclear": 0,
-      "Other Fossil": 0.0085,
+      "Other Fossil": 0.0092,
       "Other Renewables": 0,
-      "Solar": 0.0409,
-      "Wind": 0.003
+      "Solar": 0.0434,
+      "Wind": 0.0032
     }
   },
   "CR": {
@@ -2845,14 +2845,14 @@
     },
     "2024": {
       "Bioenergy": 0.0097,
-      "Coal": 0.0017,
-      "Gas": 0.0091,
-      "Hydro": 0.5107,
+      "Coal": 0.0016,
+      "Gas": 0.0088,
+      "Hydro": 0.504,
       "Nuclear": 0.001,
-      "Other Fossil": 0.1923,
-      "Other Renewables": 0.115,
-      "Solar": 0.003,
-      "Wind": 0.1577
+      "Other Fossil": 0.2029,
+      "Other Renewables": 0.1145,
+      "Solar": 0.0029,
+      "Wind": 0.1547
     }
   },
   "CU": {
@@ -3053,10 +3053,10 @@
       "Gas": 0,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.8387,
+      "Other Fossil": 0.8394,
       "Other Renewables": 0,
-      "Solar": 0.1291,
-      "Wind": 0.0323
+      "Solar": 0.1296,
+      "Wind": 0.0311
     }
   },
   "CZ": {
@@ -3116,15 +3116,15 @@
       "Wind": 0.0105
     },
     "2024": {
-      "Bioenergy": 0.0337,
-      "Coal": 0.3543,
-      "Gas": 0.051,
-      "Hydro": 0.0437,
-      "Nuclear": 0.4128,
+      "Bioenergy": 0.0349,
+      "Coal": 0.3445,
+      "Gas": 0.0501,
+      "Hydro": 0.0416,
+      "Nuclear": 0.4165,
       "Other Fossil": 0.0141,
-      "Other Renewables": 0.035,
-      "Solar": 0.0427,
-      "Wind": 0.0128
+      "Other Renewables": 0.0359,
+      "Solar": 0.0499,
+      "Wind": 0.0126
     }
   },
   "DE": {
@@ -3184,15 +3184,15 @@
       "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.089,
+      "Coal": 0.1985,
+      "Gas": 0.1689,
+      "Hydro": 0.0489,
+      "Nuclear": 0.0062,
+      "Other Fossil": 0.0428,
       "Other Renewables": 0.0002,
-      "Solar": 0.1019,
-      "Wind": 0.3365
+      "Solar": 0.1175,
+      "Wind": 0.3278
     }
   },
   "DJ": {
@@ -3320,15 +3320,15 @@
       "Wind": 0.5469
     },
     "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.1195,
+      "Coal": 0.1022,
+      "Gas": 0.0664,
+      "Hydro": 0.0065,
+      "Nuclear": 0.0063,
+      "Other Fossil": 0.0335,
+      "Other Renewables": 0.0002,
+      "Solar": 0.0706,
+      "Wind": 0.5948
     }
   },
   "DM": {
@@ -3592,15 +3592,15 @@
       "Wind": 0.0087
     },
     "2024": {
-      "Bioenergy": 0.0009,
-      "Coal": 0.0003,
+      "Bioenergy": 0.0007,
+      "Coal": 0.0002,
       "Gas": 0.0276,
-      "Hydro": 0.7389,
-      "Nuclear": 0.0002,
-      "Other Fossil": 0.2279,
+      "Hydro": 0.7387,
+      "Nuclear": 0.0001,
+      "Other Fossil": 0.2283,
       "Other Renewables": 0,
-      "Solar": 0.0005,
-      "Wind": 0.0039
+      "Solar": 0.0004,
+      "Wind": 0.0038
     }
   },
   "EE": {
@@ -3660,15 +3660,15 @@
       "Wind": 0.1559
     },
     "2024": {
-      "Bioenergy": 0.074,
-      "Coal": 0.0591,
-      "Gas": 0.103,
-      "Hydro": 0.0825,
-      "Nuclear": 0.0872,
-      "Other Fossil": 0.3291,
+      "Bioenergy": 0.0716,
+      "Coal": 0.0575,
+      "Gas": 0.1007,
+      "Hydro": 0.0844,
+      "Nuclear": 0.0877,
+      "Other Fossil": 0.3135,
       "Other Renewables": 0.0028,
-      "Solar": 0.0662,
-      "Wind": 0.1962
+      "Solar": 0.0839,
+      "Wind": 0.1979
     }
   },
   "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,
+      "Gas": 0.1412,
+      "Hydro": 0.1843,
+      "Nuclear": 0.2028,
+      "Other Fossil": 0.0088,
       "Other Renewables": 0.0028,
-      "Solar": 0.1469,
-      "Wind": 0.2819
+      "Solar": 0.1617,
+      "Wind": 0.2735
     }
   },
   "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.1273,
+      "Coal": 0.0352,
+      "Gas": 0.0343,
+      "Hydro": 0.1849,
+      "Nuclear": 0.3312,
+      "Other Fossil": 0.0507,
       "Other Renewables": 0.0006,
-      "Solar": 0.0117,
-      "Wind": 0.2205
+      "Solar": 0.0149,
+      "Wind": 0.2208
     }
   },
   "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.001,
+      "Gas": 0.0424,
+      "Hydro": 0.1285,
+      "Nuclear": 0.6714,
       "Other Fossil": 0.0057,
       "Other Renewables": 0,
-      "Solar": 0.0336,
-      "Wind": 0.1065
+      "Solar": 0.038,
+      "Wind": 0.1072
     }
   },
   "GA": {
@@ -4408,15 +4408,15 @@
       "Wind": 0.3141
     },
     "2024": {
-      "Bioenergy": 0.0675,
-      "Coal": 0.029,
-      "Gas": 0.2977,
-      "Hydro": 0.0389,
-      "Nuclear": 0.1451,
-      "Other Fossil": 0.0124,
+      "Bioenergy": 0.0691,
+      "Coal": 0.0276,
+      "Gas": 0.2796,
+      "Hydro": 0.0385,
+      "Nuclear": 0.1538,
+      "Other Fossil": 0.0126,
       "Other Renewables": 0.0008,
-      "Solar": 0.0412,
-      "Wind": 0.3674
+      "Solar": 0.0475,
+      "Wind": 0.3706
     }
   },
   "GD": {
@@ -4544,15 +4544,15 @@
       "Wind": 0.0123
     },
     "2024": {
-      "Bioenergy": 0.0019,
-      "Coal": 0.0514,
-      "Gas": 0.2671,
-      "Hydro": 0.6531,
-      "Nuclear": 0.0046,
-      "Other Fossil": 0.0006,
+      "Bioenergy": 0.0016,
+      "Coal": 0.0423,
+      "Gas": 0.2313,
+      "Hydro": 0.7014,
+      "Nuclear": 0.0038,
+      "Other Fossil": 0.0005,
       "Other Renewables": 0.0004,
-      "Solar": 0.0056,
-      "Wind": 0.0152
+      "Solar": 0.0046,
+      "Wind": 0.0142
     }
   },
   "GF": {
@@ -5156,15 +5156,15 @@
       "Wind": 0.2196
     },
     "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.085,
+      "Gas": 0.3646,
+      "Hydro": 0.0648,
+      "Nuclear": 0.0066,
+      "Other Fossil": 0.0006,
+      "Other Renewables": 0.0002,
+      "Solar": 0.2077,
+      "Wind": 0.2694
     }
   },
   "GT": {
@@ -5497,14 +5497,14 @@
     },
     "2024": {
       "Bioenergy": 0.0082,
-      "Coal": 0.5725,
-      "Gas": 0.3404,
+      "Coal": 0.5719,
+      "Gas": 0.3403,
       "Hydro": 0.0209,
       "Nuclear": 0.0131,
-      "Other Fossil": 0.0053,
+      "Other Fossil": 0.0052,
       "Other Renewables": 0.0013,
-      "Solar": 0.0175,
-      "Wind": 0.0207
+      "Solar": 0.0179,
+      "Wind": 0.021
     }
   },
   "HN": {
@@ -5632,15 +5632,15 @@
       "Wind": 0.1605
     },
     "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.0426,
+      "Coal": 0.0227,
+      "Gas": 0.2271,
+      "Hydro": 0.4319,
+      "Nuclear": 0.0358,
+      "Other Fossil": 0.0105,
+      "Other Renewables": 0.0155,
+      "Solar": 0.0212,
+      "Wind": 0.1926
     }
   },
   "HT": {
@@ -5768,15 +5768,15 @@
       "Wind": 0.0476
     },
     "2024": {
-      "Bioenergy": 0.0285,
-      "Coal": 0.0931,
-      "Gas": 0.204,
-      "Hydro": 0.053,
-      "Nuclear": 0.3602,
-      "Other Fossil": 0.019,
+      "Bioenergy": 0.0282,
+      "Coal": 0.0902,
+      "Gas": 0.1917,
+      "Hydro": 0.0497,
+      "Nuclear": 0.3641,
+      "Other Fossil": 0.018,
       "Other Renewables": 0.0036,
-      "Solar": 0.1789,
-      "Wind": 0.0597
+      "Solar": 0.1983,
+      "Wind": 0.0561
     }
   },
   "ID": {
@@ -5904,15 +5904,15 @@
       "Wind": 0.3546
     },
     "2024": {
-      "Bioenergy": 0.0063,
-      "Coal": 0.0511,
-      "Gas": 0.4094,
-      "Hydro": 0.0601,
-      "Nuclear": 0.0201,
+      "Bioenergy": 0.0064,
+      "Coal": 0.0506,
+      "Gas": 0.4087,
+      "Hydro": 0.0604,
+      "Nuclear": 0.0202,
       "Other Fossil": 0.036,
-      "Other Renewables": 0.0006,
-      "Solar": 0.012,
-      "Wind": 0.4044
+      "Other Renewables": 0.0007,
+      "Solar": 0.0128,
+      "Wind": 0.4043
     }
   },
   "IL": {
@@ -6040,15 +6040,15 @@
       "Wind": 0.0482
     },
     "2024": {
-      "Bioenergy": 0.0135,
-      "Coal": 0.7846,
+      "Bioenergy": 0.0131,
+      "Coal": 0.7836,
       "Gas": 0.0171,
-      "Hydro": 0.0487,
+      "Hydro": 0.049,
       "Nuclear": 0.0271,
       "Other Fossil": 0.0002,
       "Other Renewables": 0.0017,
-      "Solar": 0.0758,
-      "Wind": 0.0313
+      "Solar": 0.077,
+      "Wind": 0.0312
     }
   },
   "IQ": {
@@ -6312,15 +6312,15 @@
       "Wind": 0.1018
     },
     "2024": {
-      "Bioenergy": 0.0594,
-      "Coal": 0.0424,
-      "Gas": 0.3909,
-      "Hydro": 0.1724,
-      "Nuclear": 0.0414,
-      "Other Fossil": 0.0348,
-      "Other Renewables": 0.0199,
-      "Solar": 0.1075,
-      "Wind": 0.1313
+      "Bioenergy": 0.0598,
+      "Coal": 0.04,
+      "Gas": 0.3753,
+      "Hydro": 0.1812,
+      "Nuclear": 0.0394,
+      "Other Fossil": 0.0345,
+      "Other Renewables": 0.0201,
+      "Solar": 0.1211,
+      "Wind": 0.1285
     }
   },
   "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.0611,
+      "Coal": 0.3093,
+      "Gas": 0.3301,
+      "Hydro": 0.064,
+      "Nuclear": 0.0834,
+      "Other Fossil": 0.0454,
+      "Other Renewables": 0.0103,
+      "Solar": 0.0851,
+      "Wind": 0.0111
     }
   },
   "KE": {
@@ -6721,14 +6721,14 @@
     },
     "2024": {
       "Bioenergy": 0.0139,
-      "Coal": 0.4798,
-      "Gas": 0.026,
-      "Hydro": 0.3603,
+      "Coal": 0.4791,
+      "Gas": 0.0259,
+      "Hydro": 0.3604,
       "Nuclear": 0.0135,
       "Other Fossil": 0.0563,
       "Other Renewables": 0.0013,
-      "Solar": 0.0277,
-      "Wind": 0.0212
+      "Solar": 0.0281,
+      "Wind": 0.0216
     }
   },
   "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.6781,
+      "Gas": 0.2087,
+      "Hydro": 0.0621,
       "Nuclear": 0,
       "Other Fossil": 0.0009,
       "Other Renewables": 0,
-      "Solar": 0.0116,
-      "Wind": 0.0382
+      "Solar": 0.0122,
+      "Wind": 0.0381
     }
   },
   "LA": {
@@ -7740,15 +7740,15 @@
       "Wind": 0.2723
     },
     "2024": {
-      "Bioenergy": 0.0315,
-      "Coal": 0.0645,
-      "Gas": 0.1793,
-      "Hydro": 0.1335,
-      "Nuclear": 0.0945,
-      "Other Fossil": 0.0669,
+      "Bioenergy": 0.0317,
+      "Coal": 0.0613,
+      "Gas": 0.1692,
+      "Hydro": 0.1323,
+      "Nuclear": 0.0928,
+      "Other Fossil": 0.0705,
       "Other Renewables": 0.003,
-      "Solar": 0.0739,
-      "Wind": 0.353
+      "Solar": 0.089,
+      "Wind": 0.3503
     }
   },
   "LU": {
@@ -7808,15 +7808,15 @@
       "Wind": 0.2013
     },
     "2024": {
-      "Bioenergy": 0.0509,
-      "Coal": 0.098,
-      "Gas": 0.1951,
-      "Hydro": 0.161,
-      "Nuclear": 0.1448,
+      "Bioenergy": 0.0499,
+      "Coal": 0.0941,
+      "Gas": 0.1891,
+      "Hydro": 0.1625,
+      "Nuclear": 0.1438,
       "Other Fossil": 0.0376,
       "Other Renewables": 0.0046,
-      "Solar": 0.0782,
-      "Wind": 0.2298
+      "Solar": 0.0894,
+      "Wind": 0.2291
     }
   },
   "LV": {
@@ -7876,15 +7876,15 @@
       "Wind": 0.0653
     },
     "2024": {
-      "Bioenergy": 0.0251,
+      "Bioenergy": 0.0254,
       "Coal": 0,
-      "Gas": 0.3078,
-      "Hydro": 0.6258,
+      "Gas": 0.2614,
+      "Hydro": 0.6722,
       "Nuclear": 0,
-      "Other Fossil": 0.0125,
+      "Other Fossil": 0.0127,
       "Other Renewables": 0,
       "Solar": 0,
-      "Wind": 0.0287
+      "Wind": 0.0283
     }
   },
   "LY": {
@@ -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.0059,
+      "Gas": 0.9054,
+      "Hydro": 0.0494,
+      "Nuclear": 0.0083,
+      "Other Fossil": 0.0008,
       "Other Renewables": 0.0003,
-      "Solar": 0.0015,
-      "Wind": 0.0286
+      "Solar": 0.0012,
+      "Wind": 0.0275
     }
   },
   "ME": {
@@ -8149,14 +8149,14 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.3405,
+      "Coal": 0.3177,
       "Gas": 0,
-      "Hydro": 0.5477,
+      "Hydro": 0.5608,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0154,
-      "Wind": 0.0964
+      "Solar": 0.021,
+      "Wind": 0.1005
     }
   },
   "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.2685,
+      "Hydro": 0.2127,
+      "Nuclear": 0.009,
+      "Other Fossil": 0.0009,
       "Other Renewables": 0.0003,
-      "Solar": 0.018,
-      "Wind": 0.0423
+      "Solar": 0.0179,
+      "Wind": 0.041
     }
   },
   "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": {
@@ -8556,15 +8556,15 @@
       "Wind": 0.0601
     },
     "2024": {
-      "Bioenergy": 0.0562,
-      "Coal": 0.4961,
-      "Gas": 0.1636,
-      "Hydro": 0.0711,
+      "Bioenergy": 0.0561,
+      "Coal": 0.4939,
+      "Gas": 0.1633,
+      "Hydro": 0.0713,
       "Nuclear": 0.0448,
       "Other Fossil": 0.0346,
       "Other Renewables": 0.0044,
-      "Solar": 0.0585,
-      "Wind": 0.0706
+      "Solar": 0.0599,
+      "Wind": 0.0717
     }
   },
   "MQ": {
@@ -8829,14 +8829,14 @@
     },
     "2024": {
       "Bioenergy": 0.0072,
-      "Coal": 0.0341,
-      "Gas": 0.6929,
-      "Hydro": 0.0473,
-      "Nuclear": 0.0502,
-      "Other Fossil": 0.0048,
+      "Coal": 0.0324,
+      "Gas": 0.6907,
+      "Hydro": 0.0472,
+      "Nuclear": 0.0493,
+      "Other Fossil": 0.0046,
       "Other Renewables": 0.0016,
-      "Solar": 0.1233,
-      "Wind": 0.0385
+      "Solar": 0.1298,
+      "Wind": 0.0374
     }
   },
   "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.0007,
+      "Coal": 0.0752,
+      "Gas": 0.5685,
+      "Hydro": 0.044,
+      "Nuclear": 0.0358,
+      "Other Fossil": 0.1417,
+      "Other Renewables": 0.0118,
+      "Solar": 0.0546,
+      "Wind": 0.0676
     }
   },
   "MY": {
@@ -9510,8 +9510,8 @@
     "2024": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.7469,
-      "Hydro": 0.2531,
+      "Gas": 0.7498,
+      "Hydro": 0.2502,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
@@ -9579,12 +9579,12 @@
       "Bioenergy": 0.1683,
       "Coal": 0.0034,
       "Gas": 0.0184,
-      "Hydro": 0.0892,
+      "Hydro": 0.0893,
       "Nuclear": 0.002,
-      "Other Fossil": 0.3984,
+      "Other Fossil": 0.3985,
       "Other Renewables": 0.1562,
       "Solar": 0.0121,
-      "Wind": 0.152
+      "Wind": 0.1519
     }
   },
   "NL": {
@@ -9644,15 +9644,15 @@
       "Wind": 0.2466
     },
     "2024": {
-      "Bioenergy": 0.0454,
-      "Coal": 0.0835,
-      "Gas": 0.3664,
+      "Bioenergy": 0.0453,
+      "Coal": 0.0733,
+      "Gas": 0.3551,
       "Hydro": 0,
-      "Nuclear": 0.0263,
+      "Nuclear": 0.0222,
       "Other Fossil": 0.013,
-      "Other Renewables": 0.0033,
-      "Solar": 0.1249,
-      "Wind": 0.3371
+      "Other Renewables": 0.0032,
+      "Solar": 0.1475,
+      "Wind": 0.3404
     }
   },
   "NO": {
@@ -9714,13 +9714,13 @@
     "2024": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.0105,
-      "Hydro": 0.8824,
+      "Gas": 0.0107,
+      "Hydro": 0.884,
       "Nuclear": 0,
       "Other Fossil": 0.0016,
-      "Other Renewables": 0.0023,
+      "Other Renewables": 0.0022,
       "Solar": 0,
-      "Wind": 0.1032
+      "Wind": 0.1015
     }
   },
   "NP": {
@@ -9781,14 +9781,14 @@
     },
     "2024": {
       "Bioenergy": 0.0045,
-      "Coal": 0.121,
-      "Gas": 0.0211,
+      "Coal": 0.1205,
+      "Gas": 0.021,
       "Hydro": 0.7983,
       "Nuclear": 0.0109,
       "Other Fossil": 0.0013,
       "Other Renewables": 0.0011,
-      "Solar": 0.0233,
-      "Wind": 0.0185
+      "Solar": 0.0236,
+      "Wind": 0.0188
     }
   },
   "NR": {
@@ -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.0114,
+      "Coal": 0.1438,
+      "Gas": 0.3084,
+      "Hydro": 0.2375,
+      "Nuclear": 0.2439,
+      "Other Fossil": 0.0216,
       "Other Renewables": 0,
-      "Solar": 0.0115,
-      "Wind": 0.0204
+      "Solar": 0.012,
+      "Wind": 0.0213
     }
   },
   "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.01,
+      "Coal": 0.5767,
+      "Gas": 0.0992,
+      "Hydro": 0.0216,
+      "Nuclear": 0.0051,
+      "Other Fossil": 0.022,
       "Other Renewables": 0.0002,
-      "Solar": 0.0725,
-      "Wind": 0.1843
+      "Solar": 0.0847,
+      "Wind": 0.1804
     }
   },
   "PM": {
@@ -10665,14 +10665,14 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.1981,
-      "Gas": 0.4646,
+      "Coal": 0.197,
+      "Gas": 0.4621,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.3184,
+      "Other Fossil": 0.3219,
       "Other Renewables": 0,
-      "Solar": 0.0094,
-      "Wind": 0.0094
+      "Solar": 0.0095,
+      "Wind": 0.0095
     }
   },
   "PS": {
@@ -10800,15 +10800,15 @@
       "Wind": 0.2839
     },
     "2024": {
-      "Bioenergy": 0.0601,
-      "Coal": 0.0031,
-      "Gas": 0.1076,
-      "Hydro": 0.4213,
-      "Nuclear": 0.0043,
-      "Other Fossil": 0.0052,
+      "Bioenergy": 0.0617,
+      "Coal": 0.0026,
+      "Gas": 0.0961,
+      "Hydro": 0.4267,
+      "Nuclear": 0.0036,
+      "Other Fossil": 0.0053,
       "Other Renewables": 0.0001,
-      "Solar": 0.0714,
-      "Wind": 0.3269
+      "Solar": 0.0794,
+      "Wind": 0.3245
     }
   },
   "PY": {
@@ -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,
+      "Bioenergy": 0.009,
+      "Coal": 0.1133,
+      "Gas": 0.1771,
+      "Hydro": 0.3169,
+      "Nuclear": 0.2149,
+      "Other Fossil": 0.0003,
       "Other Renewables": 0.0001,
-      "Solar": 0.029,
-      "Wind": 0.137
+      "Solar": 0.0337,
+      "Wind": 0.1348
     }
   },
   "RS": {
@@ -11140,15 +11140,15 @@
       "Wind": 0.0268
     },
     "2024": {
-      "Bioenergy": 0.0074,
-      "Coal": 0.59,
-      "Gas": 0.0113,
-      "Hydro": 0.3486,
+      "Bioenergy": 0.0075,
+      "Coal": 0.5905,
+      "Gas": 0.0093,
+      "Hydro": 0.3492,
       "Nuclear": 0,
-      "Other Fossil": 0.0066,
+      "Other Fossil": 0.0068,
       "Other Renewables": 0,
       "Solar": 0,
-      "Wind": 0.0361
+      "Wind": 0.0367
     }
   },
   "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.0502,
       "Coal": 0,
       "Gas": 0,
-      "Hydro": 0.411,
-      "Nuclear": 0.2972,
+      "Hydro": 0.4135,
+      "Nuclear": 0.2966,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0044,
-      "Wind": 0.2378
+      "Solar": 0.0057,
+      "Wind": 0.2341
     }
   },
   "SG": {
@@ -11820,15 +11820,15 @@
       "Wind": 0.0059
     },
     "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.0107,
+      "Coal": 0.2337,
+      "Gas": 0.0463,
+      "Hydro": 0.3919,
+      "Nuclear": 0.2609,
+      "Other Fossil": 0.0046,
+      "Other Renewables": 0.0005,
+      "Solar": 0.0409,
+      "Wind": 0.0105
     }
   },
   "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.0306,
+      "Coal": 0.0168,
+      "Gas": 0.0695,
+      "Hydro": 0.188,
+      "Nuclear": 0.6163,
+      "Other Fossil": 0.0471,
+      "Other Renewables": 0.0153,
+      "Solar": 0.0163,
       "Wind": 0
     }
   },
@@ -12772,15 +12772,15 @@
       "Wind": 0.0263
     },
     "2024": {
-      "Bioenergy": 0.0718,
-      "Coal": 0.2151,
-      "Gas": 0.6061,
-      "Hydro": 0.0432,
+      "Bioenergy": 0.0713,
+      "Coal": 0.2158,
+      "Gas": 0.6055,
+      "Hydro": 0.0431,
       "Nuclear": 0.0055,
       "Other Fossil": 0.0011,
       "Other Renewables": 0.0005,
       "Solar": 0.0311,
-      "Wind": 0.0258
+      "Wind": 0.0261
     }
   },
   "TJ": {
@@ -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.0278,
+      "Coal": 0.326,
+      "Gas": 0.1227,
+      "Hydro": 0.2985,
+      "Nuclear": 0.0006,
+      "Other Fossil": 0.0036,
+      "Other Renewables": 0.0337,
+      "Solar": 0.0686,
+      "Wind": 0.1185
     }
   },
   "TT": {
@@ -13588,15 +13588,15 @@
       "Wind": 0.0998
     },
     "2024": {
-      "Bioenergy": 0.0108,
-      "Coal": 0.1433,
-      "Gas": 0.4025,
-      "Hydro": 0.0596,
-      "Nuclear": 0.188,
+      "Bioenergy": 0.0107,
+      "Coal": 0.1383,
+      "Gas": 0.3999,
+      "Hydro": 0.0597,
+      "Nuclear": 0.187,
       "Other Fossil": 0.0071,
-      "Other Renewables": 0.0044,
-      "Solar": 0.0572,
-      "Wind": 0.1271
+      "Other Renewables": 0.0045,
+      "Solar": 0.0608,
+      "Wind": 0.1319
     }
   },
   "UY": {
@@ -13656,15 +13656,15 @@
       "Wind": 0.4065
     },
     "2024": {
-      "Bioenergy": 0.1419,
+      "Bioenergy": 0.1445,
       "Coal": 0,
       "Gas": 0,
-      "Hydro": 0.4734,
+      "Hydro": 0.4659,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0366,
-      "Wind": 0.3481
+      "Solar": 0.0339,
+      "Wind": 0.3557
     }
   },
   "UZ": {
@@ -13725,7 +13725,7 @@
     },
     "2024": {
       "Bioenergy": 0.0004,
-      "Coal": 0.0481,
+      "Coal": 0.048,
       "Gas": 0.8347,
       "Hydro": 0.1013,
       "Nuclear": 0.0011,
@@ -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": {
@@ -14268,15 +14268,15 @@
       "Wind": 0.0741
     },
     "2024": {
-      "Bioenergy": 0.0027,
-      "Coal": 0.8277,
-      "Gas": 0.0238,
-      "Hydro": 0.0458,
-      "Nuclear": 0.019,
-      "Other Fossil": 0.0018,
-      "Other Renewables": 0.0006,
-      "Solar": 0.003,
-      "Wind": 0.0757
+      "Bioenergy": 0.0023,
+      "Coal": 0.8376,
+      "Gas": 0.0205,
+      "Hydro": 0.0441,
+      "Nuclear": 0.0166,
+      "Other Fossil": 0.0016,
+      "Other Renewables": 0.0005,
+      "Solar": 0.0029,
+      "Wind": 0.0738
     }
   },
   "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.84,
+      "Gas": 0.0008,
+      "Hydro": 0.0083,
+      "Nuclear": 0.0368,
+      "Other Fossil": 0.0246,
+      "Other Renewables": 0.0005,
+      "Solar": 0.0431,
+      "Wind": 0.0458
     }
   },
   "ZM": {