@digital4better/data 1.1.56 → 1.1.57

package/data/mix/country-yearly.json

@@ -84,7 +84,7 @@
       "Coal": 0.4859,
       "Gas": 0.0964,
       "Hydro": 0.2562,
-      "Nuclear": 0.0439,
+      "Nuclear": 0.0438,
       "Other Fossil": 0.0242,
       "Other Renewables": 0.004,
       "Solar": 0.0381,
@@ -93,7 +93,7 @@
     "2021": {
       "Bioenergy": 0.0156,
       "Coal": 0.4842,
-      "Gas": 0.091,
+      "Gas": 0.0911,
       "Hydro": 0.2474,
       "Nuclear": 0.0439,
       "Other Fossil": 0.0244,
@@ -103,7 +103,7 @@
     },
     "2022": {
       "Bioenergy": 0.017,
-      "Coal": 0.4752,
+      "Coal": 0.4751,
       "Gas": 0.0863,
       "Hydro": 0.2468,
       "Nuclear": 0.0438,
@@ -124,15 +124,15 @@
       "Wind": 0.0577
     },
     "2024": {
-      "Bioenergy": 0.0164,
-      "Coal": 0.4612,
-      "Gas": 0.0799,
-      "Hydro": 0.2449,
+      "Bioenergy": 0.0165,
+      "Coal": 0.4631,
+      "Gas": 0.0796,
+      "Hydro": 0.244,
       "Nuclear": 0.0425,
       "Other Fossil": 0.0214,
       "Other Renewables": 0.004,
-      "Solar": 0.0689,
-      "Wind": 0.0608
+      "Solar": 0.0722,
+      "Wind": 0.0566
     }
   },
   "AG": {
@@ -260,15 +260,15 @@
       "Wind": 0.0399
     },
     "2024": {
-      "Bioenergy": 0.0088,
-      "Coal": 0.0408,
-      "Gas": 0.0701,
+      "Bioenergy": 0.0089,
+      "Coal": 0.041,
+      "Gas": 0.0697,
       "Hydro": 0.741,
-      "Nuclear": 0.0629,
+      "Nuclear": 0.0631,
       "Other Fossil": 0.0061,
       "Other Renewables": 0.002,
-      "Solar": 0.03,
-      "Wind": 0.0384
+      "Solar": 0.0291,
+      "Wind": 0.039
     }
   },
   "AM": {
@@ -464,15 +464,15 @@
       "Wind": 0.1017
     },
     "2024": {
-      "Bioenergy": 0.0084,
-      "Coal": 0.0052,
-      "Gas": 0.5004,
-      "Hydro": 0.2558,
-      "Nuclear": 0.0883,
-      "Other Fossil": 0.0132,
+      "Bioenergy": 0.0087,
+      "Coal": 0.0067,
+      "Gas": 0.5065,
+      "Hydro": 0.2522,
+      "Nuclear": 0.0821,
+      "Other Fossil": 0.013,
       "Other Renewables": 0.0002,
-      "Solar": 0.0236,
-      "Wind": 0.1049
+      "Solar": 0.0248,
+      "Wind": 0.1057
     }
   },
   "AS": {
@@ -600,15 +600,15 @@
       "Wind": 0.1398
     },
     "2024": {
-      "Bioenergy": 0.0242,
-      "Coal": 0.0038,
-      "Gas": 0.0579,
-      "Hydro": 0.6589,
-      "Nuclear": 0.0061,
-      "Other Fossil": 0.0156,
-      "Other Renewables": 0.0002,
-      "Solar": 0.1076,
-      "Wind": 0.1255
+      "Bioenergy": 0.025,
+      "Coal": 0,
+      "Gas": 0.0537,
+      "Hydro": 0.6739,
+      "Nuclear": 0,
+      "Other Fossil": 0.0153,
+      "Other Renewables": 0,
+      "Solar": 0.0981,
+      "Wind": 0.1338
     }
   },
   "AU": {
@@ -669,14 +669,14 @@
     },
     "2024": {
       "Bioenergy": 0.0017,
-      "Coal": 0.5555,
-      "Gas": 0.0857,
-      "Hydro": 0.0554,
+      "Coal": 0.5512,
+      "Gas": 0.0829,
+      "Hydro": 0.0559,
       "Nuclear": 0,
       "Other Fossil": 0.0002,
       "Other Renewables": 0,
-      "Solar": 0.1697,
-      "Wind": 0.1318
+      "Solar": 0.1744,
+      "Wind": 0.1337
     }
   },
   "AW": {
@@ -873,13 +873,13 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.6046,
+      "Coal": 0.644,
       "Gas": 0,
-      "Hydro": 0.3582,
+      "Hydro": 0.3192,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0244,
+      "Solar": 0.024,
       "Wind": 0.0128
     }
   },
@@ -965,7 +965,7 @@
     },
     "2020": {
       "Bioenergy": 0.0015,
-      "Coal": 0.1165,
+      "Coal": 0.1166,
       "Gas": 0.6592,
       "Hydro": 0.0233,
       "Nuclear": 0.0048,
@@ -989,7 +989,7 @@
       "Bioenergy": 0.0019,
       "Coal": 0.1402,
       "Gas": 0.5193,
-      "Hydro": 0.0208,
+      "Hydro": 0.0209,
       "Nuclear": 0.0049,
       "Other Fossil": 0.2969,
       "Other Renewables": 0.0005,
@@ -999,7 +999,7 @@
     "2023": {
       "Bioenergy": 0.0035,
       "Coal": 0.2701,
-      "Gas": 0.5052,
+      "Gas": 0.5053,
       "Hydro": 0.0269,
       "Nuclear": 0.009,
       "Other Fossil": 0.1551,
@@ -1009,14 +1009,14 @@
     },
     "2024": {
       "Bioenergy": 0.0031,
-      "Coal": 0.3636,
+      "Coal": 0.3639,
       "Gas": 0.445,
-      "Hydro": 0.0281,
+      "Hydro": 0.0279,
       "Nuclear": 0.0081,
       "Other Fossil": 0.1192,
       "Other Renewables": 0.0008,
-      "Solar": 0.0206,
-      "Wind": 0.0116
+      "Solar": 0.0213,
+      "Wind": 0.0107
     }
   },
   "BE": {
@@ -1076,15 +1076,15 @@
       "Wind": 0.1828
     },
     "2024": {
-      "Bioenergy": 0.0102,
-      "Coal": 0.0124,
-      "Gas": 0.142,
-      "Hydro": 0.0191,
-      "Nuclear": 0.4185,
-      "Other Fossil": 0.0862,
-      "Other Renewables": 0.0006,
-      "Solar": 0.1403,
-      "Wind": 0.1707
+      "Bioenergy": 0.011,
+      "Coal": 0.0146,
+      "Gas": 0.1466,
+      "Hydro": 0.0232,
+      "Nuclear": 0.4076,
+      "Other Fossil": 0.0886,
+      "Other Renewables": 0.0007,
+      "Solar": 0.1334,
+      "Wind": 0.1742
     }
   },
   "BF": {
@@ -1213,14 +1213,14 @@
     },
     "2024": {
       "Bioenergy": 0.0041,
-      "Coal": 0.2393,
-      "Gas": 0.0594,
-      "Hydro": 0.0981,
-      "Nuclear": 0.4221,
-      "Other Fossil": 0.0004,
+      "Coal": 0.239,
+      "Gas": 0.0599,
+      "Hydro": 0.0967,
+      "Nuclear": 0.4234,
+      "Other Fossil": 0.0005,
       "Other Renewables": 0.0001,
-      "Solar": 0.1405,
-      "Wind": 0.036
+      "Solar": 0.1386,
+      "Wind": 0.0377
     }
   },
   "BH": {
@@ -1688,15 +1688,15 @@
       "Wind": 0.1416
     },
     "2024": {
-      "Bioenergy": 0.0138,
-      "Coal": 0.0108,
-      "Gas": 0.055,
-      "Hydro": 0.6383,
-      "Nuclear": 0.0248,
-      "Other Fossil": 0.011,
+      "Bioenergy": 0.0139,
+      "Coal": 0.011,
+      "Gas": 0.058,
+      "Hydro": 0.6356,
+      "Nuclear": 0.0247,
+      "Other Fossil": 0.0109,
       "Other Renewables": 0,
-      "Solar": 0.1,
-      "Wind": 0.1464
+      "Solar": 0.1003,
+      "Wind": 0.1455
     }
   },
   "BS": {
@@ -2029,14 +2029,14 @@
     },
     "2024": {
       "Bioenergy": 0.1709,
-      "Coal": 0.0143,
+      "Coal": 0.0148,
       "Gas": 0.1061,
-      "Hydro": 0.515,
-      "Nuclear": 0.01,
+      "Hydro": 0.5134,
+      "Nuclear": 0.0098,
       "Other Fossil": 0.1026,
-      "Other Renewables": 0.0024,
-      "Solar": 0.0397,
-      "Wind": 0.0388
+      "Other Renewables": 0.0025,
+      "Solar": 0.0404,
+      "Wind": 0.0394
     }
   },
   "CA": {
@@ -2096,15 +2096,15 @@
       "Wind": 0.0646
     },
     "2024": {
-      "Bioenergy": 0.0152,
-      "Coal": 0.0445,
-      "Gas": 0.14,
-      "Hydro": 0.5702,
-      "Nuclear": 0.133,
-      "Other Fossil": 0.0099,
+      "Bioenergy": 0.0162,
+      "Coal": 0.0473,
+      "Gas": 0.1488,
+      "Hydro": 0.5649,
+      "Nuclear": 0.1325,
+      "Other Fossil": 0.0106,
       "Other Renewables": 0.0005,
-      "Solar": 0.0105,
-      "Wind": 0.0761
+      "Solar": 0.0106,
+      "Wind": 0.0687
     }
   },
   "CD": {
@@ -2371,12 +2371,12 @@
       "Bioenergy": 0,
       "Coal": 0.0002,
       "Gas": 0.0003,
-      "Hydro": 0.6149,
-      "Nuclear": 0.2728,
-      "Other Fossil": 0.0448,
+      "Hydro": 0.6096,
+      "Nuclear": 0.2793,
+      "Other Fossil": 0.0454,
       "Other Renewables": 0,
-      "Solar": 0.0656,
-      "Wind": 0.0014
+      "Solar": 0.0637,
+      "Wind": 0.0016
     }
   },
   "CI": {
@@ -2572,15 +2572,15 @@
       "Wind": 0.1187
     },
     "2024": {
-      "Bioenergy": 0.0235,
-      "Coal": 0.1612,
-      "Gas": 0.1743,
-      "Hydro": 0.2953,
+      "Bioenergy": 0.0237,
+      "Coal": 0.1621,
+      "Gas": 0.1685,
+      "Hydro": 0.2932,
       "Nuclear": 0,
-      "Other Fossil": 0.0138,
+      "Other Fossil": 0.0139,
       "Other Renewables": 0.004,
-      "Solar": 0.203,
-      "Wind": 0.125
+      "Solar": 0.2071,
+      "Wind": 0.1277
     }
   },
   "CM": {
@@ -2698,7 +2698,7 @@
     },
     "2023": {
       "Bioenergy": 0.0204,
-      "Coal": 0.6192,
+      "Coal": 0.6193,
       "Gas": 0.0299,
       "Hydro": 0.1241,
       "Nuclear": 0.0466,
@@ -2708,15 +2708,15 @@
       "Wind": 0.0952
     },
     "2024": {
-      "Bioenergy": 0.0195,
-      "Coal": 0.591,
-      "Gas": 0.0285,
-      "Hydro": 0.1401,
-      "Nuclear": 0.044,
+      "Bioenergy": 0.0194,
+      "Coal": 0.5892,
+      "Gas": 0.0284,
+      "Hydro": 0.1397,
+      "Nuclear": 0.0439,
       "Other Fossil": 0.0017,
       "Other Renewables": 0,
-      "Solar": 0.081,
-      "Wind": 0.0942
+      "Solar": 0.0863,
+      "Wind": 0.0914
     }
   },
   "CO": {
@@ -2845,13 +2845,13 @@
     },
     "2024": {
       "Bioenergy": 0.0044,
-      "Coal": 0.001,
+      "Coal": 0.0011,
       "Gas": 0.0074,
-      "Hydro": 0.617,
+      "Hydro": 0.6168,
       "Nuclear": 0.0007,
       "Other Fossil": 0.1379,
       "Other Renewables": 0.1218,
-      "Solar": 0.0021,
+      "Solar": 0.0022,
       "Wind": 0.1077
     }
   },
@@ -3116,15 +3116,15 @@
       "Wind": 0.0105
     },
     "2024": {
-      "Bioenergy": 0.0324,
-      "Coal": 0.3257,
-      "Gas": 0.0455,
-      "Hydro": 0.0339,
-      "Nuclear": 0.4287,
-      "Other Fossil": 0.0142,
-      "Other Renewables": 0.0371,
-      "Solar": 0.0732,
-      "Wind": 0.0095
+      "Bioenergy": 0.033,
+      "Coal": 0.3265,
+      "Gas": 0.0446,
+      "Hydro": 0.0371,
+      "Nuclear": 0.4281,
+      "Other Fossil": 0.0141,
+      "Other Renewables": 0.0367,
+      "Solar": 0.0698,
+      "Wind": 0.0102
     }
   },
   "DE": {
@@ -3184,15 +3184,15 @@
       "Wind": 0.2709
     },
     "2024": {
-      "Bioenergy": 0.0879,
-      "Coal": 0.1941,
-      "Gas": 0.1672,
-      "Hydro": 0.0614,
-      "Nuclear": 0.0128,
+      "Bioenergy": 0.0877,
+      "Coal": 0.1948,
+      "Gas": 0.1656,
+      "Hydro": 0.0605,
+      "Nuclear": 0.0122,
       "Other Fossil": 0.0422,
       "Other Renewables": 0.0004,
-      "Solar": 0.1839,
-      "Wind": 0.2502
+      "Solar": 0.1756,
+      "Wind": 0.2609
     }
   },
   "DJ": {
@@ -3320,15 +3320,15 @@
       "Wind": 0.5468
     },
     "2024": {
-      "Bioenergy": 0.0885,
-      "Coal": 0.1024,
-      "Gas": 0.0691,
-      "Hydro": 0.0204,
-      "Nuclear": 0.0214,
-      "Other Fossil": 0.033,
+      "Bioenergy": 0.094,
+      "Coal": 0.0989,
+      "Gas": 0.0688,
+      "Hydro": 0.0207,
+      "Nuclear": 0.0219,
+      "Other Fossil": 0.0335,
       "Other Renewables": 0.0007,
-      "Solar": 0.1333,
-      "Wind": 0.5311
+      "Solar": 0.1294,
+      "Wind": 0.5321
     }
   },
   "DM": {
@@ -3592,15 +3592,15 @@
       "Wind": 0.0088
     },
     "2024": {
-      "Bioenergy": 0.0092,
-      "Coal": 0.0005,
-      "Gas": 0.0295,
-      "Hydro": 0.7432,
+      "Bioenergy": 0.0114,
+      "Coal": 0.0004,
+      "Gas": 0.0288,
+      "Hydro": 0.7235,
       "Nuclear": 0.0003,
-      "Other Fossil": 0.2097,
+      "Other Fossil": 0.2263,
       "Other Renewables": 0.0001,
-      "Solar": 0.0009,
-      "Wind": 0.0066
+      "Solar": 0.0008,
+      "Wind": 0.0085
     }
   },
   "EE": {
@@ -3660,15 +3660,15 @@
       "Wind": 0.1556
     },
     "2024": {
-      "Bioenergy": 0.0647,
-      "Coal": 0.0494,
-      "Gas": 0.085,
-      "Hydro": 0.0698,
-      "Nuclear": 0.0744,
-      "Other Fossil": 0.3104,
-      "Other Renewables": 0.0024,
-      "Solar": 0.1775,
-      "Wind": 0.1664
+      "Bioenergy": 0.0641,
+      "Coal": 0.0481,
+      "Gas": 0.082,
+      "Hydro": 0.0678,
+      "Nuclear": 0.0722,
+      "Other Fossil": 0.3188,
+      "Other Renewables": 0.0023,
+      "Solar": 0.1781,
+      "Wind": 0.1666
     }
   },
   "EG": {
@@ -3865,14 +3865,14 @@
     },
     "2024": {
       "Bioenergy": 0.0141,
-      "Coal": 0.0108,
-      "Gas": 0.1593,
-      "Hydro": 0.133,
-      "Nuclear": 0.2166,
-      "Other Fossil": 0.0101,
-      "Other Renewables": 0.0026,
-      "Solar": 0.2222,
-      "Wind": 0.2311
+      "Coal": 0.0113,
+      "Gas": 0.1567,
+      "Hydro": 0.1342,
+      "Nuclear": 0.2176,
+      "Other Fossil": 0.0099,
+      "Other Renewables": 0.0027,
+      "Solar": 0.2163,
+      "Wind": 0.2373
     }
   },
   "ET": {
@@ -4000,15 +4000,15 @@
       "Wind": 0.1777
     },
     "2024": {
-      "Bioenergy": 0.1118,
+      "Bioenergy": 0.112,
       "Coal": 0.022,
-      "Gas": 0.0246,
-      "Hydro": 0.197,
-      "Nuclear": 0.3814,
-      "Other Fossil": 0.0413,
-      "Other Renewables": 0.0004,
-      "Solar": 0.0218,
-      "Wind": 0.1996
+      "Gas": 0.0238,
+      "Hydro": 0.1913,
+      "Nuclear": 0.3794,
+      "Other Fossil": 0.0425,
+      "Other Renewables": 0.0007,
+      "Solar": 0.0211,
+      "Wind": 0.2071
     }
   },
   "FJ": {
@@ -4273,14 +4273,14 @@
     },
     "2024": {
       "Bioenergy": 0.0061,
-      "Coal": 0.0006,
-      "Gas": 0.031,
-      "Hydro": 0.1274,
-      "Nuclear": 0.6916,
+      "Coal": 0.0008,
+      "Gas": 0.0312,
+      "Hydro": 0.1267,
+      "Nuclear": 0.6897,
       "Other Fossil": 0.006,
       "Other Renewables": 0,
-      "Solar": 0.0534,
-      "Wind": 0.0837
+      "Solar": 0.051,
+      "Wind": 0.0885
     }
   },
   "GA": {
@@ -4408,15 +4408,15 @@
       "Wind": 0.3128
     },
     "2024": {
-      "Bioenergy": 0.0723,
-      "Coal": 0.0246,
-      "Gas": 0.2698,
-      "Hydro": 0.0384,
-      "Nuclear": 0.1772,
+      "Bioenergy": 0.0746,
+      "Coal": 0.0256,
+      "Gas": 0.2829,
+      "Hydro": 0.0396,
+      "Nuclear": 0.1779,
       "Other Fossil": 0.0148,
-      "Other Renewables": 0.0008,
-      "Solar": 0.0745,
-      "Wind": 0.3275
+      "Other Renewables": 0.0009,
+      "Solar": 0.0727,
+      "Wind": 0.3111
     }
   },
   "GD": {
@@ -4512,9 +4512,9 @@
     },
     "2021": {
       "Bioenergy": 0.0028,
-      "Coal": 0.0825,
+      "Coal": 0.0826,
       "Gas": 0.1828,
-      "Hydro": 0.7005,
+      "Hydro": 0.7006,
       "Nuclear": 0.0072,
       "Other Fossil": 0.0013,
       "Other Renewables": 0.0007,
@@ -4523,36 +4523,36 @@
     },
     "2022": {
       "Bioenergy": 0.0023,
-      "Coal": 0.0602,
-      "Gas": 0.2365,
+      "Coal": 0.0601,
+      "Gas": 0.2364,
       "Hydro": 0.6749,
       "Nuclear": 0.0056,
       "Other Fossil": 0.0011,
       "Other Renewables": 0.0005,
       "Solar": 0.0047,
-      "Wind": 0.0142
+      "Wind": 0.0143
     },
     "2023": {
       "Bioenergy": 0.0013,
-      "Coal": 0.0341,
+      "Coal": 0.034,
       "Gas": 0.249,
       "Hydro": 0.6962,
       "Nuclear": 0.0032,
       "Other Fossil": 0.0005,
       "Other Renewables": 0.0003,
-      "Solar": 0.0031,
+      "Solar": 0.0032,
       "Wind": 0.0124
     },
     "2024": {
       "Bioenergy": 0.0009,
       "Coal": 0.0224,
-      "Gas": 0.1189,
-      "Hydro": 0.8425,
+      "Gas": 0.1557,
+      "Hydro": 0.8056,
       "Nuclear": 0.002,
       "Other Fossil": 0.0002,
       "Other Renewables": 0.0002,
-      "Solar": 0.0025,
-      "Wind": 0.0104
+      "Solar": 0.0026,
+      "Wind": 0.0105
     }
   },
   "GF": {
@@ -5156,15 +5156,15 @@
       "Wind": 0.2195
     },
     "2024": {
-      "Bioenergy": 0.0008,
-      "Coal": 0.0675,
-      "Gas": 0.4129,
-      "Hydro": 0.0677,
-      "Nuclear": 0.0058,
-      "Other Fossil": 0.0006,
+      "Bioenergy": 0.001,
+      "Coal": 0.0665,
+      "Gas": 0.4124,
+      "Hydro": 0.0663,
+      "Nuclear": 0.0069,
+      "Other Fossil": 0.0007,
       "Other Renewables": 0.0002,
-      "Solar": 0.2367,
-      "Wind": 0.2079
+      "Solar": 0.2373,
+      "Wind": 0.2088
     }
   },
   "GT": {
@@ -5497,14 +5497,14 @@
     },
     "2024": {
       "Bioenergy": 0.0079,
-      "Coal": 0.5639,
-      "Gas": 0.3395,
-      "Hydro": 0.0319,
+      "Coal": 0.5645,
+      "Gas": 0.3394,
+      "Hydro": 0.0317,
       "Nuclear": 0.013,
       "Other Fossil": 0.0051,
       "Other Renewables": 0.0012,
-      "Solar": 0.0189,
-      "Wind": 0.0186
+      "Solar": 0.0199,
+      "Wind": 0.0173
     }
   },
   "HN": {
@@ -5565,7 +5565,7 @@
     },
     "2024": {
       "Bioenergy": 0.1288,
-      "Coal": 0.0007,
+      "Coal": 0.0008,
       "Gas": 0.0055,
       "Hydro": 0.2241,
       "Nuclear": 0.0005,
@@ -5632,15 +5632,15 @@
       "Wind": 0.1603
     },
     "2024": {
-      "Bioenergy": 0.0459,
-      "Coal": 0.0493,
-      "Gas": 0.2339,
-      "Hydro": 0.4087,
-      "Nuclear": 0.0272,
-      "Other Fossil": 0.0081,
-      "Other Renewables": 0.0173,
-      "Solar": 0.0278,
-      "Wind": 0.1818
+      "Bioenergy": 0.0419,
+      "Coal": 0.0619,
+      "Gas": 0.2279,
+      "Hydro": 0.3655,
+      "Nuclear": 0.0611,
+      "Other Fossil": 0.0104,
+      "Other Renewables": 0.0153,
+      "Solar": 0.044,
+      "Wind": 0.172
     }
   },
   "HT": {
@@ -5768,15 +5768,15 @@
       "Wind": 0.0474
     },
     "2024": {
-      "Bioenergy": 0.0225,
-      "Coal": 0.086,
-      "Gas": 0.1719,
-      "Hydro": 0.0436,
-      "Nuclear": 0.3719,
-      "Other Fossil": 0.0171,
-      "Other Renewables": 0.0037,
-      "Solar": 0.2419,
-      "Wind": 0.0413
+      "Bioenergy": 0.0238,
+      "Coal": 0.0869,
+      "Gas": 0.1725,
+      "Hydro": 0.0464,
+      "Nuclear": 0.365,
+      "Other Fossil": 0.0174,
+      "Other Renewables": 0.0038,
+      "Solar": 0.2406,
+      "Wind": 0.0435
     }
   },
   "ID": {
@@ -5837,7 +5837,7 @@
     },
     "2024": {
       "Bioenergy": 0.0411,
-      "Coal": 0.5903,
+      "Coal": 0.5904,
       "Gas": 0.2103,
       "Hydro": 0.0719,
       "Nuclear": 0.0003,
@@ -5905,14 +5905,14 @@
     },
     "2024": {
       "Bioenergy": 0.0083,
-      "Coal": 0.0551,
-      "Gas": 0.4453,
-      "Hydro": 0.0531,
-      "Nuclear": 0.034,
-      "Other Fossil": 0.0409,
+      "Coal": 0.0502,
+      "Gas": 0.427,
+      "Hydro": 0.0543,
+      "Nuclear": 0.0337,
+      "Other Fossil": 0.0376,
       "Other Renewables": 0.0011,
-      "Solar": 0.0425,
-      "Wind": 0.3198
+      "Solar": 0.0401,
+      "Wind": 0.3477
     }
   },
   "IL": {
@@ -6040,15 +6040,15 @@
       "Wind": 0.0482
     },
     "2024": {
-      "Bioenergy": 0.0067,
-      "Coal": 0.7338,
+      "Bioenergy": 0.0068,
+      "Coal": 0.7297,
       "Gas": 0.0207,
-      "Hydro": 0.0822,
-      "Nuclear": 0.0281,
+      "Hydro": 0.0891,
+      "Nuclear": 0.0294,
       "Other Fossil": 0.0002,
       "Other Renewables": 0.0016,
-      "Solar": 0.0709,
-      "Wind": 0.0557
+      "Solar": 0.0712,
+      "Wind": 0.0513
     }
   },
   "IQ": {
@@ -6312,15 +6312,15 @@
       "Wind": 0.1016
     },
     "2024": {
-      "Bioenergy": 0.0556,
-      "Coal": 0.0338,
-      "Gas": 0.3903,
-      "Hydro": 0.1945,
-      "Nuclear": 0.0338,
-      "Other Fossil": 0.0335,
-      "Other Renewables": 0.0185,
-      "Solar": 0.1497,
-      "Wind": 0.0903
+      "Bioenergy": 0.056,
+      "Coal": 0.0343,
+      "Gas": 0.3886,
+      "Hydro": 0.1946,
+      "Nuclear": 0.0343,
+      "Other Fossil": 0.033,
+      "Other Renewables": 0.0187,
+      "Solar": 0.1458,
+      "Wind": 0.0946
     }
   },
   "JM": {
@@ -6516,15 +6516,15 @@
       "Wind": 0.0183
     },
     "2024": {
-      "Bioenergy": 0.0571,
-      "Coal": 0.2575,
-      "Gas": 0.3034,
-      "Hydro": 0.0898,
-      "Nuclear": 0.0959,
-      "Other Fossil": 0.0316,
-      "Other Renewables": 0.0114,
-      "Solar": 0.1347,
-      "Wind": 0.0186
+      "Bioenergy": 0.0577,
+      "Coal": 0.2543,
+      "Gas": 0.3039,
+      "Hydro": 0.0905,
+      "Nuclear": 0.0961,
+      "Other Fossil": 0.0326,
+      "Other Renewables": 0.0113,
+      "Solar": 0.1339,
+      "Wind": 0.0198
     }
   },
   "KE": {
@@ -6584,15 +6584,15 @@
       "Wind": 0.1517
     },
     "2024": {
-      "Bioenergy": 0.0092,
-      "Coal": 0.0321,
-      "Gas": 0.0436,
-      "Hydro": 0.2897,
-      "Nuclear": 0.0016,
-      "Other Fossil": 0.0701,
-      "Other Renewables": 0.3858,
-      "Solar": 0.0366,
-      "Wind": 0.1314
+      "Bioenergy": 0.0119,
+      "Coal": 0.0305,
+      "Gas": 0.0415,
+      "Hydro": 0.295,
+      "Nuclear": 0.0015,
+      "Other Fossil": 0.0742,
+      "Other Renewables": 0.3924,
+      "Solar": 0.0329,
+      "Wind": 0.1201
     }
   },
   "KG": {
@@ -6669,7 +6669,7 @@
       "Coal": 0.4811,
       "Gas": 0.0311,
       "Hydro": 0.3745,
-      "Nuclear": 0.0138,
+      "Nuclear": 0.0137,
       "Other Fossil": 0.0573,
       "Other Renewables": 0.0014,
       "Solar": 0.018,
@@ -6716,19 +6716,19 @@
       "Nuclear": 0.0138,
       "Other Fossil": 0.0565,
       "Other Renewables": 0.0013,
-      "Solar": 0.0258,
+      "Solar": 0.0259,
       "Wind": 0.0181
     },
     "2024": {
-      "Bioenergy": 0.0135,
-      "Coal": 0.4709,
+      "Bioenergy": 0.0136,
+      "Coal": 0.4715,
       "Gas": 0.025,
-      "Hydro": 0.3717,
+      "Hydro": 0.3714,
       "Nuclear": 0.0133,
       "Other Fossil": 0.0561,
       "Other Renewables": 0.0013,
-      "Solar": 0.0291,
-      "Wind": 0.0191
+      "Solar": 0.0301,
+      "Wind": 0.0177
     }
   },
   "KI": {
@@ -7740,15 +7740,15 @@
       "Wind": 0.2718
     },
     "2024": {
-      "Bioenergy": 0.0318,
-      "Coal": 0.0596,
-      "Gas": 0.162,
-      "Hydro": 0.1187,
-      "Nuclear": 0.0908,
-      "Other Fossil": 0.0756,
+      "Bioenergy": 0.0319,
+      "Coal": 0.0599,
+      "Gas": 0.159,
+      "Hydro": 0.1189,
+      "Nuclear": 0.091,
+      "Other Fossil": 0.0765,
       "Other Renewables": 0.0029,
-      "Solar": 0.1759,
-      "Wind": 0.2828
+      "Solar": 0.1704,
+      "Wind": 0.2895
     }
   },
   "LU": {
@@ -7808,15 +7808,15 @@
       "Wind": 0.2007
     },
     "2024": {
-      "Bioenergy": 0.0674,
-      "Coal": 0.0934,
-      "Gas": 0.1717,
+      "Bioenergy": 0.0675,
+      "Coal": 0.094,
+      "Gas": 0.171,
       "Hydro": 0.1623,
-      "Nuclear": 0.1433,
-      "Other Fossil": 0.0388,
+      "Nuclear": 0.1439,
+      "Other Fossil": 0.0389,
       "Other Renewables": 0.0046,
-      "Solar": 0.1439,
-      "Wind": 0.1747
+      "Solar": 0.1364,
+      "Wind": 0.1814
     }
   },
   "LV": {
@@ -7876,15 +7876,15 @@
       "Wind": 0.065
     },
     "2024": {
-      "Bioenergy": 0.0395,
-      "Coal": 0.028,
-      "Gas": 0.2594,
-      "Hydro": 0.5141,
-      "Nuclear": 0.0448,
-      "Other Fossil": 0.0191,
+      "Bioenergy": 0.0461,
+      "Coal": 0.0271,
+      "Gas": 0.256,
+      "Hydro": 0.4902,
+      "Nuclear": 0.0432,
+      "Other Fossil": 0.0122,
       "Other Renewables": 0.0014,
-      "Solar": 0.0448,
-      "Wind": 0.0489
+      "Solar": 0.0763,
+      "Wind": 0.0476
     }
   },
   "LY": {
@@ -8081,13 +8081,13 @@
     },
     "2024": {
       "Bioenergy": 0.001,
-      "Coal": 0.0051,
-      "Gas": 0.9109,
-      "Hydro": 0.0487,
-      "Nuclear": 0.0074,
+      "Coal": 0.0049,
+      "Gas": 0.9117,
+      "Hydro": 0.0488,
+      "Nuclear": 0.007,
       "Other Fossil": 0.0007,
       "Other Renewables": 0.0002,
-      "Solar": 0.0093,
+      "Solar": 0.0092,
       "Wind": 0.0166
     }
   },
@@ -8148,15 +8148,15 @@
       "Wind": 0.0889
     },
     "2024": {
-      "Bioenergy": 0.0053,
-      "Coal": 0.3721,
-      "Gas": 0.0433,
-      "Hydro": 0.4093,
-      "Nuclear": 0.0403,
-      "Other Fossil": 0.0039,
-      "Other Renewables": 0.0013,
-      "Solar": 0.0272,
-      "Wind": 0.0973
+      "Bioenergy": 0.0048,
+      "Coal": 0.3787,
+      "Gas": 0.0375,
+      "Hydro": 0.4116,
+      "Nuclear": 0.0357,
+      "Other Fossil": 0.0035,
+      "Other Renewables": 0.0011,
+      "Solar": 0.0288,
+      "Wind": 0.0983
     }
   },
   "MG": {
@@ -8284,15 +8284,15 @@
       "Wind": 0.0285
     },
     "2024": {
-      "Bioenergy": 0.0099,
-      "Coal": 0.4375,
-      "Gas": 0.1881,
-      "Hydro": 0.2646,
-      "Nuclear": 0.0105,
-      "Other Fossil": 0.001,
+      "Bioenergy": 0.0174,
+      "Coal": 0.3829,
+      "Gas": 0.2235,
+      "Hydro": 0.281,
+      "Nuclear": 0.009,
+      "Other Fossil": 0.0009,
       "Other Renewables": 0.0003,
       "Solar": 0.0501,
-      "Wind": 0.038
+      "Wind": 0.0349
     }
   },
   "ML": {
@@ -8489,14 +8489,14 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.9067,
+      "Coal": 0.907,
       "Gas": 0,
       "Hydro": 0,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
       "Solar": 0,
-      "Wind": 0.0933
+      "Wind": 0.093
     }
   },
   "MO": {
@@ -8534,11 +8534,11 @@
       "Wind": 0.0489
     },
     "2022": {
-      "Bioenergy": 0.0555,
-      "Coal": 0.4813,
+      "Bioenergy": 0.0556,
+      "Coal": 0.4812,
       "Gas": 0.1672,
-      "Hydro": 0.1108,
-      "Nuclear": 0.0457,
+      "Hydro": 0.1109,
+      "Nuclear": 0.0456,
       "Other Fossil": 0.0375,
       "Other Renewables": 0.0042,
       "Solar": 0.0435,
@@ -8556,15 +8556,15 @@
       "Wind": 0.0601
     },
     "2024": {
-      "Bioenergy": 0.0549,
-      "Coal": 0.4667,
-      "Gas": 0.1605,
-      "Hydro": 0.1088,
+      "Bioenergy": 0.055,
+      "Coal": 0.4687,
+      "Gas": 0.1603,
+      "Hydro": 0.1079,
       "Nuclear": 0.0443,
       "Other Fossil": 0.0341,
       "Other Renewables": 0.0042,
-      "Solar": 0.0631,
-      "Wind": 0.0634
+      "Solar": 0.0665,
+      "Wind": 0.0589
     }
   },
   "MQ": {
@@ -8828,15 +8828,15 @@
       "Wind": 0.0282
     },
     "2024": {
-      "Bioenergy": 0.0085,
-      "Coal": 0.04,
-      "Gas": 0.6374,
+      "Bioenergy": 0.0087,
+      "Coal": 0.0403,
+      "Gas": 0.6368,
       "Hydro": 0.0584,
-      "Nuclear": 0.0622,
-      "Other Fossil": 0.006,
+      "Nuclear": 0.0625,
+      "Other Fossil": 0.0061,
       "Other Renewables": 0.002,
-      "Solar": 0.1495,
-      "Wind": 0.036
+      "Solar": 0.1483,
+      "Wind": 0.037
     }
   },
   "MU": {
@@ -9577,14 +9577,14 @@
     },
     "2024": {
       "Bioenergy": 0.1685,
-      "Coal": 0.0029,
+      "Coal": 0.003,
       "Gas": 0.0216,
-      "Hydro": 0.0851,
+      "Hydro": 0.0848,
       "Nuclear": 0.002,
       "Other Fossil": 0.3982,
       "Other Renewables": 0.1562,
-      "Solar": 0.0119,
-      "Wind": 0.1536
+      "Solar": 0.012,
+      "Wind": 0.1537
     }
   },
   "NL": {
@@ -9644,15 +9644,15 @@
       "Wind": 0.2525
     },
     "2024": {
-      "Bioenergy": 0.0401,
-      "Coal": 0.0615,
-      "Gas": 0.3502,
-      "Hydro": 0.0033,
-      "Nuclear": 0.028,
-      "Other Fossil": 0.0089,
-      "Other Renewables": 0.0051,
-      "Solar": 0.2495,
-      "Wind": 0.2534
+      "Bioenergy": 0.0442,
+      "Coal": 0.0646,
+      "Gas": 0.3446,
+      "Hydro": 0.002,
+      "Nuclear": 0.0271,
+      "Other Fossil": 0.0111,
+      "Other Renewables": 0.0049,
+      "Solar": 0.2378,
+      "Wind": 0.2639
     }
   },
   "NO": {
@@ -9715,12 +9715,12 @@
       "Bioenergy": 0,
       "Coal": 0,
       "Gas": 0.0111,
-      "Hydro": 0.8907,
+      "Hydro": 0.8927,
       "Nuclear": 0,
       "Other Fossil": 0.0019,
-      "Other Renewables": 0.0026,
+      "Other Renewables": 0.0027,
       "Solar": 0,
-      "Wind": 0.0937
+      "Wind": 0.0917
     }
   },
   "NP": {
@@ -9737,7 +9737,7 @@
     },
     "2020": {
       "Bioenergy": 0.0035,
-      "Coal": 0.1202,
+      "Coal": 0.1201,
       "Gas": 0.0245,
       "Hydro": 0.8104,
       "Nuclear": 0.0111,
@@ -9750,7 +9750,7 @@
       "Bioenergy": 0.004,
       "Coal": 0.1197,
       "Gas": 0.0232,
-      "Hydro": 0.8081,
+      "Hydro": 0.8082,
       "Nuclear": 0.0112,
       "Other Fossil": 0.002,
       "Other Renewables": 0.001,
@@ -9781,14 +9781,14 @@
     },
     "2024": {
       "Bioenergy": 0.0042,
-      "Coal": 0.1139,
-      "Gas": 0.0203,
-      "Hydro": 0.8075,
+      "Coal": 0.1144,
+      "Gas": 0.0202,
+      "Hydro": 0.8073,
       "Nuclear": 0.0108,
       "Other Fossil": 0.0012,
       "Other Renewables": 0.001,
-      "Solar": 0.0244,
-      "Wind": 0.0167
+      "Solar": 0.0253,
+      "Wind": 0.0156
     }
   },
   "NR": {
@@ -10460,14 +10460,14 @@
       "Wind": 0.0338
     },
     "2024": {
-      "Bioenergy": 0.0061,
-      "Coal": 0.1624,
-      "Gas": 0.2955,
-      "Hydro": 0.3088,
-      "Nuclear": 0.174,
-      "Other Fossil": 0.0143,
+      "Bioenergy": 0.0063,
+      "Coal": 0.1548,
+      "Gas": 0.2835,
+      "Hydro": 0.3196,
+      "Nuclear": 0.1839,
+      "Other Fossil": 0.013,
       "Other Renewables": 0,
-      "Solar": 0.0091,
+      "Solar": 0.0092,
       "Wind": 0.0297
     }
   },
@@ -10528,15 +10528,15 @@
       "Wind": 0.1447
     },
     "2024": {
-      "Bioenergy": 0.0137,
-      "Coal": 0.5549,
-      "Gas": 0.098,
-      "Hydro": 0.0178,
-      "Nuclear": 0.0045,
-      "Other Fossil": 0.0366,
+      "Bioenergy": 0.0136,
+      "Coal": 0.5523,
+      "Gas": 0.0983,
+      "Hydro": 0.0175,
+      "Nuclear": 0.0043,
+      "Other Fossil": 0.0363,
       "Other Renewables": 0.0008,
-      "Solar": 0.1373,
-      "Wind": 0.1366
+      "Solar": 0.1323,
+      "Wind": 0.1447
     }
   },
   "PM": {
@@ -10665,14 +10665,14 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.1515,
-      "Gas": 0.4108,
+      "Coal": 0.1811,
+      "Gas": 0.3937,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.4133,
+      "Other Fossil": 0.4012,
       "Other Renewables": 0,
-      "Solar": 0.0135,
-      "Wind": 0.0109
+      "Solar": 0.0132,
+      "Wind": 0.0107
     }
   },
   "PS": {
@@ -10800,15 +10800,15 @@
       "Wind": 0.2837
     },
     "2024": {
-      "Bioenergy": 0.0701,
-      "Coal": 0.0265,
-      "Gas": 0.1306,
-      "Hydro": 0.3024,
-      "Nuclear": 0.0423,
+      "Bioenergy": 0.0697,
+      "Coal": 0.0264,
+      "Gas": 0.1302,
+      "Hydro": 0.3023,
+      "Nuclear": 0.042,
       "Other Fossil": 0.009,
       "Other Renewables": 0.0013,
-      "Solar": 0.1348,
-      "Wind": 0.283
+      "Solar": 0.1296,
+      "Wind": 0.2895
     }
   },
   "PY": {
@@ -11072,15 +11072,15 @@
       "Wind": 0.1314
     },
     "2024": {
-      "Bioenergy": 0.0103,
-      "Coal": 0.1359,
-      "Gas": 0.1922,
-      "Hydro": 0.2886,
-      "Nuclear": 0.2055,
-      "Other Fossil": 0.0013,
+      "Bioenergy": 0.0099,
+      "Coal": 0.1349,
+      "Gas": 0.1891,
+      "Hydro": 0.2901,
+      "Nuclear": 0.2061,
+      "Other Fossil": 0.0011,
       "Other Renewables": 0.0004,
-      "Solar": 0.0524,
-      "Wind": 0.1134
+      "Solar": 0.0501,
+      "Wind": 0.1182
     }
   },
   "RS": {
@@ -11140,15 +11140,15 @@
       "Wind": 0.0268
     },
     "2024": {
-      "Bioenergy": 0.0093,
-      "Coal": 0.5826,
-      "Gas": 0.0318,
-      "Hydro": 0.3095,
-      "Nuclear": 0.0143,
-      "Other Fossil": 0.0084,
+      "Bioenergy": 0.0092,
+      "Coal": 0.5835,
+      "Gas": 0.0276,
+      "Hydro": 0.3133,
+      "Nuclear": 0.0128,
+      "Other Fossil": 0.0083,
       "Other Renewables": 0.0004,
-      "Solar": 0.0081,
-      "Wind": 0.0356
+      "Solar": 0.007,
+      "Wind": 0.0379
     }
   },
   "RU": {
@@ -11209,14 +11209,14 @@
     },
     "2024": {
       "Bioenergy": 0.0007,
-      "Coal": 0.1713,
-      "Gas": 0.443,
-      "Hydro": 0.1871,
-      "Nuclear": 0.1808,
+      "Coal": 0.1711,
+      "Gas": 0.4423,
+      "Hydro": 0.1865,
+      "Nuclear": 0.1823,
       "Other Fossil": 0.0104,
       "Other Renewables": 0,
       "Solar": 0.0023,
-      "Wind": 0.0043
+      "Wind": 0.0044
     }
   },
   "RW": {
@@ -11616,15 +11616,15 @@
       "Wind": 0.2198
     },
     "2024": {
-      "Bioenergy": 0.0403,
+      "Bioenergy": 0.0399,
       "Coal": 0,
       "Gas": 0,
-      "Hydro": 0.4044,
-      "Nuclear": 0.3137,
+      "Hydro": 0.4126,
+      "Nuclear": 0.3075,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0147,
-      "Wind": 0.2268
+      "Solar": 0.0142,
+      "Wind": 0.2258
     }
   },
   "SG": {
@@ -11820,15 +11820,15 @@
       "Wind": 0.0058
     },
     "2024": {
-      "Bioenergy": 0.0089,
-      "Coal": 0.1448,
-      "Gas": 0.0328,
-      "Hydro": 0.4168,
-      "Nuclear": 0.3499,
-      "Other Fossil": 0.0024,
+      "Bioenergy": 0.0087,
+      "Coal": 0.1974,
+      "Gas": 0.0315,
+      "Hydro": 0.359,
+      "Nuclear": 0.355,
+      "Other Fossil": 0.0031,
       "Other Renewables": 0.0001,
-      "Solar": 0.0413,
-      "Wind": 0.0032
+      "Solar": 0.042,
+      "Wind": 0.0031
     }
   },
   "SK": {
@@ -11888,15 +11888,15 @@
       "Wind": 0
     },
     "2024": {
-      "Bioenergy": 0.0333,
+      "Bioenergy": 0.0323,
       "Coal": 0.0098,
-      "Gas": 0.0745,
-      "Hydro": 0.1779,
-      "Nuclear": 0.618,
-      "Other Fossil": 0.0455,
-      "Other Renewables": 0.0166,
-      "Solar": 0.0244,
-      "Wind": 0
+      "Gas": 0.075,
+      "Hydro": 0.1829,
+      "Nuclear": 0.6151,
+      "Other Fossil": 0.0447,
+      "Other Renewables": 0.0165,
+      "Solar": 0.0234,
+      "Wind": 0.0001
     }
   },
   "SL": {
@@ -12364,15 +12364,15 @@
       "Wind": 0.0216
     },
     "2024": {
-      "Bioenergy": 0.1616,
-      "Coal": 0.0011,
-      "Gas": 0.2662,
-      "Hydro": 0.1761,
-      "Nuclear": 0.0008,
-      "Other Fossil": 0.0019,
-      "Other Renewables": 0.1776,
-      "Solar": 0.1635,
-      "Wind": 0.0514
+      "Bioenergy": 0.0552,
+      "Coal": 0,
+      "Gas": 0.316,
+      "Hydro": 0.2244,
+      "Nuclear": 0,
+      "Other Fossil": 0.0715,
+      "Other Renewables": 0.1951,
+      "Solar": 0.1278,
+      "Wind": 0.01
     }
   },
   "SY": {
@@ -12724,7 +12724,7 @@
       "Nuclear": 0.0058,
       "Other Fossil": 0.0064,
       "Other Renewables": 0.0006,
-      "Solar": 0.0282,
+      "Solar": 0.0283,
       "Wind": 0.0218
     },
     "2020": {
@@ -12754,10 +12754,10 @@
       "Coal": 0.2533,
       "Gas": 0.5525,
       "Hydro": 0.0521,
-      "Nuclear": 0.0082,
+      "Nuclear": 0.0083,
       "Other Fossil": 0.0096,
       "Other Renewables": 0.0008,
-      "Solar": 0.0317,
+      "Solar": 0.0316,
       "Wind": 0.0238
     },
     "2023": {
@@ -12772,15 +12772,15 @@
       "Wind": 0.0263
     },
     "2024": {
-      "Bioenergy": 0.0588,
-      "Coal": 0.2045,
-      "Gas": 0.6224,
-      "Hydro": 0.0455,
-      "Nuclear": 0.0066,
-      "Other Fossil": 0.0009,
+      "Bioenergy": 0.0614,
+      "Coal": 0.2099,
+      "Gas": 0.6134,
+      "Hydro": 0.0449,
+      "Nuclear": 0.0067,
+      "Other Fossil": 0.0014,
       "Other Renewables": 0.0006,
-      "Solar": 0.0365,
-      "Wind": 0.0241
+      "Solar": 0.0371,
+      "Wind": 0.0246
     }
   },
   "TJ": {
@@ -13046,13 +13046,13 @@
     "2024": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.9781,
+      "Gas": 0.9808,
       "Hydro": 0,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
       "Solar": 0,
-      "Wind": 0.0219
+      "Wind": 0.0192
     }
   },
   "TO": {
@@ -13180,15 +13180,15 @@
       "Wind": 0.1063
     },
     "2024": {
-      "Bioenergy": 0.0251,
-      "Coal": 0.3389,
-      "Gas": 0.1766,
-      "Hydro": 0.2385,
+      "Bioenergy": 0.0253,
+      "Coal": 0.3433,
+      "Gas": 0.1705,
+      "Hydro": 0.2409,
       "Nuclear": 0.0004,
       "Other Fossil": 0.003,
-      "Other Renewables": 0.028,
-      "Solar": 0.0814,
-      "Wind": 0.108
+      "Other Renewables": 0.0288,
+      "Solar": 0.0819,
+      "Wind": 0.1057
     }
   },
   "TT": {
@@ -13588,15 +13588,15 @@
       "Wind": 0.1001
     },
     "2024": {
-      "Bioenergy": 0.0103,
-      "Coal": 0.1505,
-      "Gas": 0.4306,
-      "Hydro": 0.0537,
-      "Nuclear": 0.175,
-      "Other Fossil": 0.0077,
-      "Other Renewables": 0.0038,
-      "Solar": 0.0712,
-      "Wind": 0.0973
+      "Bioenergy": 0.0104,
+      "Coal": 0.1484,
+      "Gas": 0.4322,
+      "Hydro": 0.0528,
+      "Nuclear": 0.1762,
+      "Other Fossil": 0.0061,
+      "Other Renewables": 0.0039,
+      "Solar": 0.0709,
+      "Wind": 0.0991
     }
   },
   "UY": {
@@ -13731,8 +13731,8 @@
       "Nuclear": 0.001,
       "Other Fossil": 0.0111,
       "Other Renewables": 0.0001,
-      "Solar": 0.0017,
-      "Wind": 0.0015
+      "Solar": 0.0018,
+      "Wind": 0.0014
     }
   },
   "VC": {
@@ -14268,15 +14268,15 @@
       "Wind": 0.074
     },
     "2024": {
-      "Bioenergy": 0.0014,
-      "Coal": 0.8704,
-      "Gas": 0.0128,
-      "Hydro": 0.0466,
-      "Nuclear": 0.0101,
-      "Other Fossil": 0.001,
-      "Other Renewables": 0.0003,
-      "Solar": 0.0014,
-      "Wind": 0.056
+      "Bioenergy": 0.002,
+      "Coal": 0.8552,
+      "Gas": 0.0175,
+      "Hydro": 0.0459,
+      "Nuclear": 0.0145,
+      "Other Fossil": 0.0014,
+      "Other Renewables": 0.0004,
+      "Solar": 0.0038,
+      "Wind": 0.0591
     }
   },
   "YE": {