npm - @digital4better/data - Versions diffs - 1.1.21 → 1.1.23 - Mend

@digital4better/data 1.1.21 → 1.1.23

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (65) hide show

package/data/factor/continent-monthly-green.csv +212 -212
package/data/factor/continent-monthly-green.json +1831 -1831
package/data/factor/continent-monthly.csv +219 -219
package/data/factor/continent-monthly.json +1857 -1857
package/data/factor/continent-yearly-green.csv +25 -25
package/data/factor/continent-yearly-green.json +211 -211
package/data/factor/continent-yearly.csv +25 -25
package/data/factor/continent-yearly.json +209 -209
package/data/factor/country-monthly-green.csv +3169 -3169
package/data/factor/country-monthly-green.json +27809 -27809
package/data/factor/country-monthly.csv +3409 -3409
package/data/factor/country-monthly.json +29237 -29237
package/data/factor/country-yearly-green.csv +432 -432
package/data/factor/country-yearly-green.json +4258 -4258
package/data/factor/country-yearly.csv +431 -431
package/data/factor/country-yearly.json +4112 -4112
package/data/factor/subdivision-monthly-green.csv +39 -39
package/data/factor/subdivision-monthly-green.json +339 -339
package/data/factor/subdivision-monthly.csv +39 -39
package/data/factor/subdivision-monthly.json +342 -342
package/data/factor/subdivision-yearly-green.csv +125 -125
package/data/factor/subdivision-yearly-green.json +873 -873
package/data/factor/subdivision-yearly.csv +121 -121
package/data/factor/subdivision-yearly.json +797 -797
package/data/factor/world-monthly-green.csv +62 -62
package/data/factor/world-monthly-green.json +553 -553
package/data/factor/world-monthly.csv +62 -62
package/data/factor/world-monthly.json +554 -554
package/data/factor/world-yearly-green.csv +6 -6
package/data/factor/world-yearly-green.json +54 -54
package/data/factor/world-yearly.csv +6 -6
package/data/factor/world-yearly.json +53 -53
package/data/mix/continent-monthly-green.csv +181 -181
package/data/mix/continent-monthly-green.json +581 -581
package/data/mix/continent-monthly.csv +181 -181
package/data/mix/continent-monthly.json +870 -870
package/data/mix/continent-yearly-green.csv +22 -22
package/data/mix/continent-yearly-green.json +66 -66
package/data/mix/continent-yearly.csv +22 -22
package/data/mix/continent-yearly.json +117 -117
package/data/mix/country-monthly-green.csv +2817 -2817
package/data/mix/country-monthly-green.json +8756 -8756
package/data/mix/country-monthly.csv +2817 -2817
package/data/mix/country-monthly.json +15237 -15237
package/data/mix/country-yearly-green.csv +342 -342
package/data/mix/country-yearly-green.json +1084 -1084
package/data/mix/country-yearly.csv +342 -342
package/data/mix/country-yearly.json +1932 -1932
package/data/mix/subdivision-monthly-green.csv +33 -33
package/data/mix/subdivision-monthly-green.json +57 -57
package/data/mix/subdivision-monthly.csv +33 -33
package/data/mix/subdivision-monthly.json +132 -132
package/data/mix/subdivision-yearly-green.csv +47 -47
package/data/mix/subdivision-yearly-green.json +59 -59
package/data/mix/subdivision-yearly.csv +47 -47
package/data/mix/subdivision-yearly.json +104 -104
package/data/mix/world-monthly-green.csv +60 -60
package/data/mix/world-monthly-green.json +170 -170
package/data/mix/world-monthly.csv +60 -60
package/data/mix/world-monthly.json +176 -176
package/data/mix/world-yearly-green.csv +6 -6
package/data/mix/world-yearly-green.json +16 -16
package/data/mix/world-yearly.csv +6 -6
package/data/mix/world-yearly.json +23 -23
package/package.json +1 -1

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

@@ -63,16 +63,16 @@
       "Wind": 0.1433
     },
     "2023": {
-      "Bioenergy": 0.0448,
-      "Hydro": 0.6397,
-      "Solar": 0.161,
+      "Bioenergy": 0.0446,
+      "Hydro": 0.6395,
+      "Solar": 0.1613,
       "Wind": 0.1546
     },
     "2024": {
-      "Bioenergy": 0.0531,
-      "Hydro": 0.6192,
-      "Solar": 0.1459,
-      "Wind": 0.1818
+      "Bioenergy": 0.0556,
+      "Hydro": 0.6121,
+      "Solar": 0.1636,
+      "Wind": 0.1687
     }
   },
   "AG": {
@@ -122,33 +122,33 @@
     },
     "2020": {
       "Bioenergy": 0.0117,
-      "Hydro": 0.9271,
-      "Solar": 0.0188,
+      "Hydro": 0.9272,
+      "Solar": 0.0186,
       "Wind": 0.0424
     },
     "2021": {
-      "Bioenergy": 0.0121,
+      "Bioenergy": 0.012,
       "Hydro": 0.9281,
-      "Solar": 0.0195,
+      "Solar": 0.0196,
       "Wind": 0.0402
     },
     "2022": {
-      "Bioenergy": 0.0122,
-      "Hydro": 0.9184,
+      "Bioenergy": 0.0121,
+      "Hydro": 0.9186,
       "Solar": 0.0236,
       "Wind": 0.0458
     },
     "2023": {
       "Bioenergy": 0.011,
-      "Hydro": 0.9115,
+      "Hydro": 0.9116,
       "Solar": 0.0273,
       "Wind": 0.0501
     },
     "2024": {
-      "Bioenergy": 0.0107,
-      "Hydro": 0.9151,
-      "Solar": 0.0121,
-      "Wind": 0.0621
+      "Bioenergy": 0.0109,
+      "Hydro": 0.912,
+      "Solar": 0.0145,
+      "Wind": 0.0625
     }
   },
   "AM": {
@@ -248,14 +248,14 @@
     },
     "2022": {
       "Bioenergy": 0.0232,
-      "Hydro": 0.6415,
-      "Solar": 0.0599,
-      "Wind": 0.2755
+      "Hydro": 0.6413,
+      "Solar": 0.0602,
+      "Wind": 0.2754
     },
     "2023": {
       "Bioenergy": 0.0191,
-      "Hydro": 0.6871,
-      "Solar": 0.0564,
+      "Hydro": 0.6869,
+      "Solar": 0.0566,
       "Wind": 0.2374
     },
     "2024": {
@@ -317,7 +317,7 @@
       "Wind": 0.1499
     },
     "2021": {
-      "Bioenergy": 0.0346,
+      "Bioenergy": 0.0345,
       "Hydro": 0.7858,
       "Solar": 0.0215,
       "Wind": 0.1581
@@ -326,19 +326,19 @@
       "Bioenergy": 0.0571,
       "Hydro": 0.7457,
       "Solar": 0.0282,
-      "Wind": 0.1689
+      "Wind": 0.169
     },
     "2023": {
-      "Bioenergy": 0.0288,
+      "Bioenergy": 0.0287,
       "Hydro": 0.7585,
       "Solar": 0.0459,
       "Wind": 0.1668
     },
     "2024": {
-      "Bioenergy": 0.0238,
-      "Hydro": 0.7247,
-      "Solar": 0.0238,
-      "Wind": 0.2277
+      "Bioenergy": 0.0251,
+      "Hydro": 0.728,
+      "Solar": 0.0313,
+      "Wind": 0.2155
     }
   },
   "AU": {
@@ -373,10 +373,10 @@
       "Wind": 0.3506
     },
     "2024": {
-      "Bioenergy": 0.0025,
-      "Hydro": 0.1111,
-      "Solar": 0.5696,
-      "Wind": 0.3167
+      "Bioenergy": 0.0032,
+      "Hydro": 0.1213,
+      "Solar": 0.5659,
+      "Wind": 0.3096
     }
   },
   "AW": {
@@ -488,9 +488,9 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Hydro": 0.9443,
-      "Solar": 0.0186,
-      "Wind": 0.037
+      "Hydro": 0.9406,
+      "Solar": 0.0198,
+      "Wind": 0.0396
     }
   },
   "BB": {
@@ -557,16 +557,16 @@
       "Wind": 0.1553
     },
     "2023": {
-      "Bioenergy": 0.0465,
+      "Bioenergy": 0.0464,
       "Hydro": 0.4754,
-      "Solar": 0.3182,
-      "Wind": 0.1598
+      "Solar": 0.3184,
+      "Wind": 0.1599
     },
     "2024": {
-      "Bioenergy": 0.057,
-      "Hydro": 0.4862,
-      "Solar": 0.2617,
-      "Wind": 0.1951
+      "Bioenergy": 0.0597,
+      "Hydro": 0.4777,
+      "Solar": 0.2815,
+      "Wind": 0.1811
     }
   },
   "BE": {
@@ -595,54 +595,54 @@
       "Wind": 0.5695
     },
     "2023": {
-      "Bioenergy": 0.0434,
-      "Hydro": 0.037,
-      "Solar": 0.3089,
-      "Wind": 0.6107
+      "Bioenergy": 0.0432,
+      "Hydro": 0.0394,
+      "Solar": 0.3074,
+      "Wind": 0.6101
     },
     "2024": {
-      "Bioenergy": 0.0267,
-      "Hydro": 0.0503,
-      "Solar": 0.1153,
-      "Wind": 0.8077
+      "Bioenergy": 0.0276,
+      "Hydro": 0.0639,
+      "Solar": 0.1186,
+      "Wind": 0.7899
     }
   },
   "BF": {
     "2019": {
-      "Bioenergy": 0.0104,
-      "Hydro": 0.6821,
-      "Solar": 0.2677,
-      "Wind": 0.0397
+      "Bioenergy": 0.01,
+      "Hydro": 0.6661,
+      "Solar": 0.267,
+      "Wind": 0.0569
     },
     "2020": {
-      "Bioenergy": 0.0104,
-      "Hydro": 0.6821,
-      "Solar": 0.2677,
-      "Wind": 0.0397
+      "Bioenergy": 0.01,
+      "Hydro": 0.6661,
+      "Solar": 0.267,
+      "Wind": 0.0569
     },
     "2021": {
-      "Bioenergy": 0.0104,
-      "Hydro": 0.6821,
-      "Solar": 0.2677,
-      "Wind": 0.0397
+      "Bioenergy": 0.01,
+      "Hydro": 0.6661,
+      "Solar": 0.267,
+      "Wind": 0.0569
     },
     "2022": {
-      "Bioenergy": 0.0104,
-      "Hydro": 0.6821,
-      "Solar": 0.2677,
-      "Wind": 0.0397
+      "Bioenergy": 0.01,
+      "Hydro": 0.6661,
+      "Solar": 0.267,
+      "Wind": 0.0569
     },
     "2023": {
-      "Bioenergy": 0.0104,
-      "Hydro": 0.6821,
-      "Solar": 0.2677,
-      "Wind": 0.0397
+      "Bioenergy": 0.01,
+      "Hydro": 0.6661,
+      "Solar": 0.267,
+      "Wind": 0.0569
     },
     "2024": {
-      "Bioenergy": 0.0104,
-      "Hydro": 0.6821,
-      "Solar": 0.2677,
-      "Wind": 0.0397
+      "Bioenergy": 0.01,
+      "Hydro": 0.6661,
+      "Solar": 0.267,
+      "Wind": 0.0569
     }
   },
   "BG": {
@@ -671,16 +671,16 @@
       "Wind": 0.199
     },
     "2023": {
-      "Bioenergy": 0.0235,
-      "Hydro": 0.3937,
-      "Solar": 0.3887,
-      "Wind": 0.1941
+      "Bioenergy": 0.0234,
+      "Hydro": 0.3932,
+      "Solar": 0.3896,
+      "Wind": 0.1938
     },
     "2024": {
-      "Bioenergy": 0.0255,
-      "Hydro": 0.3684,
-      "Solar": 0.2739,
-      "Wind": 0.3321
+      "Bioenergy": 0.0217,
+      "Hydro": 0.3552,
+      "Solar": 0.3319,
+      "Wind": 0.2912
     }
   },
   "BH": {
@@ -723,78 +723,78 @@
   },
   "BI": {
     "2019": {
-      "Bioenergy": 0.0401,
-      "Hydro": 0.9103,
-      "Solar": 0.0437,
-      "Wind": 0.006
+      "Bioenergy": 0.04,
+      "Hydro": 0.9079,
+      "Solar": 0.0435,
+      "Wind": 0.0086
     },
     "2020": {
-      "Bioenergy": 0.0401,
-      "Hydro": 0.9103,
-      "Solar": 0.0437,
-      "Wind": 0.006
+      "Bioenergy": 0.04,
+      "Hydro": 0.9079,
+      "Solar": 0.0435,
+      "Wind": 0.0086
     },
     "2021": {
-      "Bioenergy": 0.0401,
-      "Hydro": 0.9103,
-      "Solar": 0.0437,
-      "Wind": 0.006
+      "Bioenergy": 0.04,
+      "Hydro": 0.9079,
+      "Solar": 0.0435,
+      "Wind": 0.0086
     },
     "2022": {
-      "Bioenergy": 0.0401,
-      "Hydro": 0.9103,
-      "Solar": 0.0437,
-      "Wind": 0.006
+      "Bioenergy": 0.04,
+      "Hydro": 0.9079,
+      "Solar": 0.0435,
+      "Wind": 0.0086
     },
     "2023": {
-      "Bioenergy": 0.0401,
-      "Hydro": 0.9103,
-      "Solar": 0.0437,
-      "Wind": 0.006
+      "Bioenergy": 0.04,
+      "Hydro": 0.9079,
+      "Solar": 0.0435,
+      "Wind": 0.0086
     },
     "2024": {
-      "Bioenergy": 0.0401,
-      "Hydro": 0.9103,
-      "Solar": 0.0437,
-      "Wind": 0.006
+      "Bioenergy": 0.04,
+      "Hydro": 0.9079,
+      "Solar": 0.0435,
+      "Wind": 0.0086
     }
   },
   "BJ": {
     "2019": {
-      "Bioenergy": 0.0196,
-      "Hydro": 0.7976,
-      "Solar": 0.1083,
-      "Wind": 0.0745
+      "Bioenergy": 0.0187,
+      "Hydro": 0.7681,
+      "Solar": 0.106,
+      "Wind": 0.1071
     },
     "2020": {
-      "Bioenergy": 0.0196,
-      "Hydro": 0.7976,
-      "Solar": 0.1083,
-      "Wind": 0.0745
+      "Bioenergy": 0.0187,
+      "Hydro": 0.7681,
+      "Solar": 0.106,
+      "Wind": 0.1071
     },
     "2021": {
-      "Bioenergy": 0.0196,
-      "Hydro": 0.7976,
-      "Solar": 0.1083,
-      "Wind": 0.0745
+      "Bioenergy": 0.0187,
+      "Hydro": 0.7681,
+      "Solar": 0.106,
+      "Wind": 0.1071
     },
     "2022": {
-      "Bioenergy": 0.0196,
-      "Hydro": 0.7976,
-      "Solar": 0.1083,
-      "Wind": 0.0745
+      "Bioenergy": 0.0187,
+      "Hydro": 0.7681,
+      "Solar": 0.106,
+      "Wind": 0.1071
     },
     "2023": {
-      "Bioenergy": 0.0196,
-      "Hydro": 0.7976,
-      "Solar": 0.1083,
-      "Wind": 0.0745
+      "Bioenergy": 0.0187,
+      "Hydro": 0.7681,
+      "Solar": 0.106,
+      "Wind": 0.1071
     },
     "2024": {
-      "Bioenergy": 0.0196,
-      "Hydro": 0.7976,
-      "Solar": 0.1083,
-      "Wind": 0.0745
+      "Bioenergy": 0.0187,
+      "Hydro": 0.7681,
+      "Solar": 0.106,
+      "Wind": 0.1071
     }
   },
   "BM": {
@@ -914,14 +914,14 @@
   "BR": {
     "2019": {
       "Bioenergy": 0.0196,
-      "Hydro": 0.8551,
-      "Solar": 0.0138,
-      "Wind": 0.1116
+      "Hydro": 0.855,
+      "Solar": 0.0139,
+      "Wind": 0.1115
     },
     "2020": {
       "Bioenergy": 0.0209,
-      "Hydro": 0.8443,
-      "Solar": 0.0222,
+      "Hydro": 0.8441,
+      "Solar": 0.0224,
       "Wind": 0.1125
     },
     "2021": {
@@ -931,22 +931,22 @@
       "Wind": 0.1516
     },
     "2022": {
-      "Bioenergy": 0.0144,
-      "Hydro": 0.7935,
-      "Solar": 0.048,
-      "Wind": 0.1441
+      "Bioenergy": 0.0143,
+      "Hydro": 0.7882,
+      "Solar": 0.0542,
+      "Wind": 0.1432
     },
     "2023": {
-      "Bioenergy": 0.015,
-      "Hydro": 0.7432,
-      "Solar": 0.0843,
-      "Wind": 0.1575
+      "Bioenergy": 0.0149,
+      "Hydro": 0.7412,
+      "Solar": 0.0867,
+      "Wind": 0.1571
     },
     "2024": {
-      "Bioenergy": 0.0056,
-      "Hydro": 0.7831,
-      "Solar": 0.1083,
-      "Wind": 0.103
+      "Bioenergy": 0.0057,
+      "Hydro": 0.7779,
+      "Solar": 0.1062,
+      "Wind": 0.1101
     }
   },
   "BS": {
@@ -1027,40 +1027,40 @@
   },
   "BW": {
     "2019": {
-      "Bioenergy": 0.0199,
-      "Hydro": 0.8108,
-      "Solar": 0.0936,
-      "Wind": 0.0757
+      "Bioenergy": 0.019,
+      "Hydro": 0.7809,
+      "Solar": 0.0912,
+      "Wind": 0.1089
     },
     "2020": {
-      "Bioenergy": 0.0199,
-      "Hydro": 0.8108,
-      "Solar": 0.0936,
-      "Wind": 0.0757
+      "Bioenergy": 0.019,
+      "Hydro": 0.7809,
+      "Solar": 0.0912,
+      "Wind": 0.1089
     },
     "2021": {
-      "Bioenergy": 0.0199,
-      "Hydro": 0.8108,
-      "Solar": 0.0936,
-      "Wind": 0.0757
+      "Bioenergy": 0.019,
+      "Hydro": 0.7809,
+      "Solar": 0.0912,
+      "Wind": 0.1089
     },
     "2022": {
-      "Bioenergy": 0.0199,
-      "Hydro": 0.8108,
-      "Solar": 0.0936,
-      "Wind": 0.0757
+      "Bioenergy": 0.019,
+      "Hydro": 0.7809,
+      "Solar": 0.0912,
+      "Wind": 0.1089
     },
     "2023": {
-      "Bioenergy": 0.0199,
-      "Hydro": 0.8108,
-      "Solar": 0.0936,
-      "Wind": 0.0757
+      "Bioenergy": 0.019,
+      "Hydro": 0.7809,
+      "Solar": 0.0912,
+      "Wind": 0.1089
     },
     "2024": {
-      "Bioenergy": 0.0199,
-      "Hydro": 0.8108,
-      "Solar": 0.0936,
-      "Wind": 0.0757
+      "Bioenergy": 0.019,
+      "Hydro": 0.7809,
+      "Solar": 0.0912,
+      "Wind": 0.1089
     }
   },
   "BY": {
@@ -1110,8 +1110,8 @@
     },
     "2020": {
       "Bioenergy": 0.2365,
-      "Hydro": 0.6984,
-      "Solar": 0.0283,
+      "Hydro": 0.6983,
+      "Solar": 0.0284,
       "Wind": 0.0368
     },
     "2021": {
@@ -1121,22 +1121,22 @@
       "Wind": 0.0436
     },
     "2022": {
-      "Bioenergy": 0.2314,
-      "Hydro": 0.6874,
-      "Solar": 0.0363,
-      "Wind": 0.0449
+      "Bioenergy": 0.2313,
+      "Hydro": 0.6863,
+      "Solar": 0.0377,
+      "Wind": 0.0447
     },
     "2023": {
-      "Bioenergy": 0.2305,
-      "Hydro": 0.6765,
-      "Solar": 0.0448,
-      "Wind": 0.0482
+      "Bioenergy": 0.2307,
+      "Hydro": 0.6757,
+      "Solar": 0.0455,
+      "Wind": 0.048
     },
     "2024": {
-      "Bioenergy": 0.2262,
-      "Hydro": 0.6736,
-      "Solar": 0.0511,
-      "Wind": 0.0491
+      "Bioenergy": 0.2269,
+      "Hydro": 0.6831,
+      "Solar": 0.0512,
+      "Wind": 0.0388
     }
   },
   "CA": {
@@ -1166,53 +1166,53 @@
     },
     "2023": {
       "Bioenergy": 0.0246,
-      "Hydro": 0.867,
-      "Solar": 0.0115,
-      "Wind": 0.097
+      "Hydro": 0.8681,
+      "Solar": 0.0112,
+      "Wind": 0.0961
     },
     "2024": {
-      "Bioenergy": 0.026,
-      "Hydro": 0.8364,
-      "Solar": 0.0057,
-      "Wind": 0.1319
+      "Bioenergy": 0.0258,
+      "Hydro": 0.8503,
+      "Solar": 0.0037,
+      "Wind": 0.1202
     }
   },
   "CD": {
     "2019": {
-      "Bioenergy": 0.0001,
-      "Hydro": 0.9987,
+      "Bioenergy": 0,
+      "Hydro": 0.9986,
       "Solar": 0.0011,
-      "Wind": 0.0002
+      "Wind": 0.0003
     },
     "2020": {
-      "Bioenergy": 0.0001,
-      "Hydro": 0.9987,
+      "Bioenergy": 0,
+      "Hydro": 0.9986,
       "Solar": 0.0011,
-      "Wind": 0.0002
+      "Wind": 0.0003
     },
     "2021": {
-      "Bioenergy": 0.0001,
-      "Hydro": 0.9987,
+      "Bioenergy": 0,
+      "Hydro": 0.9986,
       "Solar": 0.0011,
-      "Wind": 0.0002
+      "Wind": 0.0003
     },
     "2022": {
-      "Bioenergy": 0.0001,
-      "Hydro": 0.9987,
+      "Bioenergy": 0,
+      "Hydro": 0.9986,
       "Solar": 0.0011,
-      "Wind": 0.0002
+      "Wind": 0.0003
     },
     "2023": {
-      "Bioenergy": 0.0001,
-      "Hydro": 0.9987,
+      "Bioenergy": 0,
+      "Hydro": 0.9986,
       "Solar": 0.0011,
-      "Wind": 0.0002
+      "Wind": 0.0003
     },
     "2024": {
-      "Bioenergy": 0.0001,
-      "Hydro": 0.9987,
+      "Bioenergy": 0,
+      "Hydro": 0.9986,
       "Solar": 0.0011,
-      "Wind": 0.0002
+      "Wind": 0.0003
     }
   },
   "CF": {
@@ -1300,33 +1300,33 @@
     },
     "2020": {
       "Bioenergy": 0.0018,
-      "Hydro": 0.9402,
-      "Solar": 0.0471,
+      "Hydro": 0.9396,
+      "Solar": 0.0477,
       "Wind": 0.011
     },
     "2021": {
-      "Bioenergy": 0.0052,
-      "Hydro": 0.923,
-      "Solar": 0.0502,
-      "Wind": 0.0216
+      "Bioenergy": 0.0051,
+      "Hydro": 0.9116,
+      "Solar": 0.0616,
+      "Wind": 0.0217
     },
     "2022": {
-      "Bioenergy": 0.0052,
+      "Bioenergy": 0.0051,
       "Hydro": 0.8856,
       "Solar": 0.0833,
       "Wind": 0.0259
     },
     "2023": {
-      "Bioenergy": 0.0017,
+      "Bioenergy": 0.0016,
       "Hydro": 0.9023,
       "Solar": 0.085,
       "Wind": 0.011
     },
     "2024": {
-      "Bioenergy": 0.0001,
-      "Hydro": 0.9626,
-      "Solar": 0.0345,
-      "Wind": 0.0028
+      "Bioenergy": 0.0002,
+      "Hydro": 0.9521,
+      "Solar": 0.044,
+      "Wind": 0.0037
     }
   },
   "CI": {
@@ -1437,10 +1437,10 @@
       "Wind": 0.1891
     },
     "2024": {
-      "Bioenergy": 0.0332,
-      "Hydro": 0.4538,
-      "Solar": 0.3487,
-      "Wind": 0.1643
+      "Bioenergy": 0.0384,
+      "Hydro": 0.4434,
+      "Solar": 0.3596,
+      "Wind": 0.1586
     }
   },
   "CM": {
@@ -1547,14 +1547,14 @@
     "2023": {
       "Bioenergy": 0,
       "Hydro": 0.9767,
-      "Solar": 0.0197,
+      "Solar": 0.0198,
       "Wind": 0.0036
     },
     "2024": {
       "Bioenergy": 0,
-      "Hydro": 0.9477,
-      "Solar": 0.0481,
-      "Wind": 0.0042
+      "Hydro": 0.9487,
+      "Solar": 0.048,
+      "Wind": 0.0033
     }
   },
   "CR": {
@@ -1585,14 +1585,14 @@
     "2023": {
       "Bioenergy": 0.0053,
       "Hydro": 0.8433,
-      "Solar": 0.0021,
+      "Solar": 0.0022,
       "Wind": 0.1492
     },
     "2024": {
-      "Bioenergy": 0.0137,
-      "Hydro": 0.7266,
-      "Solar": 0.0046,
-      "Wind": 0.2551
+      "Bioenergy": 0.0139,
+      "Hydro": 0.734,
+      "Solar": 0.0047,
+      "Wind": 0.2474
     }
   },
   "CU": {
@@ -1741,10 +1741,10 @@
       "Wind": 0.0905
     },
     "2024": {
-      "Bioenergy": 0.241,
-      "Hydro": 0.4943,
-      "Solar": 0.1443,
-      "Wind": 0.1205
+      "Bioenergy": 0.2569,
+      "Hydro": 0.4456,
+      "Solar": 0.1759,
+      "Wind": 0.1216
     }
   },
   "DE": {
@@ -1779,61 +1779,61 @@
       "Wind": 0.5154
     },
     "2024": {
-      "Bioenergy": 0.1513,
-      "Hydro": 0.0734,
-      "Solar": 0.0666,
-      "Wind": 0.7087
+      "Bioenergy": 0.1505,
+      "Hydro": 0.0716,
+      "Solar": 0.0847,
+      "Wind": 0.6931
     }
   },
   "DJ": {
     "2019": {
-      "Bioenergy": 0.0205,
-      "Hydro": 0.8342,
-      "Solar": 0.0674,
-      "Wind": 0.0779
+      "Bioenergy": 0.0196,
+      "Hydro": 0.8035,
+      "Solar": 0.0648,
+      "Wind": 0.1121
     },
     "2020": {
-      "Bioenergy": 0.0205,
-      "Hydro": 0.8342,
-      "Solar": 0.0674,
-      "Wind": 0.0779
+      "Bioenergy": 0.0196,
+      "Hydro": 0.8035,
+      "Solar": 0.0648,
+      "Wind": 0.1121
     },
     "2021": {
-      "Bioenergy": 0.0205,
-      "Hydro": 0.8342,
-      "Solar": 0.0674,
-      "Wind": 0.0779
+      "Bioenergy": 0.0196,
+      "Hydro": 0.8035,
+      "Solar": 0.0648,
+      "Wind": 0.1121
     },
     "2022": {
-      "Bioenergy": 0.0205,
-      "Hydro": 0.8342,
-      "Solar": 0.0674,
-      "Wind": 0.0779
+      "Bioenergy": 0.0196,
+      "Hydro": 0.8035,
+      "Solar": 0.0648,
+      "Wind": 0.1121
     },
     "2023": {
-      "Bioenergy": 0.0205,
-      "Hydro": 0.8342,
-      "Solar": 0.0674,
-      "Wind": 0.0779
+      "Bioenergy": 0.0196,
+      "Hydro": 0.8035,
+      "Solar": 0.0648,
+      "Wind": 0.1121
     },
     "2024": {
-      "Bioenergy": 0.0205,
-      "Hydro": 0.8342,
-      "Solar": 0.0674,
-      "Wind": 0.0779
+      "Bioenergy": 0.0196,
+      "Hydro": 0.8035,
+      "Solar": 0.0648,
+      "Wind": 0.1121
     }
   },
   "DK": {
     "2019": {
       "Bioenergy": 0.1705,
-      "Hydro": 0.0485,
+      "Hydro": 0.0484,
       "Solar": 0.0547,
       "Wind": 0.7263
     },
     "2020": {
       "Bioenergy": 0.1396,
-      "Hydro": 0.0599,
-      "Solar": 0.069,
+      "Hydro": 0.06,
+      "Solar": 0.0689,
       "Wind": 0.7315
     },
     "2021": {
@@ -1845,20 +1845,20 @@
     "2022": {
       "Bioenergy": 0.1599,
       "Hydro": 0.0183,
-      "Solar": 0.0905,
-      "Wind": 0.7313
+      "Solar": 0.0904,
+      "Wind": 0.7314
     },
     "2023": {
       "Bioenergy": 0.1389,
-      "Hydro": 0.0232,
+      "Hydro": 0.0233,
       "Solar": 0.1198,
       "Wind": 0.718
     },
     "2024": {
-      "Bioenergy": 0.1508,
+      "Bioenergy": 0.1604,
       "Hydro": 0,
-      "Solar": 0.0164,
-      "Wind": 0.8328
+      "Solar": 0.0238,
+      "Wind": 0.8158
     }
   },
   "DM": {
@@ -1996,21 +1996,21 @@
     },
     "2022": {
       "Bioenergy": 0.0151,
-      "Hydro": 0.9801,
-      "Solar": 0.0008,
+      "Hydro": 0.98,
+      "Solar": 0.0009,
       "Wind": 0.004
     },
     "2023": {
       "Bioenergy": 0.0135,
-      "Hydro": 0.9718,
-      "Solar": 0.0028,
+      "Hydro": 0.9717,
+      "Solar": 0.0029,
       "Wind": 0.0119
     },
     "2024": {
-      "Bioenergy": 0.0255,
-      "Hydro": 0.9588,
-      "Solar": 0.0046,
-      "Wind": 0.0111
+      "Bioenergy": 0.0254,
+      "Hydro": 0.9603,
+      "Solar": 0.0045,
+      "Wind": 0.0098
     }
   },
   "EE": {
@@ -2021,34 +2021,34 @@
       "Wind": 0.4512
     },
     "2020": {
-      "Bioenergy": 0.235,
-      "Hydro": 0.2299,
-      "Solar": 0.0869,
-      "Wind": 0.4482
+      "Bioenergy": 0.2351,
+      "Hydro": 0.23,
+      "Solar": 0.0865,
+      "Wind": 0.4484
     },
     "2021": {
-      "Bioenergy": 0.2229,
-      "Hydro": 0.1846,
-      "Solar": 0.1675,
+      "Bioenergy": 0.2228,
+      "Hydro": 0.1845,
+      "Solar": 0.1676,
       "Wind": 0.425
     },
     "2022": {
-      "Bioenergy": 0.3282,
-      "Hydro": 0.0687,
-      "Solar": 0.2526,
-      "Wind": 0.3505
+      "Bioenergy": 0.3281,
+      "Hydro": 0.0688,
+      "Solar": 0.2525,
+      "Wind": 0.3506
     },
     "2023": {
-      "Bioenergy": 0.1794,
-      "Hydro": 0.1688,
-      "Solar": 0.2787,
-      "Wind": 0.3731
+      "Bioenergy": 0.1797,
+      "Hydro": 0.1694,
+      "Solar": 0.2765,
+      "Wind": 0.3743
     },
     "2024": {
-      "Bioenergy": 0.225,
-      "Hydro": 0.1905,
-      "Solar": 0.0238,
-      "Wind": 0.5607
+      "Bioenergy": 0.2151,
+      "Hydro": 0.2028,
+      "Solar": 0.0497,
+      "Wind": 0.5324
     }
   },
   "EG": {
@@ -2091,40 +2091,40 @@
   },
   "EH": {
     "2019": {
-      "Bioenergy": 0.0205,
-      "Hydro": 0.8342,
-      "Solar": 0.0674,
-      "Wind": 0.0779
+      "Bioenergy": 0.0196,
+      "Hydro": 0.8035,
+      "Solar": 0.0648,
+      "Wind": 0.1121
     },
     "2020": {
-      "Bioenergy": 0.0205,
-      "Hydro": 0.8342,
-      "Solar": 0.0674,
-      "Wind": 0.0779
+      "Bioenergy": 0.0196,
+      "Hydro": 0.8035,
+      "Solar": 0.0648,
+      "Wind": 0.1121
     },
     "2021": {
-      "Bioenergy": 0.0205,
-      "Hydro": 0.8342,
-      "Solar": 0.0674,
-      "Wind": 0.0779
+      "Bioenergy": 0.0196,
+      "Hydro": 0.8035,
+      "Solar": 0.0648,
+      "Wind": 0.1121
     },
     "2022": {
-      "Bioenergy": 0.0205,
-      "Hydro": 0.8342,
-      "Solar": 0.0674,
-      "Wind": 0.0779
+      "Bioenergy": 0.0196,
+      "Hydro": 0.8035,
+      "Solar": 0.0648,
+      "Wind": 0.1121
     },
     "2023": {
-      "Bioenergy": 0.0205,
-      "Hydro": 0.8342,
-      "Solar": 0.0674,
-      "Wind": 0.0779
+      "Bioenergy": 0.0196,
+      "Hydro": 0.8035,
+      "Solar": 0.0648,
+      "Wind": 0.1121
     },
     "2024": {
-      "Bioenergy": 0.0205,
-      "Hydro": 0.8342,
-      "Solar": 0.0674,
-      "Wind": 0.0779
+      "Bioenergy": 0.0196,
+      "Hydro": 0.8035,
+      "Solar": 0.0648,
+      "Wind": 0.1121
     }
   },
   "ER": {
@@ -2197,10 +2197,10 @@
       "Wind": 0.474
     },
     "2024": {
-      "Bioenergy": 0.0226,
-      "Hydro": 0.3171,
-      "Solar": 0.1682,
-      "Wind": 0.4921
+      "Bioenergy": 0.0205,
+      "Hydro": 0.272,
+      "Solar": 0.1903,
+      "Wind": 0.5173
     }
   },
   "ET": {
@@ -2243,28 +2243,28 @@
   },
   "FI": {
     "2019": {
-      "Bioenergy": 0.3439,
+      "Bioenergy": 0.344,
       "Hydro": 0.4282,
       "Solar": 0.0211,
       "Wind": 0.2067
     },
     "2020": {
-      "Bioenergy": 0.2665,
-      "Hydro": 0.4796,
-      "Solar": 0.023,
-      "Wind": 0.2308
+      "Bioenergy": 0.2666,
+      "Hydro": 0.4797,
+      "Solar": 0.0229,
+      "Wind": 0.2309
     },
     "2021": {
-      "Bioenergy": 0.2956,
+      "Bioenergy": 0.2955,
       "Hydro": 0.4455,
-      "Solar": 0.0256,
+      "Solar": 0.0257,
       "Wind": 0.2333
     },
     "2022": {
-      "Bioenergy": 0.3013,
+      "Bioenergy": 0.3012,
       "Hydro": 0.3708,
-      "Solar": 0.0237,
-      "Wind": 0.3043
+      "Solar": 0.0236,
+      "Wind": 0.3044
     },
     "2023": {
       "Bioenergy": 0.2555,
@@ -2273,10 +2273,10 @@
       "Wind": 0.3513
     },
     "2024": {
-      "Bioenergy": 0.2124,
-      "Hydro": 0.3343,
-      "Solar": 0.0049,
-      "Wind": 0.4484
+      "Bioenergy": 0.2255,
+      "Hydro": 0.3309,
+      "Solar": 0.005,
+      "Wind": 0.4386
     }
   },
   "FJ": {
@@ -2402,9 +2402,9 @@
     },
     "2020": {
       "Bioenergy": 0.0262,
-      "Hydro": 0.522,
+      "Hydro": 0.5221,
       "Solar": 0.111,
-      "Wind": 0.3407
+      "Wind": 0.3408
     },
     "2021": {
       "Bioenergy": 0.0293,
@@ -2413,60 +2413,60 @@
       "Wind": 0.3296
     },
     "2022": {
-      "Bioenergy": 0.0381,
-      "Hydro": 0.4254,
+      "Bioenergy": 0.038,
+      "Hydro": 0.4255,
       "Solar": 0.1768,
       "Wind": 0.3597
     },
     "2023": {
       "Bioenergy": 0.0263,
       "Hydro": 0.4093,
-      "Solar": 0.1722,
+      "Solar": 0.1721,
       "Wind": 0.3923
     },
     "2024": {
-      "Bioenergy": 0.019,
-      "Hydro": 0.5097,
-      "Solar": 0.07,
-      "Wind": 0.4013
+      "Bioenergy": 0.0194,
+      "Hydro": 0.4766,
+      "Solar": 0.0785,
+      "Wind": 0.4255
     }
   },
   "GA": {
     "2019": {
-      "Bioenergy": 0.0198,
-      "Hydro": 0.9669,
-      "Solar": 0.0062,
-      "Wind": 0.0072
+      "Bioenergy": 0.0197,
+      "Hydro": 0.9642,
+      "Solar": 0.0059,
+      "Wind": 0.0102
     },
     "2020": {
-      "Bioenergy": 0.0198,
-      "Hydro": 0.9669,
-      "Solar": 0.0062,
-      "Wind": 0.0072
+      "Bioenergy": 0.0197,
+      "Hydro": 0.9642,
+      "Solar": 0.0059,
+      "Wind": 0.0102
     },
     "2021": {
-      "Bioenergy": 0.0198,
-      "Hydro": 0.9669,
-      "Solar": 0.0062,
-      "Wind": 0.0072
+      "Bioenergy": 0.0197,
+      "Hydro": 0.9642,
+      "Solar": 0.0059,
+      "Wind": 0.0102
     },
     "2022": {
-      "Bioenergy": 0.0198,
-      "Hydro": 0.9669,
-      "Solar": 0.0062,
-      "Wind": 0.0072
+      "Bioenergy": 0.0197,
+      "Hydro": 0.9642,
+      "Solar": 0.0059,
+      "Wind": 0.0102
     },
     "2023": {
-      "Bioenergy": 0.0198,
-      "Hydro": 0.9669,
-      "Solar": 0.0062,
-      "Wind": 0.0072
+      "Bioenergy": 0.0197,
+      "Hydro": 0.9642,
+      "Solar": 0.0059,
+      "Wind": 0.0102
     },
     "2024": {
-      "Bioenergy": 0.0198,
-      "Hydro": 0.9669,
-      "Solar": 0.0062,
-      "Wind": 0.0072
+      "Bioenergy": 0.0197,
+      "Hydro": 0.9642,
+      "Solar": 0.0059,
+      "Wind": 0.0102
     }
   },
   "GB": {
@@ -2480,12 +2480,12 @@
       "Bioenergy": 0.1638,
       "Hydro": 0.0676,
       "Solar": 0.1124,
-      "Wind": 0.6561
+      "Wind": 0.6562
     },
     "2021": {
-      "Bioenergy": 0.1902,
+      "Bioenergy": 0.1901,
       "Hydro": 0.0725,
-      "Solar": 0.1181,
+      "Solar": 0.1182,
       "Wind": 0.6192
     },
     "2022": {
@@ -2495,16 +2495,16 @@
       "Wind": 0.7079
     },
     "2023": {
-      "Bioenergy": 0.1201,
+      "Bioenergy": 0.12,
       "Hydro": 0.0625,
       "Solar": 0.1166,
       "Wind": 0.7008
     },
     "2024": {
-      "Bioenergy": 0.1405,
-      "Hydro": 0.0617,
-      "Solar": 0.0376,
-      "Wind": 0.7601
+      "Bioenergy": 0.1391,
+      "Hydro": 0.0735,
+      "Solar": 0.0441,
+      "Wind": 0.7432
     }
   },
   "GD": {
@@ -2577,10 +2577,10 @@
       "Wind": 0.0172
     },
     "2024": {
-      "Bioenergy": 0.0042,
-      "Hydro": 0.9588,
-      "Solar": 0.0097,
-      "Wind": 0.0273
+      "Bioenergy": 0.0044,
+      "Hydro": 0.9584,
+      "Solar": 0.011,
+      "Wind": 0.0262
     }
   },
   "GF": {
@@ -2661,40 +2661,40 @@
   },
   "GI": {
     "2019": {
-      "Bioenergy": 0.124,
-      "Hydro": 0.5002,
-      "Solar": 0.0931,
-      "Wind": 0.2827
+      "Bioenergy": 0.1241,
+      "Hydro": 0.4998,
+      "Solar": 0.0935,
+      "Wind": 0.2826
     },
     "2020": {
-      "Bioenergy": 0.124,
-      "Hydro": 0.5002,
-      "Solar": 0.0931,
-      "Wind": 0.2827
+      "Bioenergy": 0.1241,
+      "Hydro": 0.4998,
+      "Solar": 0.0935,
+      "Wind": 0.2826
     },
     "2021": {
-      "Bioenergy": 0.124,
-      "Hydro": 0.5002,
-      "Solar": 0.0931,
-      "Wind": 0.2827
+      "Bioenergy": 0.1241,
+      "Hydro": 0.4998,
+      "Solar": 0.0935,
+      "Wind": 0.2826
     },
     "2022": {
-      "Bioenergy": 0.124,
-      "Hydro": 0.5002,
-      "Solar": 0.0931,
-      "Wind": 0.2827
+      "Bioenergy": 0.1241,
+      "Hydro": 0.4998,
+      "Solar": 0.0935,
+      "Wind": 0.2826
     },
     "2023": {
-      "Bioenergy": 0.124,
-      "Hydro": 0.5002,
-      "Solar": 0.0931,
-      "Wind": 0.2827
+      "Bioenergy": 0.1241,
+      "Hydro": 0.4998,
+      "Solar": 0.0935,
+      "Wind": 0.2826
     },
     "2024": {
-      "Bioenergy": 0.124,
-      "Hydro": 0.5002,
-      "Solar": 0.0931,
-      "Wind": 0.2827
+      "Bioenergy": 0.1241,
+      "Hydro": 0.4998,
+      "Solar": 0.0935,
+      "Wind": 0.2826
     }
   },
   "GL": {
@@ -2897,8 +2897,8 @@
     "2020": {
       "Bioenergy": 0.0152,
       "Hydro": 0.2391,
-      "Solar": 0.2537,
-      "Wind": 0.4921
+      "Solar": 0.2535,
+      "Wind": 0.4922
     },
     "2021": {
       "Bioenergy": 0.0062,
@@ -2914,15 +2914,15 @@
     },
     "2023": {
       "Bioenergy": 0.0064,
-      "Hydro": 0.1885,
-      "Solar": 0.3591,
-      "Wind": 0.4459
+      "Hydro": 0.1881,
+      "Solar": 0.3606,
+      "Wind": 0.445
     },
     "2024": {
-      "Bioenergy": 0.002,
-      "Hydro": 0.1485,
-      "Solar": 0.2232,
-      "Wind": 0.6264
+      "Bioenergy": 0.0035,
+      "Hydro": 0.1472,
+      "Solar": 0.2758,
+      "Wind": 0.5735
     }
   },
   "GT": {
@@ -3103,16 +3103,16 @@
       "Wind": 0.2317
     },
     "2023": {
-      "Bioenergy": 0.1093,
-      "Hydro": 0.4138,
-      "Solar": 0.2284,
+      "Bioenergy": 0.1091,
+      "Hydro": 0.4137,
+      "Solar": 0.2287,
       "Wind": 0.2485
     },
     "2024": {
-      "Bioenergy": 0.1309,
-      "Hydro": 0.3528,
-      "Solar": 0.2109,
-      "Wind": 0.3054
+      "Bioenergy": 0.1359,
+      "Hydro": 0.3381,
+      "Solar": 0.2414,
+      "Wind": 0.2845
     }
   },
   "HN": {
@@ -3155,40 +3155,40 @@
   },
   "HR": {
     "2019": {
-      "Bioenergy": 0.0651,
+      "Bioenergy": 0.065,
       "Hydro": 0.6848,
       "Solar": 0.033,
       "Wind": 0.2171
     },
     "2020": {
       "Bioenergy": 0.0708,
-      "Hydro": 0.6454,
-      "Solar": 0.0341,
-      "Wind": 0.2497
+      "Hydro": 0.6455,
+      "Solar": 0.0339,
+      "Wind": 0.2498
     },
     "2021": {
       "Bioenergy": 0.0687,
       "Hydro": 0.6666,
-      "Solar": 0.0294,
+      "Solar": 0.0295,
       "Wind": 0.2353
     },
     "2022": {
-      "Bioenergy": 0.0856,
-      "Hydro": 0.567,
-      "Solar": 0.0415,
-      "Wind": 0.3059
+      "Bioenergy": 0.0854,
+      "Hydro": 0.5672,
+      "Solar": 0.0414,
+      "Wind": 0.306
     },
     "2023": {
-      "Bioenergy": 0.0612,
+      "Bioenergy": 0.0611,
       "Hydro": 0.6566,
       "Solar": 0.0269,
       "Wind": 0.2554
     },
     "2024": {
-      "Bioenergy": 0.0598,
-      "Hydro": 0.6317,
-      "Solar": 0.0138,
-      "Wind": 0.2947
+      "Bioenergy": 0.0617,
+      "Hydro": 0.6319,
+      "Solar": 0.0173,
+      "Wind": 0.2891
     }
   },
   "HT": {
@@ -3238,33 +3238,33 @@
     },
     "2020": {
       "Bioenergy": 0.1622,
-      "Hydro": 0.2796,
-      "Solar": 0.3317,
-      "Wind": 0.2265
+      "Hydro": 0.2797,
+      "Solar": 0.3314,
+      "Wind": 0.2266
     },
     "2021": {
-      "Bioenergy": 0.1498,
+      "Bioenergy": 0.1496,
       "Hydro": 0.2344,
-      "Solar": 0.4218,
-      "Wind": 0.1939
+      "Solar": 0.422,
+      "Wind": 0.194
     },
     "2022": {
-      "Bioenergy": 0.1409,
-      "Hydro": 0.1893,
-      "Solar": 0.4822,
-      "Wind": 0.1876
+      "Bioenergy": 0.1405,
+      "Hydro": 0.1895,
+      "Solar": 0.4823,
+      "Wind": 0.1877
     },
     "2023": {
-      "Bioenergy": 0.0866,
-      "Hydro": 0.1716,
-      "Solar": 0.5712,
-      "Wind": 0.1706
+      "Bioenergy": 0.0863,
+      "Hydro": 0.1714,
+      "Solar": 0.572,
+      "Wind": 0.1703
     },
     "2024": {
-      "Bioenergy": 0.1353,
-      "Hydro": 0.2722,
-      "Solar": 0.2756,
-      "Wind": 0.3168
+      "Bioenergy": 0.1139,
+      "Hydro": 0.2286,
+      "Solar": 0.3903,
+      "Wind": 0.2672
     }
   },
   "ID": {
@@ -3299,10 +3299,10 @@
       "Wind": 0.0171
     },
     "2024": {
-      "Bioenergy": 0.3558,
-      "Hydro": 0.6208,
-      "Solar": 0.0059,
-      "Wind": 0.0175
+      "Bioenergy": 0.3559,
+      "Hydro": 0.6206,
+      "Solar": 0.0063,
+      "Wind": 0.0172
     }
   },
   "IE": {
@@ -3337,10 +3337,10 @@
       "Wind": 0.8336
     },
     "2024": {
-      "Bioenergy": 0.0129,
-      "Hydro": 0.1231,
-      "Solar": 0.0189,
-      "Wind": 0.845
+      "Bioenergy": 0.013,
+      "Hydro": 0.1228,
+      "Solar": 0.0203,
+      "Wind": 0.8439
     }
   },
   "IL": {
@@ -3413,10 +3413,10 @@
       "Wind": 0.2286
     },
     "2024": {
-      "Bioenergy": 0.0988,
-      "Hydro": 0.2977,
-      "Solar": 0.3784,
-      "Wind": 0.2251
+      "Bioenergy": 0.1025,
+      "Hydro": 0.3082,
+      "Solar": 0.4056,
+      "Wind": 0.1836
     }
   },
   "IQ": {
@@ -3485,13 +3485,13 @@
     "2023": {
       "Bioenergy": 0,
       "Hydro": 0.9999,
-      "Solar": 0.0001,
+      "Solar": 0,
       "Wind": 0
     },
     "2024": {
       "Bioenergy": 0,
-      "Hydro": 0.9998,
-      "Solar": 0.0001,
+      "Hydro": 1,
+      "Solar": 0,
       "Wind": 0
     }
   },
@@ -3541,34 +3541,34 @@
       "Wind": 0.2025
     },
     "2020": {
-      "Bioenergy": 0.1618,
-      "Hydro": 0.4216,
-      "Solar": 0.2266,
-      "Wind": 0.1901
+      "Bioenergy": 0.1634,
+      "Hydro": 0.425,
+      "Solar": 0.22,
+      "Wind": 0.1917
     },
     "2021": {
-      "Bioenergy": 0.1632,
-      "Hydro": 0.4038,
-      "Solar": 0.2243,
-      "Wind": 0.2087
+      "Bioenergy": 0.1584,
+      "Hydro": 0.4079,
+      "Solar": 0.2229,
+      "Wind": 0.2108
     },
     "2022": {
-      "Bioenergy": 0.1766,
-      "Hydro": 0.3094,
-      "Solar": 0.2807,
-      "Wind": 0.2334
+      "Bioenergy": 0.165,
+      "Hydro": 0.3141,
+      "Solar": 0.2841,
+      "Wind": 0.2369
     },
     "2023": {
-      "Bioenergy": 0.1385,
-      "Hydro": 0.3565,
-      "Solar": 0.2655,
-      "Wind": 0.2395
+      "Bioenergy": 0.1325,
+      "Hydro": 0.3583,
+      "Solar": 0.269,
+      "Wind": 0.2402
     },
     "2024": {
-      "Bioenergy": 0.1422,
-      "Hydro": 0.3586,
-      "Solar": 0.1444,
-      "Wind": 0.3548
+      "Bioenergy": 0.1408,
+      "Hydro": 0.3537,
+      "Solar": 0.1659,
+      "Wind": 0.3397
     }
   },
   "JM": {
@@ -3673,54 +3673,54 @@
       "Wind": 0.0694
     },
     "2023": {
-      "Bioenergy": 0.2118,
-      "Hydro": 0.2812,
-      "Solar": 0.4393,
-      "Wind": 0.0678
+      "Bioenergy": 0.2072,
+      "Hydro": 0.2794,
+      "Solar": 0.4446,
+      "Wind": 0.0688
     },
     "2024": {
-      "Bioenergy": 0.2706,
-      "Hydro": 0.2678,
-      "Solar": 0.3621,
-      "Wind": 0.0995
+      "Bioenergy": 0.2376,
+      "Hydro": 0.2556,
+      "Solar": 0.4013,
+      "Wind": 0.1055
     }
   },
   "KE": {
     "2019": {
       "Bioenergy": 0.0279,
-      "Hydro": 0.6396,
+      "Hydro": 0.6393,
       "Solar": 0.0243,
-      "Wind": 0.3082
+      "Wind": 0.3085
     },
     "2020": {
       "Bioenergy": 0.0189,
-      "Hydro": 0.7307,
+      "Hydro": 0.7306,
       "Solar": 0.0208,
-      "Wind": 0.2296
+      "Wind": 0.2298
     },
     "2021": {
       "Bioenergy": 0.0282,
-      "Hydro": 0.6144,
+      "Hydro": 0.6141,
       "Solar": 0.0303,
-      "Wind": 0.3271
+      "Wind": 0.3274
     },
     "2022": {
-      "Bioenergy": 0.038,
-      "Hydro": 0.5265,
-      "Solar": 0.0659,
-      "Wind": 0.3697
+      "Bioenergy": 0.0379,
+      "Hydro": 0.5262,
+      "Solar": 0.0658,
+      "Wind": 0.37
     },
     "2023": {
-      "Bioenergy": 0.0309,
-      "Hydro": 0.5062,
-      "Solar": 0.0894,
-      "Wind": 0.3734
+      "Bioenergy": 0.0314,
+      "Hydro": 0.5105,
+      "Solar": 0.0907,
+      "Wind": 0.3674
     },
     "2024": {
-      "Bioenergy": 0.0199,
-      "Hydro": 0.5871,
-      "Solar": 0.0796,
-      "Wind": 0.3134
+      "Bioenergy": 0.0241,
+      "Hydro": 0.6672,
+      "Solar": 0.0955,
+      "Wind": 0.2132
     }
   },
   "KG": {
@@ -3789,14 +3789,14 @@
     "2023": {
       "Bioenergy": 0.0791,
       "Hydro": 0.823,
-      "Solar": 0.0581,
-      "Wind": 0.0397
+      "Solar": 0.0582,
+      "Wind": 0.0398
     },
     "2024": {
-      "Bioenergy": 0.0817,
-      "Hydro": 0.8212,
-      "Solar": 0.0526,
-      "Wind": 0.0444
+      "Bioenergy": 0.0824,
+      "Hydro": 0.8198,
+      "Solar": 0.0568,
+      "Wind": 0.041
     }
   },
   "KI": {
@@ -4295,230 +4295,230 @@
   },
   "LS": {
     "2019": {
-      "Bioenergy": 0.0036,
-      "Hydro": 0.9705,
-      "Solar": 0.012,
-      "Wind": 0.0139
+      "Bioenergy": 0.0035,
+      "Hydro": 0.9652,
+      "Solar": 0.0115,
+      "Wind": 0.0198
     },
     "2020": {
-      "Bioenergy": 0.0036,
-      "Hydro": 0.9705,
-      "Solar": 0.012,
-      "Wind": 0.0139
+      "Bioenergy": 0.0035,
+      "Hydro": 0.9652,
+      "Solar": 0.0115,
+      "Wind": 0.0198
     },
     "2021": {
-      "Bioenergy": 0.0036,
-      "Hydro": 0.9705,
-      "Solar": 0.012,
-      "Wind": 0.0139
+      "Bioenergy": 0.0035,
+      "Hydro": 0.9652,
+      "Solar": 0.0115,
+      "Wind": 0.0198
     },
     "2022": {
-      "Bioenergy": 0.0036,
-      "Hydro": 0.9705,
-      "Solar": 0.012,
-      "Wind": 0.0139
+      "Bioenergy": 0.0035,
+      "Hydro": 0.9652,
+      "Solar": 0.0115,
+      "Wind": 0.0198
     },
     "2023": {
-      "Bioenergy": 0.0036,
-      "Hydro": 0.9705,
-      "Solar": 0.012,
-      "Wind": 0.0139
+      "Bioenergy": 0.0035,
+      "Hydro": 0.9652,
+      "Solar": 0.0115,
+      "Wind": 0.0198
     },
     "2024": {
-      "Bioenergy": 0.0036,
-      "Hydro": 0.9705,
-      "Solar": 0.012,
-      "Wind": 0.0139
+      "Bioenergy": 0.0035,
+      "Hydro": 0.9652,
+      "Solar": 0.0115,
+      "Wind": 0.0198
     }
   },
   "LT": {
     "2019": {
-      "Bioenergy": 0.1294,
+      "Bioenergy": 0.1293,
       "Hydro": 0.3681,
       "Solar": 0.0687,
       "Wind": 0.4338
     },
     "2020": {
-      "Bioenergy": 0.1267,
-      "Hydro": 0.3369,
-      "Solar": 0.0719,
-      "Wind": 0.4646
+      "Bioenergy": 0.1268,
+      "Hydro": 0.337,
+      "Solar": 0.0714,
+      "Wind": 0.4648
     },
     "2021": {
-      "Bioenergy": 0.1303,
-      "Hydro": 0.3628,
-      "Solar": 0.0889,
-      "Wind": 0.4181
+      "Bioenergy": 0.13,
+      "Hydro": 0.3627,
+      "Solar": 0.0891,
+      "Wind": 0.4182
     },
     "2022": {
-      "Bioenergy": 0.1127,
-      "Hydro": 0.3107,
-      "Solar": 0.1382,
-      "Wind": 0.4383
+      "Bioenergy": 0.1122,
+      "Hydro": 0.311,
+      "Solar": 0.1381,
+      "Wind": 0.4387
     },
     "2023": {
-      "Bioenergy": 0.0725,
-      "Hydro": 0.253,
+      "Bioenergy": 0.0723,
+      "Hydro": 0.2531,
       "Solar": 0.165,
-      "Wind": 0.5095
+      "Wind": 0.5096
     },
     "2024": {
-      "Bioenergy": 0.0538,
-      "Hydro": 0.2217,
-      "Solar": 0.0349,
-      "Wind": 0.6896
+      "Bioenergy": 0.056,
+      "Hydro": 0.2394,
+      "Solar": 0.0412,
+      "Wind": 0.6635
     }
   },
   "LU": {
     "2019": {
-      "Bioenergy": 0.149,
+      "Bioenergy": 0.1489,
       "Hydro": 0.3873,
       "Solar": 0.13,
       "Wind": 0.3337
     },
     "2020": {
-      "Bioenergy": 0.1645,
-      "Hydro": 0.3499,
-      "Solar": 0.1321,
-      "Wind": 0.3534
+      "Bioenergy": 0.1646,
+      "Hydro": 0.3502,
+      "Solar": 0.1316,
+      "Wind": 0.3536
     },
     "2021": {
-      "Bioenergy": 0.1848,
+      "Bioenergy": 0.1846,
       "Hydro": 0.3441,
-      "Solar": 0.1514,
-      "Wind": 0.3196
+      "Solar": 0.1516,
+      "Wind": 0.3197
     },
     "2022": {
-      "Bioenergy": 0.1876,
-      "Hydro": 0.2888,
-      "Solar": 0.1937,
-      "Wind": 0.3299
+      "Bioenergy": 0.1871,
+      "Hydro": 0.2892,
+      "Solar": 0.1936,
+      "Wind": 0.3302
     },
     "2023": {
-      "Bioenergy": 0.1146,
-      "Hydro": 0.2885,
-      "Solar": 0.1953,
-      "Wind": 0.4017
+      "Bioenergy": 0.1105,
+      "Hydro": 0.2898,
+      "Solar": 0.1962,
+      "Wind": 0.4035
     },
     "2024": {
-      "Bioenergy": 0.1316,
-      "Hydro": 0.3209,
-      "Solar": 0.0791,
-      "Wind": 0.4683
+      "Bioenergy": 0.1109,
+      "Hydro": 0.3091,
+      "Solar": 0.088,
+      "Wind": 0.4919
     }
   },
   "LV": {
     "2019": {
-      "Bioenergy": 0.1956,
+      "Bioenergy": 0.1957,
       "Hydro": 0.7133,
       "Solar": 0.0129,
       "Wind": 0.0781
     },
     "2020": {
       "Bioenergy": 0.1523,
-      "Hydro": 0.7499,
-      "Solar": 0.0187,
+      "Hydro": 0.75,
+      "Solar": 0.0185,
       "Wind": 0.0792
     },
     "2021": {
-      "Bioenergy": 0.1471,
+      "Bioenergy": 0.147,
       "Hydro": 0.7509,
       "Solar": 0.0236,
       "Wind": 0.0784
     },
     "2022": {
-      "Bioenergy": 0.1014,
-      "Hydro": 0.7547,
-      "Solar": 0.0349,
-      "Wind": 0.109
+      "Bioenergy": 0.1012,
+      "Hydro": 0.7549,
+      "Solar": 0.0348,
+      "Wind": 0.1091
     },
     "2023": {
-      "Bioenergy": 0.0603,
-      "Hydro": 0.7975,
-      "Solar": 0.0373,
-      "Wind": 0.105
+      "Bioenergy": 0.06,
+      "Hydro": 0.798,
+      "Solar": 0.0372,
+      "Wind": 0.1048
     },
     "2024": {
-      "Bioenergy": 0.0526,
-      "Hydro": 0.8684,
+      "Bioenergy": 0.0501,
+      "Hydro": 0.887,
       "Solar": 0,
-      "Wind": 0.0789
+      "Wind": 0.0629
     }
   },
   "LY": {
     "2019": {
-      "Bioenergy": 0.0193,
-      "Hydro": 0.7863,
-      "Solar": 0.121,
-      "Wind": 0.0734
+      "Bioenergy": 0.0185,
+      "Hydro": 0.7571,
+      "Solar": 0.1188,
+      "Wind": 0.1056
     },
     "2020": {
-      "Bioenergy": 0.0193,
-      "Hydro": 0.7863,
-      "Solar": 0.121,
-      "Wind": 0.0734
+      "Bioenergy": 0.0185,
+      "Hydro": 0.7571,
+      "Solar": 0.1188,
+      "Wind": 0.1056
     },
     "2021": {
-      "Bioenergy": 0.0193,
-      "Hydro": 0.7863,
-      "Solar": 0.121,
-      "Wind": 0.0734
+      "Bioenergy": 0.0185,
+      "Hydro": 0.7571,
+      "Solar": 0.1188,
+      "Wind": 0.1056
     },
     "2022": {
-      "Bioenergy": 0.0193,
-      "Hydro": 0.7863,
-      "Solar": 0.121,
-      "Wind": 0.0734
+      "Bioenergy": 0.0185,
+      "Hydro": 0.7571,
+      "Solar": 0.1188,
+      "Wind": 0.1056
     },
     "2023": {
-      "Bioenergy": 0.0193,
-      "Hydro": 0.7863,
-      "Solar": 0.121,
-      "Wind": 0.0734
+      "Bioenergy": 0.0185,
+      "Hydro": 0.7571,
+      "Solar": 0.1188,
+      "Wind": 0.1056
     },
     "2024": {
-      "Bioenergy": 0.0193,
-      "Hydro": 0.7863,
-      "Solar": 0.121,
-      "Wind": 0.0734
+      "Bioenergy": 0.0185,
+      "Hydro": 0.7571,
+      "Solar": 0.1188,
+      "Wind": 0.1056
     }
   },
   "MA": {
     "2019": {
       "Bioenergy": 0.0001,
-      "Hydro": 0.2127,
+      "Hydro": 0.2126,
       "Solar": 0.2025,
-      "Wind": 0.5847
+      "Wind": 0.5848
     },
     "2020": {
       "Bioenergy": 0.0002,
-      "Hydro": 0.1832,
+      "Hydro": 0.1829,
       "Solar": 0.2052,
-      "Wind": 0.6114
+      "Wind": 0.6118
     },
     "2021": {
       "Bioenergy": 0.0001,
-      "Hydro": 0.1502,
+      "Hydro": 0.1501,
       "Solar": 0.2216,
-      "Wind": 0.6281
+      "Wind": 0.6282
     },
     "2022": {
       "Bioenergy": 0.0008,
-      "Hydro": 0.1209,
-      "Solar": 0.1932,
-      "Wind": 0.6851
+      "Hydro": 0.1196,
+      "Solar": 0.1931,
+      "Wind": 0.6865
     },
     "2023": {
       "Bioenergy": 0.0008,
-      "Hydro": 0.0895,
-      "Solar": 0.2297,
-      "Wind": 0.68
+      "Hydro": 0.0881,
+      "Solar": 0.2296,
+      "Wind": 0.6815
     },
     "2024": {
       "Bioenergy": 0.0008,
-      "Hydro": 0.093,
+      "Hydro": 0.0916,
       "Solar": 0.204,
-      "Wind": 0.7021
+      "Wind": 0.7036
     }
   },
   "MD": {
@@ -4530,33 +4530,33 @@
     },
     "2020": {
       "Bioenergy": 0.0132,
-      "Hydro": 0.917,
-      "Solar": 0.0099,
+      "Hydro": 0.9171,
+      "Solar": 0.0098,
       "Wind": 0.0599
     },
     "2021": {
-      "Bioenergy": 0.0141,
+      "Bioenergy": 0.014,
       "Hydro": 0.9155,
-      "Solar": 0.0266,
+      "Solar": 0.0267,
       "Wind": 0.0438
     },
     "2022": {
-      "Bioenergy": 0.0475,
-      "Hydro": 0.6984,
-      "Solar": 0.0758,
-      "Wind": 0.1783
+      "Bioenergy": 0.0471,
+      "Hydro": 0.6988,
+      "Solar": 0.0757,
+      "Wind": 0.1784
     },
     "2023": {
       "Bioenergy": 0.0113,
       "Hydro": 0.8467,
-      "Solar": 0.0149,
+      "Solar": 0.015,
       "Wind": 0.1271
     },
     "2024": {
-      "Bioenergy": 0.0334,
-      "Hydro": 0.5702,
-      "Solar": 0.0272,
-      "Wind": 0.3692
+      "Bioenergy": 0.026,
+      "Hydro": 0.5899,
+      "Solar": 0.0237,
+      "Wind": 0.3605
     }
   },
   "ME": {
@@ -4567,9 +4567,9 @@
       "Wind": 0.1724
     },
     "2020": {
-      "Bioenergy": 0.0143,
+      "Bioenergy": 0.0144,
       "Hydro": 0.7522,
-      "Solar": 0.0175,
+      "Solar": 0.0174,
       "Wind": 0.216
     },
     "2021": {
@@ -4587,14 +4587,14 @@
     "2023": {
       "Bioenergy": 0.0013,
       "Hydro": 0.8432,
-      "Solar": 0.0047,
+      "Solar": 0.0048,
       "Wind": 0.1507
     },
     "2024": {
       "Bioenergy": 0,
-      "Hydro": 0.8182,
+      "Hydro": 0.8373,
       "Solar": 0,
-      "Wind": 0.1818
+      "Wind": 0.1627
     }
   },
   "MG": {
@@ -4637,40 +4637,40 @@
   },
   "MK": {
     "2019": {
-      "Bioenergy": 0.033,
+      "Bioenergy": 0.0329,
       "Hydro": 0.7864,
       "Solar": 0.0231,
       "Wind": 0.1576
     },
     "2020": {
       "Bioenergy": 0.0356,
-      "Hydro": 0.754,
-      "Solar": 0.0312,
+      "Hydro": 0.7542,
+      "Solar": 0.0309,
       "Wind": 0.1793
     },
     "2021": {
-      "Bioenergy": 0.0353,
+      "Bioenergy": 0.0352,
       "Hydro": 0.7715,
-      "Solar": 0.0354,
-      "Wind": 0.1577
+      "Solar": 0.0355,
+      "Wind": 0.1578
     },
     "2022": {
-      "Bioenergy": 0.0346,
-      "Hydro": 0.7678,
-      "Solar": 0.0431,
-      "Wind": 0.1545
+      "Bioenergy": 0.0343,
+      "Hydro": 0.7681,
+      "Solar": 0.043,
+      "Wind": 0.1546
     },
     "2023": {
-      "Bioenergy": 0.0288,
-      "Hydro": 0.8529,
-      "Solar": 0.0272,
-      "Wind": 0.0911
+      "Bioenergy": 0.0256,
+      "Hydro": 0.7447,
+      "Solar": 0.1447,
+      "Wind": 0.085
     },
     "2024": {
-      "Bioenergy": 0.0589,
-      "Hydro": 0.7647,
-      "Solar": 0.0589,
-      "Wind": 0.1175
+      "Bioenergy": 0.0496,
+      "Hydro": 0.7202,
+      "Solar": 0.0879,
+      "Wind": 0.1423
     }
   },
   "ML": {
@@ -4813,16 +4813,16 @@
       "Wind": 0.2424
     },
     "2023": {
-      "Bioenergy": 0.0752,
-      "Hydro": 0.4326,
-      "Solar": 0.2324,
+      "Bioenergy": 0.075,
+      "Hydro": 0.4324,
+      "Solar": 0.2328,
       "Wind": 0.2598
     },
     "2024": {
-      "Bioenergy": 0.0938,
-      "Hydro": 0.3708,
-      "Solar": 0.2145,
-      "Wind": 0.3209
+      "Bioenergy": 0.0986,
+      "Hydro": 0.3555,
+      "Solar": 0.2467,
+      "Wind": 0.2992
     }
   },
   "MQ": {
@@ -4866,39 +4866,39 @@
   "MR": {
     "2019": {
       "Bioenergy": 0.0016,
-      "Hydro": 0.4669,
-      "Solar": 0.2853,
-      "Wind": 0.2461
+      "Hydro": 0.4643,
+      "Solar": 0.2852,
+      "Wind": 0.2489
     },
     "2020": {
       "Bioenergy": 0.0016,
-      "Hydro": 0.4669,
-      "Solar": 0.2853,
-      "Wind": 0.2461
+      "Hydro": 0.4643,
+      "Solar": 0.2852,
+      "Wind": 0.2489
     },
     "2021": {
       "Bioenergy": 0.0016,
-      "Hydro": 0.4669,
-      "Solar": 0.2853,
-      "Wind": 0.2461
+      "Hydro": 0.4643,
+      "Solar": 0.2852,
+      "Wind": 0.2489
     },
     "2022": {
       "Bioenergy": 0.0016,
-      "Hydro": 0.4669,
-      "Solar": 0.2853,
-      "Wind": 0.2461
+      "Hydro": 0.4643,
+      "Solar": 0.2852,
+      "Wind": 0.2489
     },
     "2023": {
       "Bioenergy": 0.0016,
-      "Hydro": 0.4669,
-      "Solar": 0.2853,
-      "Wind": 0.2461
+      "Hydro": 0.4643,
+      "Solar": 0.2852,
+      "Wind": 0.2489
     },
     "2024": {
       "Bioenergy": 0.0016,
-      "Hydro": 0.4669,
-      "Solar": 0.2853,
-      "Wind": 0.2461
+      "Hydro": 0.4643,
+      "Solar": 0.2852,
+      "Wind": 0.2489
     }
   },
   "MS": {
@@ -4941,40 +4941,40 @@
   },
   "MT": {
     "2019": {
-      "Bioenergy": 0.0877,
-      "Hydro": 0.5233,
-      "Solar": 0.1015,
-      "Wind": 0.2875
+      "Bioenergy": 0.0876,
+      "Hydro": 0.5234,
+      "Solar": 0.1016,
+      "Wind": 0.2874
     },
     "2020": {
       "Bioenergy": 0.0851,
-      "Hydro": 0.5116,
-      "Solar": 0.1028,
-      "Wind": 0.3005
+      "Hydro": 0.5122,
+      "Solar": 0.1019,
+      "Wind": 0.3008
     },
     "2021": {
-      "Bioenergy": 0.0903,
+      "Bioenergy": 0.0898,
       "Hydro": 0.4981,
-      "Solar": 0.1093,
-      "Wind": 0.3023
+      "Solar": 0.1096,
+      "Wind": 0.3025
     },
     "2022": {
-      "Bioenergy": 0.0663,
-      "Hydro": 0.3365,
+      "Bioenergy": 0.0655,
+      "Hydro": 0.337,
       "Solar": 0.3562,
-      "Wind": 0.241
+      "Wind": 0.2413
     },
     "2023": {
-      "Bioenergy": 0.0317,
-      "Hydro": 0.1963,
-      "Solar": 0.6232,
+      "Bioenergy": 0.0315,
+      "Hydro": 0.1964,
+      "Solar": 0.6233,
       "Wind": 0.1488
     },
     "2024": {
-      "Bioenergy": 0.0548,
-      "Hydro": 0.358,
-      "Solar": 0.2695,
-      "Wind": 0.3177
+      "Bioenergy": 0.0409,
+      "Hydro": 0.2606,
+      "Solar": 0.4641,
+      "Wind": 0.2344
     }
   },
   "MU": {
@@ -5207,40 +5207,40 @@
   },
   "NA": {
     "2019": {
-      "Bioenergy": 0.0068,
-      "Hydro": 0.7579,
-      "Solar": 0.1992,
-      "Wind": 0.0361
+      "Bioenergy": 0.0065,
+      "Hydro": 0.7475,
+      "Solar": 0.1986,
+      "Wind": 0.0473
     },
     "2020": {
-      "Bioenergy": 0.0068,
-      "Hydro": 0.7579,
-      "Solar": 0.1992,
-      "Wind": 0.0361
+      "Bioenergy": 0.0065,
+      "Hydro": 0.7475,
+      "Solar": 0.1986,
+      "Wind": 0.0473
     },
     "2021": {
-      "Bioenergy": 0.0068,
-      "Hydro": 0.7579,
-      "Solar": 0.1992,
-      "Wind": 0.0361
+      "Bioenergy": 0.0065,
+      "Hydro": 0.7475,
+      "Solar": 0.1986,
+      "Wind": 0.0473
     },
     "2022": {
-      "Bioenergy": 0.0068,
-      "Hydro": 0.7579,
-      "Solar": 0.1992,
-      "Wind": 0.0361
+      "Bioenergy": 0.0065,
+      "Hydro": 0.7475,
+      "Solar": 0.1986,
+      "Wind": 0.0473
     },
     "2023": {
-      "Bioenergy": 0.0068,
-      "Hydro": 0.7579,
-      "Solar": 0.1992,
-      "Wind": 0.0361
+      "Bioenergy": 0.0065,
+      "Hydro": 0.7475,
+      "Solar": 0.1986,
+      "Wind": 0.0473
     },
     "2024": {
-      "Bioenergy": 0.0068,
-      "Hydro": 0.7579,
-      "Solar": 0.1992,
-      "Wind": 0.0361
+      "Bioenergy": 0.0065,
+      "Hydro": 0.7475,
+      "Solar": 0.1986,
+      "Wind": 0.0473
     }
   },
   "NC": {
@@ -5283,40 +5283,40 @@
   },
   "NE": {
     "2019": {
-      "Bioenergy": 0.0166,
-      "Hydro": 0.6751,
-      "Solar": 0.2453,
-      "Wind": 0.0631
+      "Bioenergy": 0.0158,
+      "Hydro": 0.6495,
+      "Solar": 0.2441,
+      "Wind": 0.0906
     },
     "2020": {
-      "Bioenergy": 0.0166,
-      "Hydro": 0.6751,
-      "Solar": 0.2453,
-      "Wind": 0.0631
+      "Bioenergy": 0.0158,
+      "Hydro": 0.6495,
+      "Solar": 0.2441,
+      "Wind": 0.0906
     },
     "2021": {
-      "Bioenergy": 0.0166,
-      "Hydro": 0.6751,
-      "Solar": 0.2453,
-      "Wind": 0.0631
+      "Bioenergy": 0.0158,
+      "Hydro": 0.6495,
+      "Solar": 0.2441,
+      "Wind": 0.0906
     },
     "2022": {
-      "Bioenergy": 0.0166,
-      "Hydro": 0.6751,
-      "Solar": 0.2453,
-      "Wind": 0.0631
+      "Bioenergy": 0.0158,
+      "Hydro": 0.6495,
+      "Solar": 0.2441,
+      "Wind": 0.0906
     },
     "2023": {
-      "Bioenergy": 0.0166,
-      "Hydro": 0.6751,
-      "Solar": 0.2453,
-      "Wind": 0.0631
+      "Bioenergy": 0.0158,
+      "Hydro": 0.6495,
+      "Solar": 0.2441,
+      "Wind": 0.0906
     },
     "2024": {
-      "Bioenergy": 0.0166,
-      "Hydro": 0.6751,
-      "Solar": 0.2453,
-      "Wind": 0.0631
+      "Bioenergy": 0.0158,
+      "Hydro": 0.6495,
+      "Solar": 0.2441,
+      "Wind": 0.0906
     }
   },
   "NG": {
@@ -5377,22 +5377,22 @@
       "Wind": 0.3665
     },
     "2022": {
-      "Bioenergy": 0.4052,
-      "Hydro": 0.2088,
-      "Solar": 0.0226,
-      "Wind": 0.3634
+      "Bioenergy": 0.4051,
+      "Hydro": 0.2085,
+      "Solar": 0.0231,
+      "Wind": 0.3632
     },
     "2023": {
-      "Bioenergy": 0.4046,
-      "Hydro": 0.2053,
-      "Solar": 0.0258,
+      "Bioenergy": 0.4047,
+      "Hydro": 0.2049,
+      "Solar": 0.0261,
       "Wind": 0.3642
     },
     "2024": {
-      "Bioenergy": 0.4017,
-      "Hydro": 0.2076,
-      "Solar": 0.0284,
-      "Wind": 0.3623
+      "Bioenergy": 0.4026,
+      "Hydro": 0.2097,
+      "Solar": 0.0283,
+      "Wind": 0.3594
     }
   },
   "NL": {
@@ -5411,7 +5411,7 @@
     "2021": {
       "Bioenergy": 0.2463,
       "Hydro": 0.0161,
-      "Solar": 0.2873,
+      "Solar": 0.2874,
       "Wind": 0.4502
     },
     "2022": {
@@ -5421,16 +5421,16 @@
       "Wind": 0.4565
     },
     "2023": {
-      "Bioenergy": 0.1242,
+      "Bioenergy": 0.1252,
       "Hydro": 0.0025,
-      "Solar": 0.356,
-      "Wind": 0.5173
+      "Solar": 0.3622,
+      "Wind": 0.5101
     },
     "2024": {
-      "Bioenergy": 0.1285,
+      "Bioenergy": 0.1296,
       "Hydro": 0,
-      "Solar": 0.0819,
-      "Wind": 0.7896
+      "Solar": 0.1548,
+      "Wind": 0.7156
     }
   },
   "NO": {
@@ -5466,9 +5466,9 @@
     },
     "2024": {
       "Bioenergy": 0,
-      "Hydro": 0.8854,
+      "Hydro": 0.8869,
       "Solar": 0,
-      "Wind": 0.1146
+      "Wind": 0.1131
     }
   },
   "NP": {
@@ -5497,16 +5497,16 @@
       "Wind": 0.0168
     },
     "2023": {
-      "Bioenergy": 0.0069,
+      "Bioenergy": 0.0068,
       "Hydro": 0.9456,
       "Solar": 0.0293,
       "Wind": 0.0182
     },
     "2024": {
-      "Bioenergy": 0.0075,
-      "Hydro": 0.9457,
-      "Solar": 0.0266,
-      "Wind": 0.0202
+      "Bioenergy": 0.0077,
+      "Hydro": 0.9452,
+      "Solar": 0.0285,
+      "Wind": 0.0186
     }
   },
   "NR": {
@@ -5839,16 +5839,16 @@
       "Wind": 0.0724
     },
     "2023": {
-      "Bioenergy": 0.0703,
-      "Hydro": 0.6629,
-      "Solar": 0.1897,
-      "Wind": 0.0771
+      "Bioenergy": 0.0675,
+      "Hydro": 0.6825,
+      "Solar": 0.1651,
+      "Wind": 0.0849
     },
     "2024": {
-      "Bioenergy": 0.0646,
-      "Hydro": 0.6873,
-      "Solar": 0.1928,
-      "Wind": 0.0554
+      "Bioenergy": 0.0882,
+      "Hydro": 0.5996,
+      "Solar": 0.1683,
+      "Wind": 0.144
     }
   },
   "PK": {
@@ -5883,24 +5883,24 @@
       "Wind": 0.0982
     },
     "2024": {
-      "Bioenergy": 0.0461,
-      "Hydro": 0.8571,
-      "Solar": 0.0276,
-      "Wind": 0.0692
+      "Bioenergy": 0.0911,
+      "Hydro": 0.7603,
+      "Solar": 0.0411,
+      "Wind": 0.1075
     }
   },
   "PL": {
     "2019": {
       "Bioenergy": 0.1058,
-      "Hydro": 0.147,
+      "Hydro": 0.1469,
       "Solar": 0.0477,
       "Wind": 0.6996
     },
     "2020": {
-      "Bioenergy": 0.0962,
-      "Hydro": 0.156,
-      "Solar": 0.103,
-      "Wind": 0.6447
+      "Bioenergy": 0.0963,
+      "Hydro": 0.1561,
+      "Solar": 0.1029,
+      "Wind": 0.6448
     },
     "2021": {
       "Bioenergy": 0.081,
@@ -5921,10 +5921,10 @@
       "Wind": 0.5491
     },
     "2024": {
-      "Bioenergy": 0.0493,
-      "Hydro": 0.072,
-      "Solar": 0.0886,
-      "Wind": 0.79
+      "Bioenergy": 0.0452,
+      "Hydro": 0.0805,
+      "Solar": 0.1183,
+      "Wind": 0.756
     }
   },
   "PM": {
@@ -6052,37 +6052,37 @@
       "Bioenergy": 0.1187,
       "Hydro": 0.3923,
       "Solar": 0.0514,
-      "Wind": 0.4376
+      "Wind": 0.4377
     },
     "2021": {
-      "Bioenergy": 0.1226,
+      "Bioenergy": 0.1225,
       "Hydro": 0.3554,
       "Solar": 0.0679,
       "Wind": 0.4541
     },
     "2022": {
-      "Bioenergy": 0.1304,
-      "Hydro": 0.2482,
-      "Solar": 0.1128,
-      "Wind": 0.5086
+      "Bioenergy": 0.1303,
+      "Hydro": 0.2483,
+      "Solar": 0.1127,
+      "Wind": 0.5087
     },
     "2023": {
-      "Bioenergy": 0.0955,
+      "Bioenergy": 0.0954,
       "Hydro": 0.3497,
       "Solar": 0.1314,
       "Wind": 0.4235
     },
     "2024": {
-      "Bioenergy": 0.0734,
-      "Hydro": 0.5237,
-      "Solar": 0.0566,
-      "Wind": 0.3464
+      "Bioenergy": 0.071,
+      "Hydro": 0.4738,
+      "Solar": 0.0655,
+      "Wind": 0.3896
     }
   },
   "PY": {
     "2019": {
       "Bioenergy": 0.0409,
-      "Hydro": 0.8267,
+      "Hydro": 0.8266,
       "Solar": 0.0298,
       "Wind": 0.1027
     },
@@ -6202,14 +6202,14 @@
     },
     "2020": {
       "Bioenergy": 0.0231,
-      "Hydro": 0.6335,
+      "Hydro": 0.6336,
       "Solar": 0.0574,
       "Wind": 0.2859
     },
     "2021": {
       "Bioenergy": 0.0252,
       "Hydro": 0.6667,
-      "Solar": 0.0528,
+      "Solar": 0.0529,
       "Wind": 0.2552
     },
     "2022": {
@@ -6220,15 +6220,15 @@
     },
     "2023": {
       "Bioenergy": 0.0135,
-      "Hydro": 0.6619,
+      "Hydro": 0.662,
       "Solar": 0.0541,
       "Wind": 0.2704
     },
     "2024": {
-      "Bioenergy": 0.0165,
-      "Hydro": 0.6269,
-      "Solar": 0.0287,
-      "Wind": 0.3278
+      "Bioenergy": 0.0167,
+      "Hydro": 0.6214,
+      "Solar": 0.0375,
+      "Wind": 0.3243
     }
   },
   "RS": {
@@ -6240,33 +6240,33 @@
     },
     "2020": {
       "Bioenergy": 0.0156,
-      "Hydro": 0.8817,
+      "Hydro": 0.8818,
       "Solar": 0.0009,
       "Wind": 0.1018
     },
     "2021": {
-      "Bioenergy": 0.0247,
+      "Bioenergy": 0.0246,
       "Hydro": 0.872,
       "Solar": 0.0049,
       "Wind": 0.0985
     },
     "2022": {
-      "Bioenergy": 0.032,
-      "Hydro": 0.8273,
+      "Bioenergy": 0.0319,
+      "Hydro": 0.8275,
       "Solar": 0.0173,
       "Wind": 0.1233
     },
     "2023": {
-      "Bioenergy": 0.0183,
-      "Hydro": 0.9093,
+      "Bioenergy": 0.0184,
+      "Hydro": 0.9089,
       "Solar": 0.0011,
-      "Wind": 0.0713
+      "Wind": 0.0716
     },
     "2024": {
-      "Bioenergy": 0.0305,
-      "Hydro": 0.9084,
+      "Bioenergy": 0.0194,
+      "Hydro": 0.9027,
       "Solar": 0,
-      "Wind": 0.0612
+      "Wind": 0.0779
     }
   },
   "RU": {
@@ -6301,48 +6301,48 @@
       "Wind": 0.0218
     },
     "2024": {
-      "Bioenergy": 0.0053,
-      "Hydro": 0.9599,
-      "Solar": 0.002,
-      "Wind": 0.0328
+      "Bioenergy": 0.0054,
+      "Hydro": 0.9591,
+      "Solar": 0.0013,
+      "Wind": 0.0342
     }
   },
   "RW": {
     "2019": {
-      "Bioenergy": 0.0213,
-      "Hydro": 0.8509,
+      "Bioenergy": 0.0212,
+      "Hydro": 0.8505,
       "Solar": 0.1268,
-      "Wind": 0.001
+      "Wind": 0.0014
     },
     "2020": {
-      "Bioenergy": 0.0213,
-      "Hydro": 0.8509,
+      "Bioenergy": 0.0212,
+      "Hydro": 0.8505,
       "Solar": 0.1268,
-      "Wind": 0.001
+      "Wind": 0.0014
     },
     "2021": {
-      "Bioenergy": 0.0213,
-      "Hydro": 0.8509,
+      "Bioenergy": 0.0212,
+      "Hydro": 0.8505,
       "Solar": 0.1268,
-      "Wind": 0.001
+      "Wind": 0.0014
     },
     "2022": {
-      "Bioenergy": 0.0213,
-      "Hydro": 0.8509,
+      "Bioenergy": 0.0212,
+      "Hydro": 0.8505,
       "Solar": 0.1268,
-      "Wind": 0.001
+      "Wind": 0.0014
     },
     "2023": {
-      "Bioenergy": 0.0213,
-      "Hydro": 0.8509,
+      "Bioenergy": 0.0212,
+      "Hydro": 0.8505,
       "Solar": 0.1268,
-      "Wind": 0.001
+      "Wind": 0.0014
     },
     "2024": {
-      "Bioenergy": 0.0213,
-      "Hydro": 0.8509,
+      "Bioenergy": 0.0212,
+      "Hydro": 0.8505,
       "Solar": 0.1268,
-      "Wind": 0.001
+      "Wind": 0.0014
     }
   },
   "SA": {
@@ -6529,10 +6529,10 @@
       "Wind": 0.3141
     },
     "2024": {
-      "Bioenergy": 0.067,
-      "Hydro": 0.5425,
-      "Solar": 0.0008,
-      "Wind": 0.3897
+      "Bioenergy": 0.0653,
+      "Hydro": 0.5531,
+      "Solar": 0.0013,
+      "Wind": 0.3804
     }
   },
   "SG": {
@@ -6561,10 +6561,10 @@
       "Wind": 0.0136
     },
     "2023": {
-      "Bioenergy": 0.0017,
-      "Hydro": 0.007,
-      "Solar": 0.9855,
-      "Wind": 0.0058
+      "Bioenergy": 0.0018,
+      "Hydro": 0.0074,
+      "Solar": 0.9846,
+      "Wind": 0.0062
     },
     "2024": {
       "Bioenergy": 0,
@@ -6575,40 +6575,40 @@
   },
   "SH": {
     "2019": {
-      "Bioenergy": 0.0205,
-      "Hydro": 0.8342,
-      "Solar": 0.0674,
-      "Wind": 0.0779
+      "Bioenergy": 0.0196,
+      "Hydro": 0.8035,
+      "Solar": 0.0648,
+      "Wind": 0.1121
     },
     "2020": {
-      "Bioenergy": 0.0205,
-      "Hydro": 0.8342,
-      "Solar": 0.0674,
-      "Wind": 0.0779
+      "Bioenergy": 0.0196,
+      "Hydro": 0.8035,
+      "Solar": 0.0648,
+      "Wind": 0.1121
     },
     "2021": {
-      "Bioenergy": 0.0205,
-      "Hydro": 0.8342,
-      "Solar": 0.0674,
-      "Wind": 0.0779
+      "Bioenergy": 0.0196,
+      "Hydro": 0.8035,
+      "Solar": 0.0648,
+      "Wind": 0.1121
     },
     "2022": {
-      "Bioenergy": 0.0205,
-      "Hydro": 0.8342,
-      "Solar": 0.0674,
-      "Wind": 0.0779
+      "Bioenergy": 0.0196,
+      "Hydro": 0.8035,
+      "Solar": 0.0648,
+      "Wind": 0.1121
     },
     "2023": {
-      "Bioenergy": 0.0205,
-      "Hydro": 0.8342,
-      "Solar": 0.0674,
-      "Wind": 0.0779
+      "Bioenergy": 0.0196,
+      "Hydro": 0.8035,
+      "Solar": 0.0648,
+      "Wind": 0.1121
     },
     "2024": {
-      "Bioenergy": 0.0205,
-      "Hydro": 0.8342,
-      "Solar": 0.0674,
-      "Wind": 0.0779
+      "Bioenergy": 0.0196,
+      "Hydro": 0.8035,
+      "Solar": 0.0648,
+      "Wind": 0.1121
     }
   },
   "SI": {
@@ -6625,15 +6625,15 @@
       "Wind": 0.0114
     },
     "2021": {
-      "Bioenergy": 0.0159,
+      "Bioenergy": 0.0158,
       "Hydro": 0.9109,
       "Solar": 0.0602,
       "Wind": 0.0131
     },
     "2022": {
-      "Bioenergy": 0.0312,
-      "Hydro": 0.8401,
-      "Solar": 0.0823,
+      "Bioenergy": 0.0311,
+      "Hydro": 0.8402,
+      "Solar": 0.0822,
       "Wind": 0.0465
     },
     "2023": {
@@ -6643,9 +6643,9 @@
       "Wind": 0.0158
     },
     "2024": {
-      "Bioenergy": 0.0228,
-      "Hydro": 0.9543,
-      "Solar": 0.0228,
+      "Bioenergy": 0.0238,
+      "Hydro": 0.9296,
+      "Solar": 0.0466,
       "Wind": 0
     }
   },
@@ -6659,7 +6659,7 @@
     "2020": {
       "Bioenergy": 0.1516,
       "Hydro": 0.7507,
-      "Solar": 0.0868,
+      "Solar": 0.0867,
       "Wind": 0.0109
     },
     "2021": {
@@ -6669,8 +6669,8 @@
       "Wind": 0.0182
     },
     "2022": {
-      "Bioenergy": 0.1475,
-      "Hydro": 0.7121,
+      "Bioenergy": 0.1474,
+      "Hydro": 0.7122,
       "Solar": 0.1126,
       "Wind": 0.0278
     },
@@ -6681,9 +6681,9 @@
       "Wind": 0
     },
     "2024": {
-      "Bioenergy": 0.1144,
-      "Hydro": 0.8569,
-      "Solar": 0.0287,
+      "Bioenergy": 0.1152,
+      "Hydro": 0.8489,
+      "Solar": 0.0359,
       "Wind": 0
     }
   },
@@ -6728,39 +6728,39 @@
   "SN": {
     "2019": {
       "Bioenergy": 0.1289,
-      "Hydro": 0.4637,
+      "Hydro": 0.461,
       "Solar": 0.3753,
-      "Wind": 0.0321
+      "Wind": 0.0348
     },
     "2020": {
       "Bioenergy": 0.1289,
-      "Hydro": 0.4637,
+      "Hydro": 0.461,
       "Solar": 0.3753,
-      "Wind": 0.0321
+      "Wind": 0.0348
     },
     "2021": {
       "Bioenergy": 0.1289,
-      "Hydro": 0.4637,
+      "Hydro": 0.461,
       "Solar": 0.3753,
-      "Wind": 0.0321
+      "Wind": 0.0348
     },
     "2022": {
       "Bioenergy": 0.1289,
-      "Hydro": 0.4637,
+      "Hydro": 0.461,
       "Solar": 0.3753,
-      "Wind": 0.0321
+      "Wind": 0.0348
     },
     "2023": {
       "Bioenergy": 0.1289,
-      "Hydro": 0.4637,
+      "Hydro": 0.461,
       "Solar": 0.3753,
-      "Wind": 0.0321
+      "Wind": 0.0348
     },
     "2024": {
       "Bioenergy": 0.1289,
-      "Hydro": 0.4637,
+      "Hydro": 0.461,
       "Solar": 0.3753,
-      "Wind": 0.0321
+      "Wind": 0.0348
     }
   },
   "SO": {
@@ -6805,7 +6805,7 @@
     "2019": {
       "Bioenergy": 0.0059,
       "Hydro": 0.9427,
-      "Solar": 0.0169,
+      "Solar": 0.017,
       "Wind": 0.0345
     },
     "2020": {
@@ -6822,21 +6822,21 @@
     },
     "2022": {
       "Bioenergy": 0.0052,
-      "Hydro": 0.9186,
-      "Solar": 0.0297,
-      "Wind": 0.0465
+      "Hydro": 0.9173,
+      "Solar": 0.0311,
+      "Wind": 0.0464
     },
     "2023": {
       "Bioenergy": 0.0051,
-      "Hydro": 0.9064,
-      "Solar": 0.0386,
-      "Wind": 0.0499
+      "Hydro": 0.9058,
+      "Solar": 0.0393,
+      "Wind": 0.0498
     },
     "2024": {
-      "Bioenergy": 0.005,
-      "Hydro": 0.899,
-      "Solar": 0.0451,
-      "Wind": 0.0509
+      "Bioenergy": 0.0037,
+      "Hydro": 0.9109,
+      "Solar": 0.0452,
+      "Wind": 0.0402
     }
   },
   "SS": {
@@ -6935,22 +6935,22 @@
       "Wind": 0.0426
     },
     "2022": {
-      "Bioenergy": 0.1623,
-      "Hydro": 0.6313,
-      "Solar": 0.1652,
-      "Wind": 0.0413
+      "Bioenergy": 0.1318,
+      "Hydro": 0.5601,
+      "Solar": 0.2674,
+      "Wind": 0.0406
     },
     "2023": {
-      "Bioenergy": 0.3704,
-      "Hydro": 0.3704,
-      "Solar": 0.1852,
-      "Wind": 0.074
+      "Bioenergy": 0.1604,
+      "Hydro": 0.3675,
+      "Solar": 0.4464,
+      "Wind": 0.0257
     },
     "2024": {
-      "Bioenergy": 0.3704,
-      "Hydro": 0.3704,
-      "Solar": 0.1852,
-      "Wind": 0.074
+      "Bioenergy": 0,
+      "Hydro": 0.4117,
+      "Solar": 0.5883,
+      "Wind": 0
     }
   },
   "SY": {
@@ -6993,40 +6993,40 @@
   },
   "SZ": {
     "2019": {
-      "Bioenergy": 0.5059,
-      "Hydro": 0.4597,
-      "Solar": 0.016,
-      "Wind": 0.0185
+      "Bioenergy": 0.5064,
+      "Hydro": 0.4519,
+      "Solar": 0.0153,
+      "Wind": 0.0264
     },
     "2020": {
-      "Bioenergy": 0.5059,
-      "Hydro": 0.4597,
-      "Solar": 0.016,
-      "Wind": 0.0185
+      "Bioenergy": 0.5064,
+      "Hydro": 0.4519,
+      "Solar": 0.0153,
+      "Wind": 0.0264
     },
     "2021": {
-      "Bioenergy": 0.5059,
-      "Hydro": 0.4597,
-      "Solar": 0.016,
-      "Wind": 0.0185
+      "Bioenergy": 0.5064,
+      "Hydro": 0.4519,
+      "Solar": 0.0153,
+      "Wind": 0.0264
     },
     "2022": {
-      "Bioenergy": 0.5059,
-      "Hydro": 0.4597,
-      "Solar": 0.016,
-      "Wind": 0.0185
+      "Bioenergy": 0.5064,
+      "Hydro": 0.4519,
+      "Solar": 0.0153,
+      "Wind": 0.0264
     },
     "2023": {
-      "Bioenergy": 0.5059,
-      "Hydro": 0.4597,
-      "Solar": 0.016,
-      "Wind": 0.0185
+      "Bioenergy": 0.5064,
+      "Hydro": 0.4519,
+      "Solar": 0.0153,
+      "Wind": 0.0264
     },
     "2024": {
-      "Bioenergy": 0.5059,
-      "Hydro": 0.4597,
-      "Solar": 0.016,
-      "Wind": 0.0185
+      "Bioenergy": 0.5064,
+      "Hydro": 0.4519,
+      "Solar": 0.0153,
+      "Wind": 0.0264
     }
   },
   "TC": {
@@ -7107,40 +7107,40 @@
   },
   "TG": {
     "2019": {
-      "Bioenergy": 0.0089,
-      "Hydro": 0.9053,
-      "Solar": 0.0519,
-      "Wind": 0.0339
+      "Bioenergy": 0.0085,
+      "Hydro": 0.8922,
+      "Solar": 0.0508,
+      "Wind": 0.0485
     },
     "2020": {
-      "Bioenergy": 0.0089,
-      "Hydro": 0.9053,
-      "Solar": 0.0519,
-      "Wind": 0.0339
+      "Bioenergy": 0.0085,
+      "Hydro": 0.8922,
+      "Solar": 0.0508,
+      "Wind": 0.0485
     },
     "2021": {
-      "Bioenergy": 0.0089,
-      "Hydro": 0.9053,
-      "Solar": 0.0519,
-      "Wind": 0.0339
+      "Bioenergy": 0.0085,
+      "Hydro": 0.8922,
+      "Solar": 0.0508,
+      "Wind": 0.0485
     },
     "2022": {
-      "Bioenergy": 0.0089,
-      "Hydro": 0.9053,
-      "Solar": 0.0519,
-      "Wind": 0.0339
+      "Bioenergy": 0.0085,
+      "Hydro": 0.8922,
+      "Solar": 0.0508,
+      "Wind": 0.0485
     },
     "2023": {
-      "Bioenergy": 0.0089,
-      "Hydro": 0.9053,
-      "Solar": 0.0519,
-      "Wind": 0.0339
+      "Bioenergy": 0.0085,
+      "Hydro": 0.8922,
+      "Solar": 0.0508,
+      "Wind": 0.0485
     },
     "2024": {
-      "Bioenergy": 0.0089,
-      "Hydro": 0.9053,
-      "Solar": 0.0519,
-      "Wind": 0.0339
+      "Bioenergy": 0.0085,
+      "Hydro": 0.8922,
+      "Solar": 0.0508,
+      "Wind": 0.0485
     }
   },
   "TH": {
@@ -7171,14 +7171,14 @@
     "2023": {
       "Bioenergy": 0.4018,
       "Hydro": 0.2694,
-      "Solar": 0.1872,
+      "Solar": 0.1873,
       "Wind": 0.1415
     },
     "2024": {
-      "Bioenergy": 0.4541,
-      "Hydro": 0.201,
-      "Solar": 0.22,
-      "Wind": 0.1249
+      "Bioenergy": 0.4554,
+      "Hydro": 0.1985,
+      "Solar": 0.2247,
+      "Wind": 0.1214
     }
   },
   "TJ": {
@@ -7403,10 +7403,10 @@
       "Wind": 0.2738
     },
     "2024": {
-      "Bioenergy": 0.053,
-      "Hydro": 0.6016,
-      "Solar": 0.0595,
-      "Wind": 0.286
+      "Bioenergy": 0.0554,
+      "Hydro": 0.6048,
+      "Solar": 0.081,
+      "Wind": 0.2588
     }
   },
   "TT": {
@@ -7488,39 +7488,39 @@
   "TZ": {
     "2019": {
       "Bioenergy": 0.0578,
-      "Hydro": 0.9302,
+      "Hydro": 0.9299,
       "Solar": 0.0114,
-      "Wind": 0.0006
+      "Wind": 0.0009
     },
     "2020": {
       "Bioenergy": 0.0578,
-      "Hydro": 0.9302,
+      "Hydro": 0.9299,
       "Solar": 0.0114,
-      "Wind": 0.0006
+      "Wind": 0.0009
     },
     "2021": {
       "Bioenergy": 0.0578,
-      "Hydro": 0.9302,
+      "Hydro": 0.9299,
       "Solar": 0.0114,
-      "Wind": 0.0006
+      "Wind": 0.0009
     },
     "2022": {
       "Bioenergy": 0.0578,
-      "Hydro": 0.9302,
+      "Hydro": 0.9299,
       "Solar": 0.0114,
-      "Wind": 0.0006
+      "Wind": 0.0009
     },
     "2023": {
       "Bioenergy": 0.0578,
-      "Hydro": 0.9302,
+      "Hydro": 0.9299,
       "Solar": 0.0114,
-      "Wind": 0.0006
+      "Wind": 0.0009
     },
     "2024": {
       "Bioenergy": 0.0578,
-      "Hydro": 0.9302,
+      "Hydro": 0.9299,
       "Solar": 0.0114,
-      "Wind": 0.0006
+      "Wind": 0.0009
     }
   },
   "UA": {
@@ -7546,7 +7546,7 @@
       "Bioenergy": 0.0016,
       "Hydro": 0.5612,
       "Solar": 0.0013,
-      "Wind": 0.4358
+      "Wind": 0.4359
     },
     "2023": {
       "Bioenergy": 0,
@@ -7619,22 +7619,22 @@
       "Wind": 0.4432
     },
     "2022": {
-      "Bioenergy": 0.0553,
-      "Hydro": 0.2731,
-      "Solar": 0.2149,
-      "Wind": 0.4567
+      "Bioenergy": 0.0561,
+      "Hydro": 0.2746,
+      "Solar": 0.2139,
+      "Wind": 0.4555
     },
     "2023": {
-      "Bioenergy": 0.0462,
-      "Hydro": 0.2509,
-      "Solar": 0.2525,
-      "Wind": 0.4503
+      "Bioenergy": 0.0502,
+      "Hydro": 0.2511,
+      "Solar": 0.2516,
+      "Wind": 0.4471
     },
     "2024": {
-      "Bioenergy": 0.0005,
-      "Hydro": 0.3084,
-      "Solar": 0.2012,
-      "Wind": 0.4899
+      "Bioenergy": 0.0473,
+      "Hydro": 0.2702,
+      "Solar": 0.1964,
+      "Wind": 0.4861
     }
   },
   "UY": {
@@ -7664,15 +7664,15 @@
     },
     "2023": {
       "Bioenergy": 0.1086,
-      "Hydro": 0.3872,
-      "Solar": 0.0437,
+      "Hydro": 0.3869,
+      "Solar": 0.0439,
       "Wind": 0.4606
     },
     "2024": {
-      "Bioenergy": 0.1333,
-      "Hydro": 0.4571,
-      "Solar": 0.0476,
-      "Wind": 0.3619
+      "Bioenergy": 0.1381,
+      "Hydro": 0.4786,
+      "Solar": 0.0417,
+      "Wind": 0.3417
     }
   },
   "UZ": {
@@ -7703,14 +7703,14 @@
     "2023": {
       "Bioenergy": 0.0038,
       "Hydro": 0.9692,
-      "Solar": 0.0136,
+      "Solar": 0.0137,
       "Wind": 0.0133
     },
     "2024": {
-      "Bioenergy": 0.0043,
-      "Hydro": 0.9695,
-      "Solar": 0.0116,
-      "Wind": 0.0147
+      "Bioenergy": 0.0045,
+      "Hydro": 0.9691,
+      "Solar": 0.0129,
+      "Wind": 0.0135
     }
   },
   "VC": {
@@ -7987,7 +7987,7 @@
       "Wind": 0.2904
     },
     "2020": {
-      "Bioenergy": 0.0018,
+      "Bioenergy": 0.0019,
       "Hydro": 0.6732,
       "Solar": 0.0344,
       "Wind": 0.2906
@@ -7999,22 +7999,22 @@
       "Wind": 0.2904
     },
     "2022": {
-      "Bioenergy": 0.0265,
-      "Hydro": 0.3309,
-      "Solar": 0.0172,
-      "Wind": 0.6254
+      "Bioenergy": 0.0263,
+      "Hydro": 0.331,
+      "Solar": 0.0171,
+      "Wind": 0.6256
     },
     "2023": {
-      "Bioenergy": 0.0237,
+      "Bioenergy": 0.0236,
       "Hydro": 0.4723,
-      "Solar": 0.0386,
-      "Wind": 0.4653
+      "Solar": 0.0387,
+      "Wind": 0.4654
     },
     "2024": {
-      "Bioenergy": 0.0307,
-      "Hydro": 0.4834,
-      "Solar": 0.025,
-      "Wind": 0.4609
+      "Bioenergy": 0.031,
+      "Hydro": 0.4785,
+      "Solar": 0.0319,
+      "Wind": 0.4586
     }
   },
   "YE": {
@@ -8082,7 +8082,7 @@
     },
     "2023": {
       "Bioenergy": 0,
-      "Hydro": 0.0691,
+      "Hydro": 0.069,
       "Solar": 0.5358,
       "Wind": 0.3951
     },
@@ -8133,40 +8133,40 @@
   },
   "ZW": {
     "2019": {
-      "Bioenergy": 0.0801,
-      "Hydro": 0.907,
-      "Solar": 0.0093,
-      "Wind": 0.0036
+      "Bioenergy": 0.08,
+      "Hydro": 0.9057,
+      "Solar": 0.0092,
+      "Wind": 0.0052
     },
     "2020": {
-      "Bioenergy": 0.0801,
-      "Hydro": 0.907,
-      "Solar": 0.0093,
-      "Wind": 0.0036
+      "Bioenergy": 0.08,
+      "Hydro": 0.9057,
+      "Solar": 0.0092,
+      "Wind": 0.0052
     },
     "2021": {
-      "Bioenergy": 0.0801,
-      "Hydro": 0.907,
-      "Solar": 0.0093,
-      "Wind": 0.0036
+      "Bioenergy": 0.08,
+      "Hydro": 0.9057,
+      "Solar": 0.0092,
+      "Wind": 0.0052
     },
     "2022": {
-      "Bioenergy": 0.0801,
-      "Hydro": 0.907,
-      "Solar": 0.0093,
-      "Wind": 0.0036
+      "Bioenergy": 0.08,
+      "Hydro": 0.9057,
+      "Solar": 0.0092,
+      "Wind": 0.0052
     },
     "2023": {
-      "Bioenergy": 0.0801,
-      "Hydro": 0.907,
-      "Solar": 0.0093,
-      "Wind": 0.0036
+      "Bioenergy": 0.08,
+      "Hydro": 0.9057,
+      "Solar": 0.0092,
+      "Wind": 0.0052
     },
     "2024": {
-      "Bioenergy": 0.0801,
-      "Hydro": 0.907,
-      "Solar": 0.0093,
-      "Wind": 0.0036
+      "Bioenergy": 0.08,
+      "Hydro": 0.9057,
+      "Solar": 0.0092,
+      "Wind": 0.0052
     }
   }
 }