@digital4better/data 1.1.71 → 1.1.72

package/data/mix/country-yearly.json

@@ -124,15 +124,15 @@
       "Wind": 0.0577
     },
     "2024": {
-      "Bioenergy": 0.0164,
-      "Coal": 0.4589,
-      "Gas": 0.0801,
-      "Hydro": 0.2433,
-      "Nuclear": 0.0429,
-      "Other Fossil": 0.0216,
+      "Bioenergy": 0.0166,
+      "Coal": 0.4633,
+      "Gas": 0.0798,
+      "Hydro": 0.2394,
+      "Nuclear": 0.0431,
+      "Other Fossil": 0.0215,
       "Other Renewables": 0.004,
-      "Solar": 0.0732,
-      "Wind": 0.0597
+      "Solar": 0.0723,
+      "Wind": 0.0599
     }
   },
   "AG": {
@@ -212,7 +212,7 @@
       "Nuclear": 0.072,
       "Other Fossil": 0.0067,
       "Other Renewables": 0.002,
-      "Solar": 0.0124,
+      "Solar": 0.0125,
       "Wind": 0.0292
     },
     "2020": {
@@ -223,52 +223,52 @@
       "Nuclear": 0.0684,
       "Other Fossil": 0.0065,
       "Other Renewables": 0.0021,
-      "Solar": 0.0147,
+      "Solar": 0.0148,
       "Wind": 0.0336
     },
     "2021": {
       "Bioenergy": 0.0095,
       "Coal": 0.0493,
-      "Gas": 0.0812,
+      "Gas": 0.0811,
       "Hydro": 0.7349,
       "Nuclear": 0.0695,
       "Other Fossil": 0.0066,
       "Other Renewables": 0.002,
-      "Solar": 0.0154,
-      "Wind": 0.0317
+      "Solar": 0.0155,
+      "Wind": 0.0316
     },
     "2022": {
       "Bioenergy": 0.0096,
-      "Coal": 0.0531,
+      "Coal": 0.053,
       "Gas": 0.0816,
-      "Hydro": 0.7301,
-      "Nuclear": 0.0622,
+      "Hydro": 0.73,
+      "Nuclear": 0.0621,
       "Other Fossil": 0.0066,
       "Other Renewables": 0.0021,
-      "Solar": 0.0187,
-      "Wind": 0.0361
+      "Solar": 0.0189,
+      "Wind": 0.036
     },
     "2023": {
       "Bioenergy": 0.0088,
       "Coal": 0.0464,
-      "Gas": 0.0761,
+      "Gas": 0.076,
       "Hydro": 0.7353,
       "Nuclear": 0.0628,
       "Other Fossil": 0.0063,
       "Other Renewables": 0.0021,
-      "Solar": 0.0224,
+      "Solar": 0.0226,
       "Wind": 0.0398
     },
     "2024": {
       "Bioenergy": 0.0089,
-      "Coal": 0.0424,
-      "Gas": 0.0723,
-      "Hydro": 0.7388,
+      "Coal": 0.0422,
+      "Gas": 0.0719,
+      "Hydro": 0.7385,
       "Nuclear": 0.0632,
       "Other Fossil": 0.0062,
       "Other Renewables": 0.002,
       "Solar": 0.0266,
-      "Wind": 0.0396
+      "Wind": 0.0404
     }
   },
   "AM": {
@@ -464,15 +464,15 @@
       "Wind": 0.1017
     },
     "2024": {
-      "Bioenergy": 0.0092,
-      "Coal": 0.0062,
-      "Gas": 0.5114,
-      "Hydro": 0.248,
-      "Nuclear": 0.0706,
-      "Other Fossil": 0.0123,
+      "Bioenergy": 0.0088,
+      "Coal": 0.0058,
+      "Gas": 0.5112,
+      "Hydro": 0.2479,
+      "Nuclear": 0.0703,
+      "Other Fossil": 0.0122,
       "Other Renewables": 0.0002,
-      "Solar": 0.0282,
-      "Wind": 0.1138
+      "Solar": 0.0289,
+      "Wind": 0.1148
     }
   },
   "AS": {
@@ -545,70 +545,70 @@
   },
   "AT": {
     "2019": {
-      "Bioenergy": 0.0335,
-      "Coal": 0.0315,
-      "Gas": 0.1682,
-      "Hydro": 0.5977,
-      "Nuclear": 0.0178,
-      "Other Fossil": 0.017,
+      "Bioenergy": 0.0331,
+      "Coal": 0.0312,
+      "Gas": 0.1661,
+      "Hydro": 0.5903,
+      "Nuclear": 0.0176,
+      "Other Fossil": 0.0168,
       "Other Renewables": 0.0005,
-      "Solar": 0.0113,
-      "Wind": 0.1224
+      "Solar": 0.0237,
+      "Wind": 0.1209
     },
     "2020": {
-      "Bioenergy": 0.028,
-      "Coal": 0.0155,
-      "Gas": 0.1557,
-      "Hydro": 0.637,
-      "Nuclear": 0.0146,
-      "Other Fossil": 0.0176,
+      "Bioenergy": 0.0276,
+      "Coal": 0.0153,
+      "Gas": 0.1532,
+      "Hydro": 0.6271,
+      "Nuclear": 0.0143,
+      "Other Fossil": 0.0173,
       "Other Renewables": 0.0004,
-      "Solar": 0.0135,
-      "Wind": 0.1177
+      "Solar": 0.0289,
+      "Wind": 0.1159
     },
     "2021": {
-      "Bioenergy": 0.0256,
-      "Coal": 0.0227,
-      "Gas": 0.1766,
-      "Hydro": 0.592,
-      "Nuclear": 0.0306,
-      "Other Fossil": 0.0186,
+      "Bioenergy": 0.025,
+      "Coal": 0.0222,
+      "Gas": 0.1725,
+      "Hydro": 0.5787,
+      "Nuclear": 0.0299,
+      "Other Fossil": 0.0181,
       "Other Renewables": 0.0009,
-      "Solar": 0.0159,
-      "Wind": 0.1171
+      "Solar": 0.0383,
+      "Wind": 0.1145
     },
     "2022": {
-      "Bioenergy": 0.0415,
-      "Coal": 0.0247,
-      "Gas": 0.1874,
-      "Hydro": 0.5518,
-      "Nuclear": 0.028,
-      "Other Fossil": 0.0188,
+      "Bioenergy": 0.0398,
+      "Coal": 0.0236,
+      "Gas": 0.1796,
+      "Hydro": 0.5287,
+      "Nuclear": 0.0268,
+      "Other Fossil": 0.018,
       "Other Renewables": 0.0009,
-      "Solar": 0.0241,
-      "Wind": 0.1227
+      "Solar": 0.065,
+      "Wind": 0.1176
     },
     "2023": {
-      "Bioenergy": 0.0235,
-      "Coal": 0.0102,
-      "Gas": 0.1166,
-      "Hydro": 0.6312,
-      "Nuclear": 0.0125,
-      "Other Fossil": 0.0177,
+      "Bioenergy": 0.0222,
+      "Coal": 0.0096,
+      "Gas": 0.1099,
+      "Hydro": 0.596,
+      "Nuclear": 0.0118,
+      "Other Fossil": 0.0167,
       "Other Renewables": 0.0004,
-      "Solar": 0.0515,
-      "Wind": 0.1364
+      "Solar": 0.1049,
+      "Wind": 0.1286
     },
     "2024": {
-      "Bioenergy": 0.0273,
-      "Coal": 0.0022,
-      "Gas": 0.0916,
-      "Hydro": 0.6253,
-      "Nuclear": 0.0029,
-      "Other Fossil": 0.0152,
+      "Bioenergy": 0.0264,
+      "Coal": 0.0025,
+      "Gas": 0.0874,
+      "Hydro": 0.604,
+      "Nuclear": 0.0034,
+      "Other Fossil": 0.0147,
       "Other Renewables": 0.0001,
-      "Solar": 0.1048,
-      "Wind": 0.1305
+      "Solar": 0.1318,
+      "Wind": 0.1297
     }
   },
   "AU": {
@@ -1008,14 +1008,14 @@
       "Wind": 0.0117
     },
     "2024": {
-      "Bioenergy": 0.0031,
-      "Coal": 0.359,
-      "Gas": 0.4454,
-      "Hydro": 0.0307,
+      "Bioenergy": 0.0032,
+      "Coal": 0.3594,
+      "Gas": 0.4447,
+      "Hydro": 0.0294,
       "Nuclear": 0.0083,
-      "Other Fossil": 0.1199,
+      "Other Fossil": 0.1213,
       "Other Renewables": 0.0008,
-      "Solar": 0.0214,
+      "Solar": 0.0216,
       "Wind": 0.0115
     }
   },
@@ -1072,19 +1072,19 @@
       "Nuclear": 0.3934,
       "Other Fossil": 0.0994,
       "Other Renewables": 0.0004,
-      "Solar": 0.0922,
+      "Solar": 0.0923,
       "Wind": 0.1828
     },
     "2024": {
-      "Bioenergy": 0.0119,
-      "Coal": 0.0191,
-      "Gas": 0.1733,
-      "Hydro": 0.0263,
-      "Nuclear": 0.3908,
-      "Other Fossil": 0.092,
+      "Bioenergy": 0.0117,
+      "Coal": 0.0181,
+      "Gas": 0.1662,
+      "Hydro": 0.0252,
+      "Nuclear": 0.3962,
+      "Other Fossil": 0.0917,
       "Other Renewables": 0.0009,
-      "Solar": 0.1136,
-      "Wind": 0.172
+      "Solar": 0.1121,
+      "Wind": 0.1781
     }
   },
   "BF": {
@@ -1212,15 +1212,15 @@
       "Wind": 0.0386
     },
     "2024": {
-      "Bioenergy": 0.0047,
-      "Coal": 0.2641,
-      "Gas": 0.0667,
-      "Hydro": 0.0848,
-      "Nuclear": 0.4034,
-      "Other Fossil": 0.0009,
-      "Other Renewables": 0.0003,
-      "Solar": 0.1338,
-      "Wind": 0.0413
+      "Bioenergy": 0.0044,
+      "Coal": 0.265,
+      "Gas": 0.0639,
+      "Hydro": 0.0821,
+      "Nuclear": 0.4137,
+      "Other Fossil": 0.0007,
+      "Other Renewables": 0.0002,
+      "Solar": 0.1291,
+      "Wind": 0.0408
     }
   },
   "BH": {
@@ -1620,15 +1620,15 @@
       "Wind": 0.0434
     },
     "2024": {
-      "Bioenergy": 0.0102,
+      "Bioenergy": 0.0085,
       "Coal": 0,
-      "Gas": 0.6862,
-      "Hydro": 0.2298,
+      "Gas": 0.6801,
+      "Hydro": 0.2387,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0297,
-      "Wind": 0.0441
+      "Solar": 0.0299,
+      "Wind": 0.0428
     }
   },
   "BR": {
@@ -1688,15 +1688,15 @@
       "Wind": 0.1416
     },
     "2024": {
-      "Bioenergy": 0.0146,
-      "Coal": 0.0155,
-      "Gas": 0.072,
-      "Hydro": 0.5998,
-      "Nuclear": 0.0246,
-      "Other Fossil": 0.0117,
+      "Bioenergy": 0.0142,
+      "Coal": 0.0134,
+      "Gas": 0.066,
+      "Hydro": 0.6121,
+      "Nuclear": 0.0225,
+      "Other Fossil": 0.0115,
       "Other Renewables": 0,
-      "Solar": 0.1073,
-      "Wind": 0.1544
+      "Solar": 0.1071,
+      "Wind": 0.1532
     }
   },
   "BS": {
@@ -2028,12 +2028,12 @@
       "Wind": 0.038
     },
     "2024": {
-      "Bioenergy": 0.1712,
-      "Coal": 0.0165,
-      "Gas": 0.1071,
-      "Hydro": 0.5069,
-      "Nuclear": 0.0095,
-      "Other Fossil": 0.1031,
+      "Bioenergy": 0.1711,
+      "Coal": 0.0162,
+      "Gas": 0.1057,
+      "Hydro": 0.5094,
+      "Nuclear": 0.009,
+      "Other Fossil": 0.1028,
       "Other Renewables": 0.0024,
       "Solar": 0.0423,
       "Wind": 0.0411
@@ -2096,15 +2096,15 @@
       "Wind": 0.0646
     },
     "2024": {
-      "Bioenergy": 0.0165,
-      "Coal": 0.0479,
-      "Gas": 0.1508,
+      "Bioenergy": 0.0163,
+      "Coal": 0.0475,
+      "Gas": 0.1494,
       "Hydro": 0.5528,
-      "Nuclear": 0.1393,
-      "Other Fossil": 0.0108,
+      "Nuclear": 0.1354,
+      "Other Fossil": 0.0106,
       "Other Renewables": 0.0005,
-      "Solar": 0.0105,
-      "Wind": 0.0708
+      "Solar": 0.0099,
+      "Wind": 0.0776
     }
   },
   "CD": {
@@ -2340,14 +2340,14 @@
       "Gas": 0.0278,
       "Hydro": 0.557,
       "Nuclear": 0.2895,
-      "Other Fossil": 0.0538,
+      "Other Fossil": 0.0537,
       "Other Renewables": 0.0006,
-      "Solar": 0.0376,
+      "Solar": 0.0377,
       "Wind": 0.0132
     },
     "2022": {
       "Bioenergy": 0.0028,
-      "Coal": 0.0162,
+      "Coal": 0.0161,
       "Gas": 0.0247,
       "Hydro": 0.4873,
       "Nuclear": 0.3539,
@@ -2368,15 +2368,15 @@
       "Wind": 0.0067
     },
     "2024": {
-      "Bioenergy": 0.0001,
-      "Coal": 0.0007,
-      "Gas": 0.0012,
-      "Hydro": 0.605,
-      "Nuclear": 0.2894,
-      "Other Fossil": 0.0458,
-      "Other Renewables": 0,
-      "Solar": 0.0557,
-      "Wind": 0.002
+      "Bioenergy": 0.0004,
+      "Coal": 0.002,
+      "Gas": 0.0036,
+      "Hydro": 0.5991,
+      "Nuclear": 0.2908,
+      "Other Fossil": 0.0459,
+      "Other Renewables": 0.0001,
+      "Solar": 0.0546,
+      "Wind": 0.0035
     }
   },
   "CI": {
@@ -2572,15 +2572,15 @@
       "Wind": 0.1187
     },
     "2024": {
-      "Bioenergy": 0.0228,
-      "Coal": 0.1525,
-      "Gas": 0.1414,
-      "Hydro": 0.3233,
+      "Bioenergy": 0.0227,
+      "Coal": 0.1514,
+      "Gas": 0.1447,
+      "Hydro": 0.3173,
       "Nuclear": 0,
-      "Other Fossil": 0.0136,
+      "Other Fossil": 0.0135,
       "Other Renewables": 0.0035,
-      "Solar": 0.2139,
-      "Wind": 0.1291
+      "Solar": 0.2173,
+      "Wind": 0.1296
     }
   },
   "CM": {
@@ -2660,7 +2660,7 @@
       "Nuclear": 0.0475,
       "Other Fossil": 0.0028,
       "Other Renewables": 0,
-      "Solar": 0.0305,
+      "Solar": 0.0306,
       "Wind": 0.0553
     },
     "2020": {
@@ -2708,15 +2708,15 @@
       "Wind": 0.0952
     },
     "2024": {
-      "Bioenergy": 0.0192,
-      "Coal": 0.5841,
-      "Gas": 0.0282,
-      "Hydro": 0.1357,
+      "Bioenergy": 0.0194,
+      "Coal": 0.5897,
+      "Gas": 0.0285,
+      "Hydro": 0.1306,
       "Nuclear": 0.0447,
       "Other Fossil": 0.0017,
       "Other Renewables": 0,
-      "Solar": 0.0872,
-      "Wind": 0.0992
+      "Solar": 0.0861,
+      "Wind": 0.0994
     }
   },
   "CO": {
@@ -2777,14 +2777,14 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.1327,
-      "Gas": 0.0631,
-      "Hydro": 0.7476,
+      "Coal": 0.1278,
+      "Gas": 0.0695,
+      "Hydro": 0.7485,
       "Nuclear": 0,
-      "Other Fossil": 0.0077,
+      "Other Fossil": 0.0075,
       "Other Renewables": 0,
-      "Solar": 0.0467,
-      "Wind": 0.0023
+      "Solar": 0.0447,
+      "Wind": 0.0019
     }
   },
   "CR": {
@@ -2844,15 +2844,15 @@
       "Wind": 0.1222
     },
     "2024": {
-      "Bioenergy": 0.0034,
+      "Bioenergy": 0.0041,
       "Coal": 0.001,
       "Gas": 0.0065,
-      "Hydro": 0.674,
+      "Hydro": 0.6649,
       "Nuclear": 0.0006,
-      "Other Fossil": 0.1062,
-      "Other Renewables": 0.1162,
+      "Other Fossil": 0.106,
+      "Other Renewables": 0.1171,
       "Solar": 0.0019,
-      "Wind": 0.0904
+      "Wind": 0.098
     }
   },
   "CU": {
@@ -3116,15 +3116,15 @@
       "Wind": 0.0105
     },
     "2024": {
-      "Bioenergy": 0.0328,
-      "Coal": 0.3533,
-      "Gas": 0.0518,
-      "Hydro": 0.0367,
-      "Nuclear": 0.4069,
-      "Other Fossil": 0.014,
-      "Other Renewables": 0.0353,
-      "Solar": 0.0589,
-      "Wind": 0.0105
+      "Bioenergy": 0.0329,
+      "Coal": 0.3482,
+      "Gas": 0.0498,
+      "Hydro": 0.0377,
+      "Nuclear": 0.4139,
+      "Other Fossil": 0.0138,
+      "Other Renewables": 0.0352,
+      "Solar": 0.0581,
+      "Wind": 0.0103
     }
   },
   "DE": {
@@ -3175,7 +3175,7 @@
     "2023": {
       "Bioenergy": 0.0841,
       "Coal": 0.2455,
-      "Gas": 0.1585,
+      "Gas": 0.1584,
       "Hydro": 0.0461,
       "Nuclear": 0.0216,
       "Other Fossil": 0.0484,
@@ -3184,15 +3184,15 @@
       "Wind": 0.2709
     },
     "2024": {
-      "Bioenergy": 0.0861,
-      "Coal": 0.2149,
-      "Gas": 0.1757,
+      "Bioenergy": 0.0867,
+      "Coal": 0.2123,
+      "Gas": 0.1674,
       "Hydro": 0.0569,
-      "Nuclear": 0.0114,
-      "Other Fossil": 0.0426,
+      "Nuclear": 0.011,
+      "Other Fossil": 0.0445,
       "Other Renewables": 0.0004,
-      "Solar": 0.1476,
-      "Wind": 0.2643
+      "Solar": 0.148,
+      "Wind": 0.2727
     }
   },
   "DJ": {
@@ -3268,11 +3268,11 @@
       "Bioenergy": 0.1107,
       "Coal": 0.1378,
       "Gas": 0.1219,
-      "Hydro": 0.0315,
+      "Hydro": 0.0314,
       "Nuclear": 0.0409,
       "Other Fossil": 0.049,
       "Other Renewables": 0.0011,
-      "Solar": 0.0355,
+      "Solar": 0.0356,
       "Wind": 0.4716
     },
     "2020": {
@@ -3280,7 +3280,7 @@
       "Coal": 0.14,
       "Gas": 0.1056,
       "Hydro": 0.0396,
-      "Nuclear": 0.0451,
+      "Nuclear": 0.045,
       "Other Fossil": 0.0478,
       "Other Renewables": 0.0014,
       "Solar": 0.0455,
@@ -3289,17 +3289,17 @@
     "2021": {
       "Bioenergy": 0.1338,
       "Coal": 0.1751,
-      "Gas": 0.1022,
+      "Gas": 0.1021,
       "Hydro": 0.0234,
       "Nuclear": 0.0286,
       "Other Fossil": 0.0507,
       "Other Renewables": 0.0008,
-      "Solar": 0.0446,
+      "Solar": 0.0447,
       "Wind": 0.4407
     },
     "2022": {
       "Bioenergy": 0.1136,
-      "Coal": 0.151,
+      "Coal": 0.1509,
       "Gas": 0.0776,
       "Hydro": 0.013,
       "Nuclear": 0.015,
@@ -3316,19 +3316,19 @@
       "Nuclear": 0.0198,
       "Other Fossil": 0.0358,
       "Other Renewables": 0.0006,
-      "Solar": 0.0914,
+      "Solar": 0.0915,
       "Wind": 0.5468
     },
     "2024": {
-      "Bioenergy": 0.1072,
-      "Coal": 0.1021,
-      "Gas": 0.0735,
-      "Hydro": 0.0207,
-      "Nuclear": 0.023,
-      "Other Fossil": 0.0346,
+      "Bioenergy": 0.1066,
+      "Coal": 0.099,
+      "Gas": 0.0712,
+      "Hydro": 0.0193,
+      "Nuclear": 0.0213,
+      "Other Fossil": 0.0343,
       "Other Renewables": 0.0007,
-      "Solar": 0.1071,
-      "Wind": 0.5311
+      "Solar": 0.1051,
+      "Wind": 0.5426
     }
   },
   "DM": {
@@ -3594,10 +3594,10 @@
     "2024": {
       "Bioenergy": 0.0156,
       "Coal": 0.0007,
-      "Gas": 0.0329,
-      "Hydro": 0.6926,
+      "Gas": 0.0328,
+      "Hydro": 0.6927,
       "Nuclear": 0.0004,
-      "Other Fossil": 0.2468,
+      "Other Fossil": 0.2467,
       "Other Renewables": 0.0001,
       "Solar": 0.0014,
       "Wind": 0.0096
@@ -3612,7 +3612,7 @@
       "Nuclear": 0.0645,
       "Other Fossil": 0.5626,
       "Other Renewables": 0.003,
-      "Solar": 0.0093,
+      "Solar": 0.0094,
       "Wind": 0.1123
     },
     "2020": {
@@ -3623,7 +3623,7 @@
       "Nuclear": 0.0985,
       "Other Fossil": 0.3605,
       "Other Renewables": 0.003,
-      "Solar": 0.031,
+      "Solar": 0.0311,
       "Wind": 0.1608
     },
     "2021": {
@@ -3634,7 +3634,7 @@
       "Nuclear": 0.0675,
       "Other Fossil": 0.5134,
       "Other Renewables": 0.002,
-      "Solar": 0.0489,
+      "Solar": 0.049,
       "Wind": 0.1239
     },
     "2022": {
@@ -3645,30 +3645,30 @@
       "Nuclear": 0.0268,
       "Other Fossil": 0.6251,
       "Other Renewables": 0.0009,
-      "Solar": 0.0732,
+      "Solar": 0.0733,
       "Wind": 0.1014
     },
     "2023": {
       "Bioenergy": 0.0749,
       "Coal": 0.0614,
-      "Gas": 0.0998,
-      "Hydro": 0.0706,
+      "Gas": 0.0997,
+      "Hydro": 0.0705,
       "Nuclear": 0.082,
-      "Other Fossil": 0.3374,
+      "Other Fossil": 0.3373,
       "Other Renewables": 0.0027,
-      "Solar": 0.1159,
+      "Solar": 0.1162,
       "Wind": 0.1554
     },
     "2024": {
-      "Bioenergy": 0.0655,
-      "Coal": 0.0518,
-      "Gas": 0.0886,
-      "Hydro": 0.0677,
-      "Nuclear": 0.0753,
-      "Other Fossil": 0.3015,
+      "Bioenergy": 0.0676,
+      "Coal": 0.0509,
+      "Gas": 0.0871,
+      "Hydro": 0.0665,
+      "Nuclear": 0.0744,
+      "Other Fossil": 0.3043,
       "Other Renewables": 0.0024,
-      "Solar": 0.1484,
-      "Wind": 0.1989
+      "Solar": 0.1445,
+      "Wind": 0.2022
     }
   },
   "EG": {
@@ -3865,14 +3865,14 @@
     },
     "2024": {
       "Bioenergy": 0.0137,
-      "Coal": 0.0119,
-      "Gas": 0.1665,
-      "Hydro": 0.1279,
-      "Nuclear": 0.2072,
-      "Other Fossil": 0.0094,
+      "Coal": 0.0118,
+      "Gas": 0.169,
+      "Hydro": 0.1266,
+      "Nuclear": 0.208,
+      "Other Fossil": 0.0093,
       "Other Renewables": 0.0026,
-      "Solar": 0.226,
-      "Wind": 0.2349
+      "Solar": 0.2248,
+      "Wind": 0.2343
     }
   },
   "ET": {
@@ -3946,13 +3946,13 @@
   "FI": {
     "2019": {
       "Bioenergy": 0.1463,
-      "Coal": 0.0921,
-      "Gas": 0.1049,
+      "Coal": 0.092,
+      "Gas": 0.1048,
       "Hydro": 0.1816,
       "Nuclear": 0.3153,
       "Other Fossil": 0.0606,
       "Other Renewables": 0.0039,
-      "Solar": 0.0088,
+      "Solar": 0.0089,
       "Wind": 0.0865
     },
     "2020": {
@@ -3963,7 +3963,7 @@
       "Nuclear": 0.3137,
       "Other Fossil": 0.0476,
       "Other Renewables": 0.0038,
-      "Solar": 0.0107,
+      "Solar": 0.0108,
       "Wind": 0.1082
     },
     "2021": {
@@ -3974,7 +3974,7 @@
       "Nuclear": 0.3016,
       "Other Fossil": 0.055,
       "Other Renewables": 0.0029,
-      "Solar": 0.0121,
+      "Solar": 0.0122,
       "Wind": 0.11
     },
     "2022": {
@@ -3985,7 +3985,7 @@
       "Nuclear": 0.3194,
       "Other Fossil": 0.0566,
       "Other Renewables": 0.0011,
-      "Solar": 0.0119,
+      "Solar": 0.012,
       "Wind": 0.1509
     },
     "2023": {
@@ -4000,15 +4000,15 @@
       "Wind": 0.1767
     },
     "2024": {
-      "Bioenergy": 0.1111,
-      "Coal": 0.0186,
-      "Gas": 0.0181,
-      "Hydro": 0.1852,
-      "Nuclear": 0.3741,
-      "Other Fossil": 0.0423,
-      "Other Renewables": 0.0015,
-      "Solar": 0.0169,
-      "Wind": 0.2323
+      "Bioenergy": 0.1113,
+      "Coal": 0.0185,
+      "Gas": 0.0195,
+      "Hydro": 0.1812,
+      "Nuclear": 0.3733,
+      "Other Fossil": 0.0432,
+      "Other Renewables": 0.0013,
+      "Solar": 0.0172,
+      "Wind": 0.2344
     }
   },
   "FJ": {
@@ -4273,14 +4273,14 @@
     },
     "2024": {
       "Bioenergy": 0.006,
-      "Coal": 0.0013,
-      "Gas": 0.0347,
-      "Hydro": 0.1212,
-      "Nuclear": 0.6969,
-      "Other Fossil": 0.0063,
+      "Coal": 0.0012,
+      "Gas": 0.0341,
+      "Hydro": 0.1223,
+      "Nuclear": 0.6963,
+      "Other Fossil": 0.0062,
       "Other Renewables": 0,
-      "Solar": 0.0455,
-      "Wind": 0.0881
+      "Solar": 0.0444,
+      "Wind": 0.0896
     }
   },
   "GA": {
@@ -4408,15 +4408,15 @@
       "Wind": 0.3127
     },
     "2024": {
-      "Bioenergy": 0.0761,
-      "Coal": 0.0229,
-      "Gas": 0.3115,
-      "Hydro": 0.0361,
-      "Nuclear": 0.1703,
+      "Bioenergy": 0.0738,
+      "Coal": 0.0223,
+      "Gas": 0.2996,
+      "Hydro": 0.0364,
+      "Nuclear": 0.168,
       "Other Fossil": 0.0149,
       "Other Renewables": 0.0008,
-      "Solar": 0.061,
-      "Wind": 0.3064
+      "Solar": 0.0596,
+      "Wind": 0.3245
     }
   },
   "GD": {
@@ -4544,15 +4544,15 @@
       "Wind": 0.0124
     },
     "2024": {
-      "Bioenergy": 0.0012,
-      "Coal": 0.0335,
-      "Gas": 0.2926,
-      "Hydro": 0.6526,
-      "Nuclear": 0.0032,
+      "Bioenergy": 0.0016,
+      "Coal": 0.0422,
+      "Gas": 0.1973,
+      "Hydro": 0.7348,
+      "Nuclear": 0.004,
       "Other Fossil": 0.0004,
-      "Other Renewables": 0.0003,
-      "Solar": 0.0046,
-      "Wind": 0.0116
+      "Other Renewables": 0.0004,
+      "Solar": 0.0055,
+      "Wind": 0.0138
     }
   },
   "GF": {
@@ -5119,14 +5119,14 @@
       "Nuclear": 0.0403,
       "Other Fossil": 0.0039,
       "Other Renewables": 0.0012,
-      "Solar": 0.091,
+      "Solar": 0.0911,
       "Wind": 0.1767
     },
     "2021": {
       "Bioenergy": 0.0024,
       "Coal": 0.1224,
       "Gas": 0.4655,
-      "Hydro": 0.1068,
+      "Hydro": 0.1067,
       "Nuclear": 0.0179,
       "Other Fossil": 0.0017,
       "Other Renewables": 0.0005,
@@ -5141,30 +5141,30 @@
       "Nuclear": 0.0186,
       "Other Fossil": 0.0019,
       "Other Renewables": 0.0006,
-      "Solar": 0.1232,
+      "Solar": 0.1233,
       "Wind": 0.2102
     },
     "2023": {
       "Bioenergy": 0.0031,
-      "Coal": 0.1161,
+      "Coal": 0.116,
       "Gas": 0.3654,
       "Hydro": 0.0928,
       "Nuclear": 0.0221,
-      "Other Fossil": 0.0023,
+      "Other Fossil": 0.0022,
       "Other Renewables": 0.0007,
-      "Solar": 0.1781,
+      "Solar": 0.1782,
       "Wind": 0.2194
     },
     "2024": {
       "Bioenergy": 0.0007,
-      "Coal": 0.0668,
-      "Gas": 0.4211,
-      "Hydro": 0.0565,
-      "Nuclear": 0.0053,
+      "Coal": 0.0675,
+      "Gas": 0.4215,
+      "Hydro": 0.0576,
+      "Nuclear": 0.0052,
       "Other Fossil": 0.0005,
       "Other Renewables": 0.0002,
-      "Solar": 0.2302,
-      "Wind": 0.2187
+      "Solar": 0.2274,
+      "Wind": 0.2193
     }
   },
   "GT": {
@@ -5496,15 +5496,15 @@
       "Wind": 0.0176
     },
     "2024": {
-      "Bioenergy": 0.0078,
-      "Coal": 0.5632,
-      "Gas": 0.3396,
-      "Hydro": 0.0314,
-      "Nuclear": 0.0131,
-      "Other Fossil": 0.0052,
+      "Bioenergy": 0.0079,
+      "Coal": 0.5645,
+      "Gas": 0.3395,
+      "Hydro": 0.0302,
+      "Nuclear": 0.0132,
+      "Other Fossil": 0.0051,
       "Other Renewables": 0.0012,
-      "Solar": 0.0202,
-      "Wind": 0.0182
+      "Solar": 0.0199,
+      "Wind": 0.0183
     }
   },
   "HN": {
@@ -5565,11 +5565,11 @@
     },
     "2024": {
       "Bioenergy": 0.1288,
-      "Coal": 0.0009,
-      "Gas": 0.0056,
-      "Hydro": 0.2237,
+      "Coal": 0.0008,
+      "Gas": 0.0055,
+      "Hydro": 0.2238,
       "Nuclear": 0.0005,
-      "Other Fossil": 0.4392,
+      "Other Fossil": 0.4391,
       "Other Renewables": 0.0265,
       "Solar": 0.1003,
       "Wind": 0.0744
@@ -5584,7 +5584,7 @@
       "Nuclear": 0.0803,
       "Other Fossil": 0.0103,
       "Other Renewables": 0.0283,
-      "Solar": 0.0173,
+      "Solar": 0.0174,
       "Wind": 0.1137
     },
     "2020": {
@@ -5595,7 +5595,7 @@
       "Nuclear": 0.0648,
       "Other Fossil": 0.0087,
       "Other Renewables": 0.0308,
-      "Solar": 0.018,
+      "Solar": 0.0181,
       "Wind": 0.1329
     },
     "2021": {
@@ -5606,41 +5606,41 @@
       "Nuclear": 0.055,
       "Other Fossil": 0.0074,
       "Other Renewables": 0.0284,
-      "Solar": 0.0173,
+      "Solar": 0.0174,
       "Wind": 0.138
     },
     "2022": {
       "Bioenergy": 0.0448,
       "Coal": 0.1285,
-      "Gas": 0.2546,
-      "Hydro": 0.2978,
+      "Gas": 0.2545,
+      "Hydro": 0.2977,
       "Nuclear": 0.0574,
       "Other Fossil": 0.0073,
       "Other Renewables": 0.0244,
-      "Solar": 0.0247,
-      "Wind": 0.1605
+      "Solar": 0.0249,
+      "Wind": 0.1604
     },
     "2023": {
       "Bioenergy": 0.0378,
       "Coal": 0.0881,
       "Gas": 0.2241,
       "Hydro": 0.4059,
-      "Nuclear": 0.0292,
+      "Nuclear": 0.0291,
       "Other Fossil": 0.0089,
       "Other Renewables": 0.0153,
-      "Solar": 0.0329,
+      "Solar": 0.0331,
       "Wind": 0.1577
     },
     "2024": {
-      "Bioenergy": 0.0403,
-      "Coal": 0.0755,
-      "Gas": 0.2091,
-      "Hydro": 0.3473,
-      "Nuclear": 0.0546,
-      "Other Fossil": 0.0098,
-      "Other Renewables": 0.0164,
-      "Solar": 0.0737,
-      "Wind": 0.1733
+      "Bioenergy": 0.0399,
+      "Coal": 0.0743,
+      "Gas": 0.2146,
+      "Hydro": 0.3472,
+      "Nuclear": 0.0536,
+      "Other Fossil": 0.0096,
+      "Other Renewables": 0.0163,
+      "Solar": 0.0714,
+      "Wind": 0.1731
     }
   },
   "HT": {
@@ -5737,12 +5737,12 @@
     "2021": {
       "Bioenergy": 0.0325,
       "Coal": 0.1089,
-      "Gas": 0.2575,
-      "Hydro": 0.051,
+      "Gas": 0.2574,
+      "Hydro": 0.0509,
       "Nuclear": 0.3866,
       "Other Fossil": 0.0224,
       "Other Renewables": 0.0043,
-      "Solar": 0.0947,
+      "Solar": 0.0948,
       "Wind": 0.0421
     },
     "2022": {
@@ -5753,30 +5753,30 @@
       "Nuclear": 0.3819,
       "Other Fossil": 0.0217,
       "Other Renewables": 0.0044,
-      "Solar": 0.1175,
+      "Solar": 0.1176,
       "Wind": 0.0442
     },
     "2023": {
       "Bioenergy": 0.0239,
-      "Coal": 0.0986,
-      "Gas": 0.2081,
+      "Coal": 0.0985,
+      "Gas": 0.208,
       "Hydro": 0.0476,
-      "Nuclear": 0.3885,
+      "Nuclear": 0.3884,
       "Other Fossil": 0.0192,
       "Other Renewables": 0.0027,
-      "Solar": 0.1644,
+      "Solar": 0.1646,
       "Wind": 0.047
     },
     "2024": {
-      "Bioenergy": 0.0259,
-      "Coal": 0.0875,
+      "Bioenergy": 0.0263,
+      "Coal": 0.0878,
       "Gas": 0.1909,
-      "Hydro": 0.0459,
-      "Nuclear": 0.3689,
-      "Other Fossil": 0.0178,
-      "Other Renewables": 0.0038,
-      "Solar": 0.2156,
-      "Wind": 0.0437
+      "Hydro": 0.0458,
+      "Nuclear": 0.3695,
+      "Other Fossil": 0.0176,
+      "Other Renewables": 0.004,
+      "Solar": 0.2135,
+      "Wind": 0.0447
     }
   },
   "ID": {
@@ -5837,7 +5837,7 @@
     },
     "2024": {
       "Bioenergy": 0.0411,
-      "Coal": 0.5903,
+      "Coal": 0.5904,
       "Gas": 0.2103,
       "Hydro": 0.0719,
       "Nuclear": 0.0003,
@@ -5867,7 +5867,7 @@
       "Nuclear": 0.0234,
       "Other Fossil": 0.0607,
       "Other Renewables": 0.0007,
-      "Solar": 0.0039,
+      "Solar": 0.004,
       "Wind": 0.3492
     },
     "2021": {
@@ -5883,11 +5883,11 @@
     },
     "2022": {
       "Bioenergy": 0.006,
-      "Coal": 0.087,
+      "Coal": 0.0869,
       "Gas": 0.4646,
       "Hydro": 0.0325,
       "Nuclear": 0.0163,
-      "Other Fossil": 0.0583,
+      "Other Fossil": 0.0582,
       "Other Renewables": 0.0005,
       "Solar": 0.0042,
       "Wind": 0.3307
@@ -5900,19 +5900,19 @@
       "Nuclear": 0.0244,
       "Other Fossil": 0.0359,
       "Other Renewables": 0.0008,
-      "Solar": 0.0191,
-      "Wind": 0.3594
+      "Solar": 0.0192,
+      "Wind": 0.3593
     },
     "2024": {
-      "Bioenergy": 0.0082,
-      "Coal": 0.0523,
-      "Gas": 0.4447,
-      "Hydro": 0.0488,
-      "Nuclear": 0.0331,
-      "Other Fossil": 0.0395,
-      "Other Renewables": 0.0011,
-      "Solar": 0.0377,
-      "Wind": 0.3346
+      "Bioenergy": 0.0079,
+      "Coal": 0.0496,
+      "Gas": 0.452,
+      "Hydro": 0.0493,
+      "Nuclear": 0.0315,
+      "Other Fossil": 0.0391,
+      "Other Renewables": 0.001,
+      "Solar": 0.0329,
+      "Wind": 0.3368
     }
   },
   "IL": {
@@ -6040,15 +6040,15 @@
       "Wind": 0.0482
     },
     "2024": {
-      "Bioenergy": 0.0057,
-      "Coal": 0.7139,
-      "Gas": 0.0197,
-      "Hydro": 0.1033,
-      "Nuclear": 0.03,
+      "Bioenergy": 0.0059,
+      "Coal": 0.7327,
+      "Gas": 0.0194,
+      "Hydro": 0.0928,
+      "Nuclear": 0.0297,
       "Other Fossil": 0.0002,
-      "Other Renewables": 0.0015,
-      "Solar": 0.073,
-      "Wind": 0.0526
+      "Other Renewables": 0.0016,
+      "Solar": 0.0745,
+      "Wind": 0.0433
     }
   },
   "IQ": {
@@ -6178,10 +6178,10 @@
     "2024": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.8228,
-      "Hydro": 0.0689,
+      "Gas": 0.808,
+      "Hydro": 0.0563,
       "Nuclear": 0,
-      "Other Fossil": 0.1084,
+      "Other Fossil": 0.1357,
       "Other Renewables": 0,
       "Solar": 0,
       "Wind": 0
@@ -6264,7 +6264,7 @@
       "Nuclear": 0.0279,
       "Other Fossil": 0.0256,
       "Other Renewables": 0.019,
-      "Solar": 0.0787,
+      "Solar": 0.0788,
       "Wind": 0.0754
     },
     "2020": {
@@ -6292,35 +6292,35 @@
     "2022": {
       "Bioenergy": 0.0573,
       "Coal": 0.0922,
-      "Gas": 0.482,
+      "Gas": 0.4819,
       "Hydro": 0.1091,
-      "Nuclear": 0.0277,
+      "Nuclear": 0.0276,
       "Other Fossil": 0.0319,
       "Other Renewables": 0.0189,
-      "Solar": 0.0987,
+      "Solar": 0.0988,
       "Wind": 0.0822
     },
     "2023": {
       "Bioenergy": 0.0561,
-      "Coal": 0.0669,
+      "Coal": 0.0668,
       "Gas": 0.4228,
       "Hydro": 0.1517,
       "Nuclear": 0.0345,
       "Other Fossil": 0.033,
       "Other Renewables": 0.0193,
-      "Solar": 0.1142,
+      "Solar": 0.1143,
       "Wind": 0.1015
     },
     "2024": {
-      "Bioenergy": 0.0554,
-      "Coal": 0.0347,
-      "Gas": 0.4095,
-      "Hydro": 0.1896,
-      "Nuclear": 0.0339,
-      "Other Fossil": 0.031,
+      "Bioenergy": 0.0555,
+      "Coal": 0.0351,
+      "Gas": 0.4094,
+      "Hydro": 0.1864,
+      "Nuclear": 0.0342,
+      "Other Fossil": 0.0313,
       "Other Renewables": 0.0188,
-      "Solar": 0.1338,
-      "Wind": 0.0934
+      "Solar": 0.1323,
+      "Wind": 0.097
     }
   },
   "JM": {
@@ -6516,15 +6516,15 @@
       "Wind": 0.0183
     },
     "2024": {
-      "Bioenergy": 0.0555,
-      "Coal": 0.2801,
-      "Gas": 0.3054,
-      "Hydro": 0.0911,
-      "Nuclear": 0.0848,
-      "Other Fossil": 0.0338,
-      "Other Renewables": 0.0097,
-      "Solar": 0.1224,
-      "Wind": 0.0171
+      "Bioenergy": 0.0566,
+      "Coal": 0.284,
+      "Gas": 0.3074,
+      "Hydro": 0.0789,
+      "Nuclear": 0.0875,
+      "Other Fossil": 0.0333,
+      "Other Renewables": 0.01,
+      "Solar": 0.1262,
+      "Wind": 0.0162
     }
   },
   "KE": {
@@ -6584,15 +6584,15 @@
       "Wind": 0.1517
     },
     "2024": {
-      "Bioenergy": 0.0097,
-      "Coal": 0.0318,
-      "Gas": 0.0433,
-      "Hydro": 0.2746,
+      "Bioenergy": 0.0118,
+      "Coal": 0.0321,
+      "Gas": 0.0436,
+      "Hydro": 0.2736,
       "Nuclear": 0.0016,
-      "Other Fossil": 0.0732,
-      "Other Renewables": 0.3933,
-      "Solar": 0.0344,
-      "Wind": 0.138
+      "Other Fossil": 0.0746,
+      "Other Renewables": 0.3947,
+      "Solar": 0.034,
+      "Wind": 0.1342
     }
   },
   "KG": {
@@ -6710,7 +6710,7 @@
     },
     "2023": {
       "Bioenergy": 0.0138,
-      "Coal": 0.4762,
+      "Coal": 0.4761,
       "Gas": 0.0259,
       "Hydro": 0.3686,
       "Nuclear": 0.0138,
@@ -6720,15 +6720,15 @@
       "Wind": 0.0181
     },
     "2024": {
-      "Bioenergy": 0.0135,
-      "Coal": 0.4702,
-      "Gas": 0.0251,
-      "Hydro": 0.3712,
+      "Bioenergy": 0.0136,
+      "Coal": 0.4716,
+      "Gas": 0.025,
+      "Hydro": 0.3699,
       "Nuclear": 0.0135,
       "Other Fossil": 0.0562,
       "Other Renewables": 0.0013,
-      "Solar": 0.0304,
-      "Wind": 0.0187
+      "Solar": 0.0301,
+      "Wind": 0.0188
     }
   },
   "KI": {
@@ -7060,15 +7060,15 @@
       "Wind": 0.0058
     },
     "2024": {
-      "Bioenergy": 0.021,
-      "Coal": 0.2928,
-      "Gas": 0.2826,
-      "Hydro": 0.0076,
-      "Nuclear": 0.3122,
-      "Other Fossil": 0.0076,
-      "Other Renewables": 0.0134,
-      "Solar": 0.0581,
-      "Wind": 0.0046
+      "Bioenergy": 0.0216,
+      "Coal": 0.2809,
+      "Gas": 0.2804,
+      "Hydro": 0.0074,
+      "Nuclear": 0.3259,
+      "Other Fossil": 0.0079,
+      "Other Renewables": 0.0138,
+      "Solar": 0.0569,
+      "Wind": 0.0051
     }
   },
   "KW": {
@@ -7265,14 +7265,14 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.5449,
-      "Gas": 0.2752,
-      "Hydro": 0.102,
+      "Coal": 0.5494,
+      "Gas": 0.2773,
+      "Hydro": 0.0978,
       "Nuclear": 0,
-      "Other Fossil": 0.0203,
+      "Other Fossil": 0.0204,
       "Other Renewables": 0,
-      "Solar": 0.0197,
-      "Wind": 0.0378
+      "Solar": 0.0167,
+      "Wind": 0.0383
     }
   },
   "LA": {
@@ -7685,14 +7685,14 @@
   },
   "LT": {
     "2019": {
-      "Bioenergy": 0.0549,
-      "Coal": 0.1275,
+      "Bioenergy": 0.0548,
+      "Coal": 0.1274,
       "Gas": 0.2298,
       "Hydro": 0.156,
       "Nuclear": 0.1731,
       "Other Fossil": 0.0411,
       "Other Renewables": 0.0047,
-      "Solar": 0.0291,
+      "Solar": 0.0292,
       "Wind": 0.1838
     },
     "2020": {
@@ -7703,120 +7703,120 @@
       "Nuclear": 0.1449,
       "Other Fossil": 0.0376,
       "Other Renewables": 0.0044,
-      "Solar": 0.03,
+      "Solar": 0.0301,
       "Wind": 0.1952
     },
     "2021": {
       "Bioenergy": 0.0534,
-      "Coal": 0.114,
-      "Gas": 0.275,
-      "Hydro": 0.149,
+      "Coal": 0.1139,
+      "Gas": 0.2749,
+      "Hydro": 0.1489,
       "Nuclear": 0.1595,
       "Other Fossil": 0.0364,
       "Other Renewables": 0.0046,
-      "Solar": 0.0366,
-      "Wind": 0.1716
+      "Solar": 0.0368,
+      "Wind": 0.1715
     },
     "2022": {
       "Bioenergy": 0.0517,
-      "Coal": 0.1208,
-      "Gas": 0.2263,
-      "Hydro": 0.1433,
-      "Nuclear": 0.1414,
+      "Coal": 0.1207,
+      "Gas": 0.2261,
+      "Hydro": 0.1432,
+      "Nuclear": 0.1413,
       "Other Fossil": 0.0467,
       "Other Renewables": 0.0047,
-      "Solar": 0.0639,
+      "Solar": 0.0643,
       "Wind": 0.2014
     },
     "2023": {
       "Bioenergy": 0.0386,
-      "Coal": 0.0893,
-      "Gas": 0.1956,
-      "Hydro": 0.1352,
-      "Nuclear": 0.1195,
-      "Other Fossil": 0.0573,
+      "Coal": 0.0892,
+      "Gas": 0.1955,
+      "Hydro": 0.1351,
+      "Nuclear": 0.1194,
+      "Other Fossil": 0.0572,
       "Other Renewables": 0.0039,
-      "Solar": 0.0891,
+      "Solar": 0.0896,
       "Wind": 0.2715
     },
     "2024": {
-      "Bioenergy": 0.0302,
-      "Coal": 0.0619,
-      "Gas": 0.1646,
-      "Hydro": 0.1123,
-      "Nuclear": 0.0913,
-      "Other Fossil": 0.0837,
+      "Bioenergy": 0.0307,
+      "Coal": 0.0608,
+      "Gas": 0.1661,
+      "Hydro": 0.1106,
+      "Nuclear": 0.0901,
+      "Other Fossil": 0.0839,
       "Other Renewables": 0.0029,
-      "Solar": 0.1422,
-      "Wind": 0.3108
+      "Solar": 0.1403,
+      "Wind": 0.3148
     }
   },
   "LU": {
     "2019": {
       "Bioenergy": 0.0572,
-      "Coal": 0.1335,
+      "Coal": 0.1334,
       "Gas": 0.2563,
       "Hydro": 0.1486,
       "Nuclear": 0.1814,
       "Other Fossil": 0.0403,
       "Other Renewables": 0.0049,
-      "Solar": 0.0499,
+      "Solar": 0.05,
       "Wind": 0.1279
     },
     "2020": {
       "Bioenergy": 0.0716,
-      "Coal": 0.1152,
-      "Gas": 0.2393,
+      "Coal": 0.1151,
+      "Gas": 0.2392,
       "Hydro": 0.1524,
-      "Nuclear": 0.167,
+      "Nuclear": 0.1669,
       "Other Fossil": 0.0384,
       "Other Renewables": 0.0051,
-      "Solar": 0.0573,
+      "Solar": 0.0574,
       "Wind": 0.1538
     },
     "2021": {
       "Bioenergy": 0.0795,
       "Coal": 0.1201,
-      "Gas": 0.2385,
-      "Hydro": 0.1482,
-      "Nuclear": 0.1687,
+      "Gas": 0.2384,
+      "Hydro": 0.1481,
+      "Nuclear": 0.1686,
       "Other Fossil": 0.0373,
       "Other Renewables": 0.0049,
-      "Solar": 0.0653,
+      "Solar": 0.0655,
       "Wind": 0.1375
     },
     "2022": {
       "Bioenergy": 0.0844,
-      "Coal": 0.1283,
-      "Gas": 0.2272,
-      "Hydro": 0.1307,
-      "Nuclear": 0.1503,
+      "Coal": 0.1282,
+      "Gas": 0.227,
+      "Hydro": 0.1306,
+      "Nuclear": 0.1502,
       "Other Fossil": 0.0378,
       "Other Renewables": 0.005,
-      "Solar": 0.0877,
-      "Wind": 0.1486
+      "Solar": 0.0881,
+      "Wind": 0.1485
     },
     "2023": {
       "Bioenergy": 0.0551,
       "Coal": 0.1112,
-      "Gas": 0.1988,
-      "Hydro": 0.1445,
-      "Nuclear": 0.1497,
-      "Other Fossil": 0.0364,
+      "Gas": 0.1987,
+      "Hydro": 0.1444,
+      "Nuclear": 0.1496,
+      "Other Fossil": 0.0363,
       "Other Renewables": 0.0049,
-      "Solar": 0.0991,
+      "Solar": 0.0997,
       "Wind": 0.2003
     },
     "2024": {
-      "Bioenergy": 0.0754,
-      "Coal": 0.0987,
-      "Gas": 0.1827,
-      "Hydro": 0.1578,
+      "Bioenergy": 0.0734,
+      "Coal": 0.0982,
+      "Gas": 0.1819,
+      "Hydro": 0.1571,
       "Nuclear": 0.146,
-      "Other Fossil": 0.0347,
+      "Other Fossil": 0.0368,
       "Other Renewables": 0.0047,
-      "Solar": 0.1184,
-      "Wind": 0.1816
+      "Solar": 0.1162,
+      "Wind": 0.1858
     }
   },
   "LV": {
@@ -7836,10 +7836,10 @@
       "Coal": 0.0347,
       "Gas": 0.3006,
       "Hydro": 0.3949,
-      "Nuclear": 0.05,
+      "Nuclear": 0.0499,
       "Other Fossil": 0.0867,
       "Other Renewables": 0.0015,
-      "Solar": 0.0097,
+      "Solar": 0.0098,
       "Wind": 0.0417
     },
     "2021": {
@@ -7850,41 +7850,41 @@
       "Nuclear": 0.0577,
       "Other Fossil": 0.0712,
       "Other Renewables": 0.0017,
-      "Solar": 0.0122,
-      "Wind": 0.0406
+      "Solar": 0.0123,
+      "Wind": 0.0405
     },
     "2022": {
-      "Bioenergy": 0.0582,
-      "Coal": 0.0587,
-      "Gas": 0.2514,
-      "Hydro": 0.434,
-      "Nuclear": 0.0681,
-      "Other Fossil": 0.0448,
+      "Bioenergy": 0.058,
+      "Coal": 0.0585,
+      "Gas": 0.2506,
+      "Hydro": 0.4326,
+      "Nuclear": 0.0678,
+      "Other Fossil": 0.0447,
       "Other Renewables": 0.0023,
-      "Solar": 0.0201,
-      "Wind": 0.0625
+      "Solar": 0.0232,
+      "Wind": 0.0623
     },
     "2023": {
-      "Bioenergy": 0.0374,
-      "Coal": 0.0398,
-      "Gas": 0.2534,
-      "Hydro": 0.4972,
-      "Nuclear": 0.0575,
-      "Other Fossil": 0.0244,
-      "Other Renewables": 0.0019,
-      "Solar": 0.0236,
-      "Wind": 0.0648
+      "Bioenergy": 0.0367,
+      "Coal": 0.039,
+      "Gas": 0.2487,
+      "Hydro": 0.4888,
+      "Nuclear": 0.0564,
+      "Other Fossil": 0.024,
+      "Other Renewables": 0.0018,
+      "Solar": 0.041,
+      "Wind": 0.0636
     },
     "2024": {
-      "Bioenergy": 0.0469,
-      "Coal": 0.0402,
-      "Gas": 0.2773,
-      "Hydro": 0.4286,
-      "Nuclear": 0.0592,
-      "Other Fossil": 0.0163,
-      "Other Renewables": 0.0019,
-      "Solar": 0.0647,
-      "Wind": 0.065
+      "Bioenergy": 0.0458,
+      "Coal": 0.0392,
+      "Gas": 0.2677,
+      "Hydro": 0.4252,
+      "Nuclear": 0.0583,
+      "Other Fossil": 0.016,
+      "Other Renewables": 0.0018,
+      "Solar": 0.0796,
+      "Wind": 0.0664
     }
   },
   "LY": {
@@ -8002,25 +8002,25 @@
     },
     "2023": {
       "Bioenergy": 0.0002,
-      "Coal": 0.6379,
+      "Coal": 0.6374,
       "Gas": 0.1049,
-      "Hydro": 0.0204,
+      "Hydro": 0.0203,
       "Nuclear": 0.0007,
-      "Other Fossil": 0.0223,
+      "Other Fossil": 0.0222,
       "Other Renewables": 0.0003,
       "Solar": 0.0536,
-      "Wind": 0.1598
+      "Wind": 0.1604
     },
     "2024": {
-      "Bioenergy": 0.0003,
-      "Coal": 0.6056,
-      "Gas": 0.0948,
-      "Hydro": 0.0273,
-      "Nuclear": 0.001,
-      "Other Fossil": 0.0194,
-      "Other Renewables": 0.0004,
-      "Solar": 0.0446,
-      "Wind": 0.2066
+      "Bioenergy": 0.0002,
+      "Coal": 0.5526,
+      "Gas": 0.0995,
+      "Hydro": 0.0243,
+      "Nuclear": 0.0009,
+      "Other Fossil": 0.0206,
+      "Other Renewables": 0.0003,
+      "Solar": 0.0519,
+      "Wind": 0.2495
     }
   },
   "MD": {
@@ -8032,7 +8032,7 @@
       "Nuclear": 0.023,
       "Other Fossil": 0.0022,
       "Other Renewables": 0.0006,
-      "Solar": 0.0031,
+      "Solar": 0.0032,
       "Wind": 0.0156
     },
     "2020": {
@@ -8062,10 +8062,10 @@
       "Coal": 0.0278,
       "Gas": 0.8342,
       "Hydro": 0.0718,
-      "Nuclear": 0.0309,
+      "Nuclear": 0.0308,
       "Other Fossil": 0.0034,
       "Other Renewables": 0.001,
-      "Solar": 0.0078,
+      "Solar": 0.0079,
       "Wind": 0.0182
     },
     "2023": {
@@ -8082,19 +8082,19 @@
     "2024": {
       "Bioenergy": 0.0009,
       "Coal": 0.0046,
-      "Gas": 0.9137,
-      "Hydro": 0.0478,
+      "Gas": 0.9136,
+      "Hydro": 0.0477,
       "Nuclear": 0.0066,
       "Other Fossil": 0.0007,
       "Other Renewables": 0.0002,
       "Solar": 0.0125,
-      "Wind": 0.0131
+      "Wind": 0.0132
     }
   },
   "ME": {
     "2019": {
       "Bioenergy": 0.0073,
-      "Coal": 0.3522,
+      "Coal": 0.3521,
       "Gas": 0.0684,
       "Hydro": 0.4066,
       "Nuclear": 0.06,
@@ -8122,7 +8122,7 @@
       "Nuclear": 0.0316,
       "Other Fossil": 0.003,
       "Other Renewables": 0.0009,
-      "Solar": 0.0086,
+      "Solar": 0.0087,
       "Wind": 0.0929
     },
     "2022": {
@@ -8144,19 +8144,19 @@
       "Nuclear": 0.006,
       "Other Fossil": 0.0006,
       "Other Renewables": 0.0002,
-      "Solar": 0.0028,
+      "Solar": 0.0029,
       "Wind": 0.0889
     },
     "2024": {
-      "Bioenergy": 0.0037,
-      "Coal": 0.3755,
-      "Gas": 0.03,
-      "Hydro": 0.4287,
-      "Nuclear": 0.0275,
-      "Other Fossil": 0.0027,
+      "Bioenergy": 0.0038,
+      "Coal": 0.3737,
+      "Gas": 0.0309,
+      "Hydro": 0.4291,
+      "Nuclear": 0.0283,
+      "Other Fossil": 0.0028,
       "Other Renewables": 0.0009,
-      "Solar": 0.0401,
-      "Wind": 0.091
+      "Solar": 0.0396,
+      "Wind": 0.0909
     }
   },
   "MG": {
@@ -8231,7 +8231,7 @@
     "2019": {
       "Bioenergy": 0.0176,
       "Coal": 0.4988,
-      "Gas": 0.1871,
+      "Gas": 0.187,
       "Hydro": 0.2007,
       "Nuclear": 0.0476,
       "Other Fossil": 0.0045,
@@ -8243,33 +8243,33 @@
       "Bioenergy": 0.0221,
       "Coal": 0.3946,
       "Gas": 0.228,
-      "Hydro": 0.2316,
-      "Nuclear": 0.0611,
+      "Hydro": 0.2315,
+      "Nuclear": 0.061,
       "Other Fossil": 0.0057,
       "Other Renewables": 0.0018,
-      "Solar": 0.0081,
+      "Solar": 0.0082,
       "Wind": 0.047
     },
     "2021": {
-      "Bioenergy": 0.0209,
+      "Bioenergy": 0.0208,
       "Coal": 0.3271,
       "Gas": 0.2819,
       "Hydro": 0.2475,
-      "Nuclear": 0.0612,
+      "Nuclear": 0.0611,
       "Other Fossil": 0.0058,
       "Other Renewables": 0.0018,
-      "Solar": 0.0097,
+      "Solar": 0.0098,
       "Wind": 0.0441
     },
     "2022": {
       "Bioenergy": 0.0123,
       "Coal": 0.4361,
-      "Gas": 0.1884,
+      "Gas": 0.1883,
       "Hydro": 0.2297,
       "Nuclear": 0.0414,
-      "Other Fossil": 0.0395,
+      "Other Fossil": 0.0394,
       "Other Renewables": 0.0013,
-      "Solar": 0.0122,
+      "Solar": 0.0123,
       "Wind": 0.0391
     },
     "2023": {
@@ -8284,15 +8284,15 @@
       "Wind": 0.0292
     },
     "2024": {
-      "Bioenergy": 0.017,
-      "Coal": 0.3824,
-      "Gas": 0.2466,
-      "Hydro": 0.2655,
-      "Nuclear": 0.0056,
-      "Other Fossil": 0.0005,
+      "Bioenergy": 0.0177,
+      "Coal": 0.3856,
+      "Gas": 0.2606,
+      "Hydro": 0.2374,
+      "Nuclear": 0.0058,
+      "Other Fossil": 0.0006,
       "Other Renewables": 0.0002,
-      "Solar": 0.051,
-      "Wind": 0.0312
+      "Solar": 0.0534,
+      "Wind": 0.0387
     }
   },
   "ML": {
@@ -8489,14 +8489,14 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.9072,
+      "Coal": 0.9087,
       "Gas": 0,
       "Hydro": 0,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
       "Solar": 0,
-      "Wind": 0.0928
+      "Wind": 0.0913
     }
   },
   "MO": {
@@ -8556,15 +8556,15 @@
       "Wind": 0.0601
     },
     "2024": {
-      "Bioenergy": 0.0549,
-      "Coal": 0.4643,
-      "Gas": 0.1608,
-      "Hydro": 0.1071,
-      "Nuclear": 0.0447,
-      "Other Fossil": 0.0343,
+      "Bioenergy": 0.0551,
+      "Coal": 0.4689,
+      "Gas": 0.1605,
+      "Hydro": 0.1031,
+      "Nuclear": 0.0449,
+      "Other Fossil": 0.0342,
       "Other Renewables": 0.0042,
-      "Solar": 0.0675,
-      "Wind": 0.0622
+      "Solar": 0.0667,
+      "Wind": 0.0625
     }
   },
   "MQ": {
@@ -8780,7 +8780,7 @@
       "Nuclear": 0.0415,
       "Other Fossil": 0.0153,
       "Other Renewables": 0.0011,
-      "Solar": 0.0058,
+      "Solar": 0.0059,
       "Wind": 0.0165
     },
     "2020": {
@@ -8802,7 +8802,7 @@
       "Nuclear": 0.0335,
       "Other Fossil": 0.0233,
       "Other Renewables": 0.001,
-      "Solar": 0.0055,
+      "Solar": 0.0056,
       "Wind": 0.0152
     },
     "2022": {
@@ -8813,7 +8813,7 @@
       "Nuclear": 0.0339,
       "Other Fossil": 0.0276,
       "Other Renewables": 0.0011,
-      "Solar": 0.0416,
+      "Solar": 0.0417,
       "Wind": 0.019
     },
     "2023": {
@@ -8824,19 +8824,19 @@
       "Nuclear": 0.0309,
       "Other Fossil": 0.0079,
       "Other Renewables": 0.001,
-      "Solar": 0.121,
+      "Solar": 0.1212,
       "Wind": 0.0199
     },
     "2024": {
-      "Bioenergy": 0.0069,
-      "Coal": 0.0335,
-      "Gas": 0.6813,
-      "Hydro": 0.0442,
-      "Nuclear": 0.0496,
-      "Other Fossil": 0.0071,
-      "Other Renewables": 0.0016,
-      "Solar": 0.1456,
-      "Wind": 0.0303
+      "Bioenergy": 0.0065,
+      "Coal": 0.0311,
+      "Gas": 0.6945,
+      "Hydro": 0.0419,
+      "Nuclear": 0.0468,
+      "Other Fossil": 0.0069,
+      "Other Renewables": 0.0015,
+      "Solar": 0.1419,
+      "Wind": 0.029
     }
   },
   "MU": {
@@ -9576,11 +9576,11 @@
       "Wind": 0.1534
     },
     "2024": {
-      "Bioenergy": 0.1686,
-      "Coal": 0.0034,
-      "Gas": 0.0218,
-      "Hydro": 0.0834,
-      "Nuclear": 0.0019,
+      "Bioenergy": 0.1685,
+      "Coal": 0.0033,
+      "Gas": 0.0215,
+      "Hydro": 0.0839,
+      "Nuclear": 0.0018,
       "Other Fossil": 0.3983,
       "Other Renewables": 0.1562,
       "Solar": 0.0124,
@@ -9618,7 +9618,7 @@
       "Nuclear": 0.0362,
       "Other Fossil": 0.0142,
       "Other Renewables": 0.004,
-      "Solar": 0.0965,
+      "Solar": 0.0966,
       "Wind": 0.1512
     },
     "2022": {
@@ -9644,15 +9644,15 @@
       "Wind": 0.2525
     },
     "2024": {
-      "Bioenergy": 0.0439,
-      "Coal": 0.0913,
-      "Gas": 0.3673,
-      "Hydro": 0.0016,
-      "Nuclear": 0.0298,
-      "Other Fossil": 0.0118,
-      "Other Renewables": 0.0049,
-      "Solar": 0.1912,
-      "Wind": 0.2584
+      "Bioenergy": 0.0501,
+      "Coal": 0.0837,
+      "Gas": 0.3596,
+      "Hydro": 0.0019,
+      "Nuclear": 0.0295,
+      "Other Fossil": 0.0112,
+      "Other Renewables": 0.0048,
+      "Solar": 0.1854,
+      "Wind": 0.2738
     }
   },
   "NO": {
@@ -9714,13 +9714,13 @@
     "2024": {
       "Bioenergy": 0,
       "Coal": 0,
-      "Gas": 0.0108,
-      "Hydro": 0.8914,
+      "Gas": 0.0107,
+      "Hydro": 0.8895,
       "Nuclear": 0,
-      "Other Fossil": 0.0018,
+      "Other Fossil": 0.0017,
       "Other Renewables": 0.0027,
       "Solar": 0,
-      "Wind": 0.0934
+      "Wind": 0.0954
     }
   },
   "NP": {
@@ -9781,14 +9781,14 @@
     },
     "2024": {
       "Bioenergy": 0.0042,
-      "Coal": 0.1133,
-      "Gas": 0.0204,
-      "Hydro": 0.8071,
-      "Nuclear": 0.0109,
+      "Coal": 0.1144,
+      "Gas": 0.0203,
+      "Hydro": 0.8061,
+      "Nuclear": 0.011,
       "Other Fossil": 0.0012,
       "Other Renewables": 0.001,
-      "Solar": 0.0255,
-      "Wind": 0.0164
+      "Solar": 0.0253,
+      "Wind": 0.0165
     }
   },
   "NR": {
@@ -9985,12 +9985,12 @@
     },
     "2024": {
       "Bioenergy": 0.0056,
-      "Coal": 0.0449,
-      "Gas": 0.1103,
-      "Hydro": 0.5499,
+      "Coal": 0.0456,
+      "Gas": 0.1015,
+      "Hydro": 0.5565,
       "Nuclear": 0,
       "Other Fossil": 0.0005,
-      "Other Renewables": 0.1975,
+      "Other Renewables": 0.1989,
       "Solar": 0,
       "Wind": 0.0913
     }
@@ -10392,15 +10392,15 @@
       "Wind": 0.0112
     },
     "2024": {
-      "Bioenergy": 0.0072,
-      "Coal": 0.6392,
-      "Gas": 0.1569,
-      "Hydro": 0.0653,
+      "Bioenergy": 0.0079,
+      "Coal": 0.624,
+      "Gas": 0.1495,
+      "Hydro": 0.0904,
       "Nuclear": 0,
-      "Other Fossil": 0.0119,
-      "Other Renewables": 0.0824,
-      "Solar": 0.0305,
-      "Wind": 0.0066
+      "Other Fossil": 0.0084,
+      "Other Renewables": 0.0826,
+      "Solar": 0.0292,
+      "Wind": 0.008
     }
   },
   "PK": {
@@ -10460,15 +10460,15 @@
       "Wind": 0.0338
     },
     "2024": {
-      "Bioenergy": 0.0059,
-      "Coal": 0.1784,
-      "Gas": 0.2831,
-      "Hydro": 0.3156,
-      "Nuclear": 0.1701,
-      "Other Fossil": 0.0102,
+      "Bioenergy": 0.0061,
+      "Coal": 0.1707,
+      "Gas": 0.2743,
+      "Hydro": 0.3201,
+      "Nuclear": 0.1809,
+      "Other Fossil": 0.0116,
       "Other Renewables": 0,
-      "Solar": 0.0094,
-      "Wind": 0.0273
+      "Solar": 0.0093,
+      "Wind": 0.0269
     }
   },
   "PL": {
@@ -10528,15 +10528,15 @@
       "Wind": 0.1447
     },
     "2024": {
-      "Bioenergy": 0.0154,
-      "Coal": 0.5563,
-      "Gas": 0.108,
-      "Hydro": 0.0155,
+      "Bioenergy": 0.0152,
+      "Coal": 0.5574,
+      "Gas": 0.1068,
+      "Hydro": 0.0156,
       "Nuclear": 0.0037,
-      "Other Fossil": 0.0412,
+      "Other Fossil": 0.0415,
       "Other Renewables": 0.001,
-      "Solar": 0.1112,
-      "Wind": 0.1477
+      "Solar": 0.1101,
+      "Wind": 0.1488
     }
   },
   "PM": {
@@ -10665,13 +10665,13 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.1741,
-      "Gas": 0.3729,
+      "Coal": 0.1747,
+      "Gas": 0.3903,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.4302,
+      "Other Fossil": 0.4142,
       "Other Renewables": 0,
-      "Solar": 0.0135,
+      "Solar": 0.0116,
       "Wind": 0.0092
     }
   },
@@ -10763,12 +10763,12 @@
       "Nuclear": 0.0136,
       "Other Fossil": 0.0062,
       "Other Renewables": 0.0004,
-      "Solar": 0.0295,
+      "Solar": 0.0296,
       "Wind": 0.2516
     },
     "2021": {
       "Bioenergy": 0.0739,
-      "Coal": 0.0335,
+      "Coal": 0.0334,
       "Gas": 0.3293,
       "Hydro": 0.2144,
       "Nuclear": 0.0258,
@@ -10781,34 +10781,34 @@
       "Bioenergy": 0.0707,
       "Coal": 0.0319,
       "Gas": 0.3732,
-      "Hydro": 0.1349,
+      "Hydro": 0.1348,
       "Nuclear": 0.0381,
       "Other Fossil": 0.008,
       "Other Renewables": 0.0013,
-      "Solar": 0.0659,
+      "Solar": 0.066,
       "Wind": 0.276
     },
     "2023": {
       "Bioenergy": 0.0633,
       "Coal": 0.0292,
       "Gas": 0.2463,
-      "Hydro": 0.2322,
-      "Nuclear": 0.0417,
+      "Hydro": 0.2321,
+      "Nuclear": 0.0416,
       "Other Fossil": 0.0079,
       "Other Renewables": 0.0014,
-      "Solar": 0.0971,
+      "Solar": 0.0973,
       "Wind": 0.2809
     },
     "2024": {
-      "Bioenergy": 0.066,
-      "Coal": 0.0271,
-      "Gas": 0.1404,
-      "Hydro": 0.2786,
-      "Nuclear": 0.0414,
-      "Other Fossil": 0.0089,
-      "Other Renewables": 0.0013,
-      "Solar": 0.13,
-      "Wind": 0.3062
+      "Bioenergy": 0.0663,
+      "Coal": 0.0288,
+      "Gas": 0.1455,
+      "Hydro": 0.2731,
+      "Nuclear": 0.0438,
+      "Other Fossil": 0.0091,
+      "Other Renewables": 0.0014,
+      "Solar": 0.1301,
+      "Wind": 0.3018
     }
   },
   "PY": {
@@ -11073,14 +11073,14 @@
     },
     "2024": {
       "Bioenergy": 0.0096,
-      "Coal": 0.1327,
-      "Gas": 0.1949,
+      "Coal": 0.1314,
+      "Gas": 0.1954,
       "Hydro": 0.2622,
-      "Nuclear": 0.2042,
+      "Nuclear": 0.2036,
       "Other Fossil": 0.0014,
       "Other Renewables": 0.0004,
-      "Solar": 0.0794,
-      "Wind": 0.1152
+      "Solar": 0.0771,
+      "Wind": 0.1189
     }
   },
   "RS": {
@@ -11114,8 +11114,8 @@
       "Nuclear": 0.0122,
       "Other Fossil": 0.0231,
       "Other Renewables": 0.0004,
-      "Solar": 0.0017,
-      "Wind": 0.0361
+      "Solar": 0.0018,
+      "Wind": 0.036
     },
     "2022": {
       "Bioenergy": 0.0098,
@@ -11140,15 +11140,15 @@
       "Wind": 0.0268
     },
     "2024": {
-      "Bioenergy": 0.0085,
-      "Coal": 0.6112,
-      "Gas": 0.033,
-      "Hydro": 0.2864,
-      "Nuclear": 0.0101,
-      "Other Fossil": 0.0079,
-      "Other Renewables": 0.0003,
-      "Solar": 0.0055,
-      "Wind": 0.0371
+      "Bioenergy": 0.0086,
+      "Coal": 0.6057,
+      "Gas": 0.0332,
+      "Hydro": 0.2897,
+      "Nuclear": 0.0113,
+      "Other Fossil": 0.008,
+      "Other Renewables": 0.0004,
+      "Solar": 0.0056,
+      "Wind": 0.0376
     }
   },
   "RU": {
@@ -11616,15 +11616,15 @@
       "Wind": 0.2198
     },
     "2024": {
-      "Bioenergy": 0.0374,
+      "Bioenergy": 0.0375,
       "Coal": 0,
       "Gas": 0,
-      "Hydro": 0.4046,
-      "Nuclear": 0.3007,
+      "Hydro": 0.4011,
+      "Nuclear": 0.2998,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0111,
-      "Wind": 0.2462
+      "Solar": 0.011,
+      "Wind": 0.2507
     }
   },
   "SG": {
@@ -11789,7 +11789,7 @@
     "2021": {
       "Bioenergy": 0.0053,
       "Coal": 0.2377,
-      "Gas": 0.0446,
+      "Gas": 0.0445,
       "Hydro": 0.3072,
       "Nuclear": 0.3713,
       "Other Fossil": 0.0089,
@@ -11816,18 +11816,18 @@
       "Nuclear": 0.3702,
       "Other Fossil": 0.0091,
       "Other Renewables": 0.0003,
-      "Solar": 0.0328,
+      "Solar": 0.0329,
       "Wind": 0.0057
     },
     "2024": {
-      "Bioenergy": 0.0082,
-      "Coal": 0.212,
-      "Gas": 0.0326,
-      "Hydro": 0.3338,
-      "Nuclear": 0.3532,
-      "Other Fossil": 0.0036,
+      "Bioenergy": 0.0083,
+      "Coal": 0.2104,
+      "Gas": 0.0352,
+      "Hydro": 0.3303,
+      "Nuclear": 0.3577,
+      "Other Fossil": 0.0029,
       "Other Renewables": 0.0001,
-      "Solar": 0.0542,
+      "Solar": 0.0529,
       "Wind": 0.0022
     }
   },
@@ -11867,7 +11867,7 @@
     },
     "2022": {
       "Bioenergy": 0.0294,
-      "Coal": 0.0528,
+      "Coal": 0.0527,
       "Gas": 0.0776,
       "Hydro": 0.142,
       "Nuclear": 0.5908,
@@ -11888,14 +11888,14 @@
       "Wind": 0
     },
     "2024": {
-      "Bioenergy": 0.0314,
-      "Coal": 0.008,
-      "Gas": 0.0872,
-      "Hydro": 0.1628,
-      "Nuclear": 0.6293,
-      "Other Fossil": 0.0445,
-      "Other Renewables": 0.0165,
-      "Solar": 0.0201,
+      "Bioenergy": 0.0312,
+      "Coal": 0.0079,
+      "Gas": 0.0855,
+      "Hydro": 0.1632,
+      "Nuclear": 0.6309,
+      "Other Fossil": 0.045,
+      "Other Renewables": 0.0164,
+      "Solar": 0.0197,
       "Wind": 0
     }
   },
@@ -12772,15 +12772,15 @@
       "Wind": 0.0263
     },
     "2024": {
-      "Bioenergy": 0.0616,
-      "Coal": 0.2227,
-      "Gas": 0.5963,
-      "Hydro": 0.0457,
+      "Bioenergy": 0.0605,
+      "Coal": 0.2257,
+      "Gas": 0.5985,
+      "Hydro": 0.0432,
       "Nuclear": 0.0078,
-      "Other Fossil": 0.0022,
+      "Other Fossil": 0.0019,
       "Other Renewables": 0.0007,
-      "Solar": 0.0376,
-      "Wind": 0.0253
+      "Solar": 0.0367,
+      "Wind": 0.0249
     }
   },
   "TJ": {
@@ -13180,15 +13180,15 @@
       "Wind": 0.1063
     },
     "2024": {
-      "Bioenergy": 0.0255,
-      "Coal": 0.3567,
-      "Gas": 0.1822,
-      "Hydro": 0.2196,
+      "Bioenergy": 0.0254,
+      "Coal": 0.3549,
+      "Gas": 0.1853,
+      "Hydro": 0.2184,
       "Nuclear": 0.0004,
       "Other Fossil": 0.0029,
       "Other Renewables": 0.0299,
-      "Solar": 0.0768,
-      "Wind": 0.106
+      "Solar": 0.0758,
+      "Wind": 0.1069
     }
   },
   "TT": {
@@ -13589,14 +13589,14 @@
     },
     "2024": {
       "Bioenergy": 0.0106,
-      "Coal": 0.1475,
-      "Gas": 0.4269,
-      "Hydro": 0.0525,
-      "Nuclear": 0.177,
-      "Other Fossil": 0.0067,
+      "Coal": 0.1489,
+      "Gas": 0.4266,
+      "Hydro": 0.0532,
+      "Nuclear": 0.1787,
+      "Other Fossil": 0.0059,
       "Other Renewables": 0.004,
-      "Solar": 0.0695,
-      "Wind": 0.1052
+      "Solar": 0.0684,
+      "Wind": 0.1038
     }
   },
   "UY": {
@@ -13656,15 +13656,15 @@
       "Wind": 0.4065
     },
     "2024": {
-      "Bioenergy": 0.1301,
+      "Bioenergy": 0.1287,
       "Coal": 0,
       "Gas": 0.0058,
-      "Hydro": 0.5033,
+      "Hydro": 0.5021,
       "Nuclear": 0,
       "Other Fossil": 0.0006,
       "Other Renewables": 0,
-      "Solar": 0.0293,
-      "Wind": 0.3307
+      "Solar": 0.0306,
+      "Wind": 0.3322
     }
   },
   "UZ": {
@@ -13725,9 +13725,9 @@
     },
     "2024": {
       "Bioenergy": 0.0004,
-      "Coal": 0.0473,
+      "Coal": 0.0474,
       "Gas": 0.8346,
-      "Hydro": 0.1022,
+      "Hydro": 0.1021,
       "Nuclear": 0.0011,
       "Other Fossil": 0.0111,
       "Other Renewables": 0.0001,
@@ -14264,19 +14264,19 @@
       "Nuclear": 0.0263,
       "Other Fossil": 0.0027,
       "Other Renewables": 0.0008,
-      "Solar": 0.0064,
+      "Solar": 0.0065,
       "Wind": 0.0739
     },
     "2024": {
-      "Bioenergy": 0.002,
-      "Coal": 0.8592,
-      "Gas": 0.0181,
-      "Hydro": 0.043,
-      "Nuclear": 0.0148,
-      "Other Fossil": 0.0015,
-      "Other Renewables": 0.0005,
-      "Solar": 0.0039,
-      "Wind": 0.0571
+      "Bioenergy": 0.0025,
+      "Coal": 0.8382,
+      "Gas": 0.0215,
+      "Hydro": 0.0462,
+      "Nuclear": 0.0178,
+      "Other Fossil": 0.0018,
+      "Other Renewables": 0.0006,
+      "Solar": 0.0046,
+      "Wind": 0.0668
     }
   },
   "YE": {
@@ -14405,14 +14405,14 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Coal": 0.8214,
+      "Coal": 0.8159,
       "Gas": 0.0004,
-      "Hydro": 0.0047,
-      "Nuclear": 0.0289,
-      "Other Fossil": 0.0164,
+      "Hydro": 0.0048,
+      "Nuclear": 0.0331,
+      "Other Fossil": 0.0128,
       "Other Renewables": 0.0011,
-      "Solar": 0.0794,
-      "Wind": 0.0476
+      "Solar": 0.0838,
+      "Wind": 0.048
     }
   },
   "ZM": {