npm - @digital4better/data - Versions diffs - 1.1.13 → 1.1.15 - Mend

@digital4better/data 1.1.13 → 1.1.15

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 (17) hide show

package/data/factor/subdivision-monthly-green.csv +379 -379
package/data/factor/subdivision-monthly-green.json +3407 -3407
package/data/factor/subdivision-monthly.csv +379 -379
package/data/factor/subdivision-monthly.json +3408 -3408
package/data/factor/subdivision-yearly-green.csv +190 -190
package/data/factor/subdivision-yearly-green.json +1710 -1710
package/data/factor/subdivision-yearly.csv +191 -191
package/data/factor/subdivision-yearly.json +1710 -1710
package/data/mix/subdivision-monthly-green.csv +371 -371
package/data/mix/subdivision-monthly-green.json +855 -855
package/data/mix/subdivision-monthly.csv +371 -371
package/data/mix/subdivision-monthly.json +1992 -1992
package/data/mix/subdivision-yearly-green.csv +188 -188
package/data/mix/subdivision-yearly-green.json +585 -585
package/data/mix/subdivision-yearly.csv +188 -188
package/data/mix/subdivision-yearly.json +1090 -1090
package/package.json +1 -1

package/data/mix/subdivision-yearly.json CHANGED Viewed

@@ -886,14 +886,14 @@
   "US-AK": {
     "2019": {
       "Bioenergy": 0.0062,
-      "Coal": 0.1138,
-      "Gas": 0.4421,
-      "Hydro": 0.2656,
+      "Coal": 0.1125,
+      "Gas": 0.4426,
+      "Hydro": 0.2674,
       "Nuclear": 0,
-      "Other Fossil": 0.1507,
+      "Other Fossil": 0.1478,
       "Other Renewables": 0,
       "Solar": 0,
-      "Wind": 0.0216
+      "Wind": 0.0235
     },
     "2020": {
       "Bioenergy": 0.0062,
@@ -907,37 +907,37 @@
       "Wind": 0.0205
     },
     "2021": {
-      "Bioenergy": 0.0056,
-      "Coal": 0.111,
-      "Gas": 0.4601,
-      "Hydro": 0.2554,
+      "Bioenergy": 0.0058,
+      "Coal": 0.1141,
+      "Gas": 0.4678,
+      "Hydro": 0.2561,
       "Nuclear": 0,
-      "Other Fossil": 0.1474,
+      "Other Fossil": 0.1362,
       "Other Renewables": 0,
       "Solar": 0,
-      "Wind": 0.0205
+      "Wind": 0.02
     },
     "2022": {
-      "Bioenergy": 0.0058,
-      "Coal": 0.1036,
-      "Gas": 0.4971,
-      "Hydro": 0.2441,
+      "Bioenergy": 0.0061,
+      "Coal": 0.1086,
+      "Gas": 0.4824,
+      "Hydro": 0.256,
       "Nuclear": 0,
-      "Other Fossil": 0.1296,
+      "Other Fossil": 0.1261,
       "Other Renewables": 0,
       "Solar": 0,
-      "Wind": 0.0198
+      "Wind": 0.0208
     },
     "2023": {
-      "Bioenergy": 0.0057,
-      "Coal": 0.1058,
-      "Gas": 0.5134,
-      "Hydro": 0.2098,
+      "Bioenergy": 0.006,
+      "Coal": 0.108,
+      "Gas": 0.5226,
+      "Hydro": 0.2088,
       "Nuclear": 0,
-      "Other Fossil": 0.1463,
+      "Other Fossil": 0.1367,
       "Other Renewables": 0,
       "Solar": 0,
-      "Wind": 0.0191
+      "Wind": 0.0178
     },
     "2024": {
       "Bioenergy": 0.006,
@@ -953,14 +953,14 @@
   },
   "US-AL": {
     "2019": {
-      "Bioenergy": 0.0205,
-      "Coal": 0.1648,
-      "Gas": 0.4091,
-      "Hydro": 0.0834,
-      "Nuclear": 0.3195,
+      "Bioenergy": 0.0235,
+      "Coal": 0.1868,
+      "Gas": 0.4009,
+      "Hydro": 0.0799,
+      "Nuclear": 0.306,
       "Other Fossil": 0.0001,
       "Other Renewables": 0,
-      "Solar": 0.0026,
+      "Solar": 0.0027,
       "Wind": 0
     },
     "2020": {
@@ -975,12 +975,12 @@
       "Wind": 0
     },
     "2021": {
-      "Bioenergy": 0.0229,
+      "Bioenergy": 0.0232,
       "Coal": 0.1885,
-      "Gas": 0.3821,
-      "Hydro": 0.08,
-      "Nuclear": 0.3229,
-      "Other Fossil": 0.0001,
+      "Gas": 0.3815,
+      "Hydro": 0.0807,
+      "Nuclear": 0.3225,
+      "Other Fossil": 0.0002,
       "Other Renewables": 0,
       "Solar": 0.0035,
       "Wind": 0
@@ -1021,58 +1021,58 @@
   },
   "US-AR": {
     "2019": {
-      "Bioenergy": 0.021,
-      "Coal": 0.396,
-      "Gas": 0.3187,
-      "Hydro": 0.0685,
-      "Nuclear": 0.1917,
-      "Other Fossil": 0.0007,
+      "Bioenergy": 0.0207,
+      "Coal": 0.3618,
+      "Gas": 0.3378,
+      "Hydro": 0.0649,
+      "Nuclear": 0.2106,
+      "Other Fossil": 0.0008,
       "Other Renewables": 0,
       "Solar": 0.0033,
       "Wind": 0
     },
     "2020": {
-      "Bioenergy": 0.0183,
-      "Coal": 0.2791,
-      "Gas": 0.3417,
-      "Hydro": 0.0854,
-      "Nuclear": 0.27,
+      "Bioenergy": 0.0171,
+      "Coal": 0.2823,
+      "Gas": 0.335,
+      "Hydro": 0.0841,
+      "Nuclear": 0.2756,
       "Other Fossil": 0.0009,
       "Other Renewables": 0,
-      "Solar": 0.0047,
+      "Solar": 0.005,
       "Wind": 0
     },
     "2021": {
-      "Bioenergy": 0.0144,
-      "Coal": 0.3419,
-      "Gas": 0.3514,
-      "Hydro": 0.0664,
-      "Nuclear": 0.2177,
+      "Bioenergy": 0.0141,
+      "Coal": 0.3506,
+      "Gas": 0.3375,
+      "Hydro": 0.0673,
+      "Nuclear": 0.2219,
       "Other Fossil": 0.001,
       "Other Renewables": 0,
-      "Solar": 0.0071,
+      "Solar": 0.0076,
       "Wind": 0
     },
     "2022": {
-      "Bioenergy": 0.0129,
-      "Coal": 0.3132,
-      "Gas": 0.4007,
-      "Hydro": 0.0544,
-      "Nuclear": 0.2074,
-      "Other Fossil": 0.001,
+      "Bioenergy": 0.0128,
+      "Coal": 0.3089,
+      "Gas": 0.3952,
+      "Hydro": 0.0536,
+      "Nuclear": 0.2173,
+      "Other Fossil": 0.0011,
       "Other Renewables": 0,
-      "Solar": 0.0103,
+      "Solar": 0.0112,
       "Wind": 0
     },
     "2023": {
-      "Bioenergy": 0.0131,
-      "Coal": 0.2984,
-      "Gas": 0.3776,
-      "Hydro": 0.0583,
-      "Nuclear": 0.2392,
-      "Other Fossil": 0.0007,
+      "Bioenergy": 0.0124,
+      "Coal": 0.2801,
+      "Gas": 0.3881,
+      "Hydro": 0.0599,
+      "Nuclear": 0.2458,
+      "Other Fossil": 0.0008,
       "Other Renewables": 0,
-      "Solar": 0.0127,
+      "Solar": 0.0131,
       "Wind": 0
     },
     "2024": {
@@ -1089,15 +1089,15 @@
   },
   "US-AZ": {
     "2019": {
-      "Bioenergy": 0.0022,
-      "Coal": 0.2196,
-      "Gas": 0.3966,
+      "Bioenergy": 0.002,
+      "Coal": 0.2045,
+      "Gas": 0.4059,
       "Hydro": 0.0547,
-      "Nuclear": 0.2738,
+      "Nuclear": 0.2811,
       "Other Fossil": 0.0005,
       "Other Renewables": 0,
-      "Solar": 0.0478,
-      "Wind": 0.0048
+      "Solar": 0.0465,
+      "Wind": 0.0049
     },
     "2020": {
       "Bioenergy": 0.002,
@@ -1112,14 +1112,14 @@
     },
     "2021": {
       "Bioenergy": 0.0019,
-      "Coal": 0.1318,
-      "Gas": 0.4181,
-      "Hydro": 0.0559,
-      "Nuclear": 0.3143,
+      "Coal": 0.1316,
+      "Gas": 0.4425,
+      "Hydro": 0.0558,
+      "Nuclear": 0.2912,
       "Other Fossil": 0.0003,
       "Other Renewables": 0,
-      "Solar": 0.0619,
-      "Wind": 0.0157
+      "Solar": 0.0618,
+      "Wind": 0.0147
     },
     "2022": {
       "Bioenergy": 0.002,
@@ -1133,14 +1133,14 @@
       "Wind": 0.0149
     },
     "2023": {
-      "Bioenergy": 0.001,
-      "Coal": 0.1103,
-      "Gas": 0.4795,
-      "Hydro": 0.0521,
-      "Nuclear": 0.2747,
-      "Other Fossil": 0,
+      "Bioenergy": 0.0011,
+      "Coal": 0.1096,
+      "Gas": 0.4744,
+      "Hydro": 0.0535,
+      "Nuclear": 0.2789,
+      "Other Fossil": 0.0001,
       "Other Renewables": 0,
-      "Solar": 0.0662,
+      "Solar": 0.0661,
       "Wind": 0.0162
     },
     "2024": {
@@ -1149,7 +1149,7 @@
       "Gas": 0.46,
       "Hydro": 0.0468,
       "Nuclear": 0.2835,
-      "Other Fossil": -0.0001,
+      "Other Fossil": 0,
       "Other Renewables": 0,
       "Solar": 0.0502,
       "Wind": 0.0172
@@ -1157,15 +1157,15 @@
   },
   "US-CA": {
     "2019": {
-      "Bioenergy": 0.0295,
-      "Coal": 0.0013,
-      "Gas": 0.4335,
-      "Hydro": 0.1902,
-      "Nuclear": 0.0802,
-      "Other Fossil": 0.0037,
-      "Other Renewables": 0.0581,
-      "Solar": 0.1352,
-      "Wind": 0.0682
+      "Bioenergy": 0.0294,
+      "Coal": 0.0012,
+      "Gas": 0.4328,
+      "Hydro": 0.1899,
+      "Nuclear": 0.0801,
+      "Other Fossil": 0.004,
+      "Other Renewables": 0.0541,
+      "Solar": 0.1404,
+      "Wind": 0.0681
     },
     "2020": {
       "Bioenergy": 0.0292,
@@ -1190,94 +1190,94 @@
       "Wind": 0.077
     },
     "2022": {
-      "Bioenergy": 0.0276,
-      "Coal": 0.0013,
-      "Gas": 0.4578,
-      "Hydro": 0.0909,
-      "Nuclear": 0.085,
-      "Other Fossil": 0.0018,
-      "Other Renewables": 0.0581,
-      "Solar": 0.2015,
-      "Wind": 0.076
+      "Bioenergy": 0.0261,
+      "Coal": 0.0012,
+      "Gas": 0.4808,
+      "Hydro": 0.086,
+      "Nuclear": 0.0865,
+      "Other Fossil": 0.0017,
+      "Other Renewables": 0.055,
+      "Solar": 0.1907,
+      "Wind": 0.072
     },
     "2023": {
-      "Bioenergy": 0.0222,
+      "Bioenergy": 0.0227,
       "Coal": 0.0009,
-      "Gas": 0.4302,
-      "Hydro": 0.143,
-      "Nuclear": 0.0792,
-      "Other Fossil": -0.0012,
-      "Other Renewables": 0.0498,
-      "Solar": 0.2031,
-      "Wind": 0.0728
+      "Gas": 0.439,
+      "Hydro": 0.1459,
+      "Nuclear": 0.0808,
+      "Other Fossil": 0.0001,
+      "Other Renewables": 0.0508,
+      "Solar": 0.1906,
+      "Wind": 0.0691
     },
     "2024": {
       "Bioenergy": 0.024,
       "Coal": 0.0008,
-      "Gas": 0.5424,
-      "Hydro": 0.0923,
-      "Nuclear": 0.0657,
-      "Other Fossil": -0.0025,
-      "Other Renewables": 0.0558,
-      "Solar": 0.1582,
-      "Wind": 0.0633
+      "Gas": 0.5411,
+      "Hydro": 0.0921,
+      "Nuclear": 0.0656,
+      "Other Fossil": 0,
+      "Other Renewables": 0.0556,
+      "Solar": 0.1578,
+      "Wind": 0.0631
     }
   },
   "US-CO": {
     "2019": {
-      "Bioenergy": 0.003,
-      "Coal": 0.43,
-      "Gas": 0.2926,
-      "Hydro": 0.0286,
+      "Bioenergy": 0.0029,
+      "Coal": 0.4494,
+      "Gas": 0.3035,
+      "Hydro": 0.0287,
       "Nuclear": 0,
       "Other Fossil": 0.0012,
       "Other Renewables": 0,
-      "Solar": 0.0239,
-      "Wind": 0.2206
+      "Solar": 0.0216,
+      "Wind": 0.1926
     },
     "2020": {
       "Bioenergy": 0.0031,
-      "Coal": 0.3599,
-      "Gas": 0.3362,
+      "Coal": 0.359,
+      "Gas": 0.3353,
       "Hydro": 0.028,
       "Nuclear": 0,
-      "Other Fossil": -0.0024,
+      "Other Fossil": 0.0003,
       "Other Renewables": 0,
-      "Solar": 0.0278,
-      "Wind": 0.2474
+      "Solar": 0.0277,
+      "Wind": 0.2467
     },
     "2021": {
-      "Bioenergy": 0.0028,
-      "Coal": 0.3977,
-      "Gas": 0.2641,
-      "Hydro": 0.0283,
+      "Bioenergy": 0.003,
+      "Coal": 0.4152,
+      "Gas": 0.2563,
+      "Hydro": 0.0275,
       "Nuclear": 0,
       "Other Fossil": 0.0015,
       "Other Renewables": 0,
-      "Solar": 0.0314,
-      "Wind": 0.2742
+      "Solar": 0.0304,
+      "Wind": 0.2661
     },
     "2022": {
-      "Bioenergy": 0.0026,
-      "Coal": 0.3762,
-      "Gas": 0.2674,
-      "Hydro": 0.0223,
+      "Bioenergy": 0.0028,
+      "Coal": 0.3743,
+      "Gas": 0.2662,
+      "Hydro": 0.0228,
       "Nuclear": 0,
       "Other Fossil": 0.0013,
       "Other Renewables": 0,
-      "Solar": 0.0416,
-      "Wind": 0.2885
+      "Solar": 0.0414,
+      "Wind": 0.2912
     },
     "2023": {
-      "Bioenergy": 0.0026,
-      "Coal": 0.3189,
-      "Gas": 0.2927,
-      "Hydro": 0.0231,
+      "Bioenergy": 0.0024,
+      "Coal": 0.3282,
+      "Gas": 0.3013,
+      "Hydro": 0.0238,
       "Nuclear": 0,
       "Other Fossil": 0.001,
       "Other Renewables": 0,
-      "Solar": 0.068,
-      "Wind": 0.2937
+      "Solar": 0.0638,
+      "Wind": 0.2794
     },
     "2024": {
       "Bioenergy": 0.0027,
@@ -1293,22 +1293,22 @@
   },
   "US-CT": {
     "2019": {
-      "Bioenergy": 0.0172,
-      "Coal": 0.0012,
-      "Gas": 0.5393,
-      "Hydro": 0.0108,
-      "Nuclear": 0.4134,
-      "Other Fossil": 0.0146,
+      "Bioenergy": 0.0187,
+      "Coal": 0.0016,
+      "Gas": 0.5328,
+      "Hydro": 0.0107,
+      "Nuclear": 0.4177,
+      "Other Fossil": 0.0147,
       "Other Renewables": 0,
-      "Solar": 0.0033,
-      "Wind": 0.0002
+      "Solar": 0.0035,
+      "Wind": 0.0003
     },
     "2020": {
       "Bioenergy": 0.019,
-      "Coal": -0.0005,
-      "Gas": 0.5714,
+      "Coal": 0,
+      "Gas": 0.5712,
       "Hydro": 0.0079,
-      "Nuclear": 0.3815,
+      "Nuclear": 0.3813,
       "Other Fossil": 0.0151,
       "Other Renewables": 0,
       "Solar": 0.0052,
@@ -1316,13 +1316,13 @@
     },
     "2021": {
       "Bioenergy": 0.0172,
-      "Coal": 0.0051,
-      "Gas": 0.5607,
-      "Hydro": 0.011,
-      "Nuclear": 0.3868,
-      "Other Fossil": 0.0138,
+      "Coal": 0.0056,
+      "Gas": 0.5555,
+      "Hydro": 0.0108,
+      "Nuclear": 0.3906,
+      "Other Fossil": 0.014,
       "Other Renewables": 0,
-      "Solar": 0.0051,
+      "Solar": 0.006,
       "Wind": 0.0003
     },
     "2022": {
@@ -1339,12 +1339,12 @@
     "2023": {
       "Bioenergy": 0.0107,
       "Coal": 0,
-      "Gas": 0.6238,
+      "Gas": 0.6233,
       "Hydro": 0.0074,
-      "Nuclear": 0.3337,
+      "Nuclear": 0.3335,
       "Other Fossil": 0.014,
       "Other Renewables": 0,
-      "Solar": 0.01,
+      "Solar": 0.0108,
       "Wind": 0.0002
     },
     "2024": {
@@ -1361,58 +1361,58 @@
   },
   "US-DE": {
     "2019": {
-      "Bioenergy": 0.0113,
-      "Coal": 0.0226,
-      "Gas": 0.9515,
+      "Bioenergy": 0.0116,
+      "Coal": 0.0256,
+      "Gas": 0.9479,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.0034,
+      "Other Fossil": 0.0036,
       "Other Renewables": 0,
-      "Solar": 0.0101,
+      "Solar": 0.0102,
       "Wind": 0.001
     },
     "2020": {
-      "Bioenergy": 0.0146,
-      "Coal": 0.0208,
-      "Gas": 0.9519,
+      "Bioenergy": 0.0138,
+      "Coal": 0.023,
+      "Gas": 0.9502,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.0014,
+      "Other Fossil": 0.0016,
       "Other Renewables": 0,
-      "Solar": 0.0103,
+      "Solar": 0.0104,
       "Wind": 0.001
     },
     "2021": {
-      "Bioenergy": 0.017,
-      "Coal": 0.0589,
-      "Gas": 0.9063,
+      "Bioenergy": 0.0171,
+      "Coal": 0.066,
+      "Gas": 0.8986,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.0036,
+      "Other Fossil": 0.0039,
       "Other Renewables": 0,
-      "Solar": 0.0131,
+      "Solar": 0.0133,
       "Wind": 0.0011
     },
     "2022": {
-      "Bioenergy": 0.0149,
-      "Coal": 0.0197,
-      "Gas": 0.9322,
+      "Bioenergy": 0.0148,
+      "Coal": 0.0226,
+      "Gas": 0.9293,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.0204,
+      "Other Fossil": 0.0205,
       "Other Renewables": 0,
       "Solar": 0.012,
       "Wind": 0.0008
     },
     "2023": {
-      "Bioenergy": 0.0157,
-      "Coal": 0.0004,
-      "Gas": 0.9504,
+      "Bioenergy": 0.0156,
+      "Coal": 0.0032,
+      "Gas": 0.948,
       "Hydro": 0,
       "Nuclear": 0,
       "Other Fossil": 0,
       "Other Renewables": 0,
-      "Solar": 0.0326,
+      "Solar": 0.0323,
       "Wind": 0.0009
     },
     "2024": {
@@ -1429,36 +1429,36 @@
   },
   "US-FL": {
     "2019": {
-      "Bioenergy": 0.0177,
-      "Coal": 0.0873,
-      "Gas": 0.7389,
-      "Hydro": 0.0008,
-      "Nuclear": 0.115,
-      "Other Fossil": 0.0221,
+      "Bioenergy": 0.0181,
+      "Coal": 0.0865,
+      "Gas": 0.7411,
+      "Hydro": 0.0009,
+      "Nuclear": 0.1185,
+      "Other Fossil": 0.0191,
       "Other Renewables": 0,
-      "Solar": 0.0181,
+      "Solar": 0.0159,
       "Wind": 0
     },
     "2020": {
-      "Bioenergy": 0.0172,
-      "Coal": 0.0709,
-      "Gas": 0.7503,
-      "Hydro": 0.001,
-      "Nuclear": 0.1163,
-      "Other Fossil": 0.0183,
+      "Bioenergy": 0.016,
+      "Coal": 0.0662,
+      "Gas": 0.7552,
+      "Hydro": 0.0009,
+      "Nuclear": 0.1173,
+      "Other Fossil": 0.0184,
       "Other Renewables": 0,
-      "Solar": 0.0259,
+      "Solar": 0.026,
       "Wind": 0
     },
     "2021": {
-      "Bioenergy": 0.0168,
-      "Coal": 0.0754,
-      "Gas": 0.7383,
+      "Bioenergy": 0.0171,
+      "Coal": 0.0742,
+      "Gas": 0.7366,
       "Hydro": 0.001,
-      "Nuclear": 0.1168,
-      "Other Fossil": 0.0153,
+      "Nuclear": 0.1191,
+      "Other Fossil": 0.0156,
       "Other Renewables": 0,
-      "Solar": 0.0363,
+      "Solar": 0.0365,
       "Wind": 0
     },
     "2022": {
@@ -1474,13 +1474,13 @@
     },
     "2023": {
       "Bioenergy": 0.0135,
-      "Coal": 0.0473,
-      "Gas": 0.7488,
-      "Hydro": 0.0009,
-      "Nuclear": 0.1157,
-      "Other Fossil": 0.0145,
+      "Coal": 0.0464,
+      "Gas": 0.7563,
+      "Hydro": 0.0008,
+      "Nuclear": 0.1149,
+      "Other Fossil": 0.0134,
       "Other Renewables": 0,
-      "Solar": 0.0592,
+      "Solar": 0.0546,
       "Wind": 0
     },
     "2024": {
@@ -1497,14 +1497,14 @@
   },
   "US-GA": {
     "2019": {
-      "Bioenergy": 0.0399,
-      "Coal": 0.1761,
-      "Gas": 0.4721,
-      "Hydro": 0.0229,
-      "Nuclear": 0.2717,
-      "Other Fossil": 0.0024,
+      "Bioenergy": 0.0418,
+      "Coal": 0.1962,
+      "Gas": 0.4555,
+      "Hydro": 0.0261,
+      "Nuclear": 0.261,
+      "Other Fossil": 0.0027,
       "Other Renewables": 0,
-      "Solar": 0.0148,
+      "Solar": 0.0168,
       "Wind": 0
     },
     "2020": {
@@ -1519,14 +1519,14 @@
       "Wind": 0
     },
     "2021": {
-      "Bioenergy": 0.0469,
-      "Coal": 0.1619,
-      "Gas": 0.4489,
-      "Hydro": 0.0288,
-      "Nuclear": 0.2691,
+      "Bioenergy": 0.0471,
+      "Coal": 0.1536,
+      "Gas": 0.4562,
+      "Hydro": 0.0284,
+      "Nuclear": 0.2734,
       "Other Fossil": 0.0021,
       "Other Renewables": 0,
-      "Solar": 0.0423,
+      "Solar": 0.0392,
       "Wind": 0
     },
     "2022": {
@@ -1541,14 +1541,14 @@
       "Wind": 0
     },
     "2023": {
-      "Bioenergy": 0.0391,
-      "Coal": 0.1281,
-      "Gas": 0.4752,
-      "Hydro": 0.0191,
-      "Nuclear": 0.2791,
-      "Other Fossil": 0.0014,
+      "Bioenergy": 0.0393,
+      "Coal": 0.1258,
+      "Gas": 0.4685,
+      "Hydro": 0.0203,
+      "Nuclear": 0.2865,
+      "Other Fossil": 0.0015,
       "Other Renewables": 0,
-      "Solar": 0.0581,
+      "Solar": 0.058,
       "Wind": 0
     },
     "2024": {
@@ -1587,15 +1587,15 @@
       "Wind": 0.0652
     },
     "2021": {
-      "Bioenergy": 0.0307,
-      "Coal": 0.1174,
+      "Bioenergy": 0.0308,
+      "Coal": 0.1181,
       "Gas": 0,
-      "Hydro": 0.0128,
+      "Hydro": 0.0125,
       "Nuclear": 0,
-      "Other Fossil": 0.6889,
-      "Other Renewables": 0.0199,
-      "Solar": 0.0557,
-      "Wind": 0.0746
+      "Other Fossil": 0.6917,
+      "Other Renewables": 0.02,
+      "Solar": 0.0552,
+      "Wind": 0.0717
     },
     "2022": {
       "Bioenergy": 0.0297,
@@ -1609,15 +1609,15 @@
       "Wind": 0.067
     },
     "2023": {
-      "Bioenergy": 0.0287,
+      "Bioenergy": 0.0283,
       "Coal": 0,
       "Gas": 0,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.8052,
-      "Other Renewables": 0.0374,
-      "Solar": 0.0689,
-      "Wind": 0.0598
+      "Other Fossil": 0.7983,
+      "Other Renewables": 0.037,
+      "Solar": 0.0685,
+      "Wind": 0.0679
     },
     "2024": {
       "Bioenergy": 0.0283,
@@ -1633,15 +1633,15 @@
   },
   "US-IA": {
     "2019": {
-      "Bioenergy": 0.003,
-      "Coal": 0.339,
-      "Gas": 0.119,
-      "Hydro": 0.0122,
-      "Nuclear": 0.0801,
+      "Bioenergy": 0.0034,
+      "Coal": 0.3537,
+      "Gas": 0.1242,
+      "Hydro": 0.0127,
+      "Nuclear": 0.0836,
       "Other Fossil": 0.0022,
       "Other Renewables": 0,
       "Solar": 0.0002,
-      "Wind": 0.4442
+      "Wind": 0.4198
     },
     "2020": {
       "Bioenergy": 0.0035,
@@ -1655,18 +1655,18 @@
       "Wind": 0.5731
     },
     "2021": {
-      "Bioenergy": 0.0029,
-      "Coal": 0.3508,
-      "Gas": 0.1025,
-      "Hydro": 0.0156,
+      "Bioenergy": 0.003,
+      "Coal": 0.329,
+      "Gas": 0.0962,
+      "Hydro": 0.0146,
       "Nuclear": 0,
-      "Other Fossil": 0.0021,
+      "Other Fossil": 0.002,
       "Other Renewables": 0,
-      "Solar": 0.0036,
-      "Wind": 0.5225
+      "Solar": 0.0033,
+      "Wind": 0.5519
     },
     "2022": {
-      "Bioenergy": 0.0032,
+      "Bioenergy": 0.003,
       "Coal": 0.2492,
       "Gas": 0.1006,
       "Hydro": 0.0138,
@@ -1674,18 +1674,18 @@
       "Other Fossil": 0.0013,
       "Other Renewables": 0,
       "Solar": 0.0053,
-      "Wind": 0.6266
+      "Wind": 0.6267
     },
     "2023": {
       "Bioenergy": 0.003,
-      "Coal": 0.224,
-      "Gas": 0.1446,
-      "Hydro": 0.0105,
+      "Coal": 0.2305,
+      "Gas": 0.146,
+      "Hydro": 0.0108,
       "Nuclear": 0,
       "Other Fossil": 0.0009,
       "Other Renewables": 0,
-      "Solar": 0.0075,
-      "Wind": 0.6095
+      "Solar": 0.0076,
+      "Wind": 0.6014
     },
     "2024": {
       "Bioenergy": 0.0029,
@@ -1701,15 +1701,15 @@
   },
   "US-ID": {
     "2019": {
-      "Bioenergy": 0.0283,
+      "Bioenergy": 0.0281,
       "Coal": 0.0011,
-      "Gas": 0.2286,
-      "Hydro": 0.5644,
+      "Gas": 0.2319,
+      "Hydro": 0.5613,
       "Nuclear": 0,
-      "Other Fossil": 0.0035,
-      "Other Renewables": 0.0051,
-      "Solar": 0.0307,
-      "Wind": 0.1381
+      "Other Fossil": 0.0036,
+      "Other Renewables": 0.0052,
+      "Solar": 0.0302,
+      "Wind": 0.1386
     },
     "2020": {
       "Bioenergy": 0.0295,
@@ -1723,15 +1723,15 @@
       "Wind": 0.1566
     },
     "2021": {
-      "Bioenergy": 0.0293,
+      "Bioenergy": 0.0291,
       "Coal": 0.001,
-      "Gas": 0.2898,
-      "Hydro": 0.4759,
+      "Gas": 0.2931,
+      "Hydro": 0.4749,
       "Nuclear": 0,
       "Other Fossil": 0.0037,
       "Other Renewables": 0.0055,
-      "Solar": 0.0342,
-      "Wind": 0.1605
+      "Solar": 0.0336,
+      "Wind": 0.1592
     },
     "2022": {
       "Bioenergy": 0.0283,
@@ -1745,15 +1745,15 @@
       "Wind": 0.1499
     },
     "2023": {
-      "Bioenergy": 0.0324,
+      "Bioenergy": 0.0283,
       "Coal": 0,
-      "Gas": 0.3113,
-      "Hydro": 0.4306,
+      "Gas": 0.3189,
+      "Hydro": 0.437,
       "Nuclear": 0,
-      "Other Fossil": 0.0045,
-      "Other Renewables": 0.0044,
-      "Solar": 0.0587,
-      "Wind": 0.1581
+      "Other Fossil": 0.0047,
+      "Other Renewables": 0.0047,
+      "Solar": 0.0559,
+      "Wind": 0.1505
     },
     "2024": {
       "Bioenergy": 0.0291,
@@ -1770,14 +1770,14 @@
   "US-IL": {
     "2019": {
       "Bioenergy": 0.0022,
-      "Coal": 0.2593,
-      "Gas": 0.1185,
+      "Coal": 0.2645,
+      "Gas": 0.1171,
       "Hydro": 0.0007,
-      "Nuclear": 0.5365,
+      "Nuclear": 0.5352,
       "Other Fossil": 0.0015,
       "Other Renewables": 0,
       "Solar": 0.0003,
-      "Wind": 0.0809
+      "Wind": 0.0784
     },
     "2020": {
       "Bioenergy": 0.0023,
@@ -1791,37 +1791,37 @@
       "Wind": 0.0936
     },
     "2021": {
-      "Bioenergy": 0.0019,
-      "Coal": 0.2264,
-      "Gas": 0.1181,
+      "Bioenergy": 0.002,
+      "Coal": 0.2384,
+      "Gas": 0.1151,
       "Hydro": 0.0007,
-      "Nuclear": 0.5481,
+      "Nuclear": 0.534,
       "Other Fossil": 0.0017,
       "Other Renewables": 0,
-      "Solar": 0.003,
-      "Wind": 0.1
+      "Solar": 0.0028,
+      "Wind": 0.1053
     },
     "2022": {
       "Bioenergy": 0.0015,
-      "Coal": 0.2218,
-      "Gas": 0.1097,
+      "Coal": 0.219,
+      "Gas": 0.1084,
       "Hydro": 0.0006,
-      "Nuclear": 0.5406,
-      "Other Fossil": 0.0015,
+      "Nuclear": 0.5338,
+      "Other Fossil": 0.0016,
       "Other Renewables": 0,
-      "Solar": 0.0076,
-      "Wind": 0.1166
+      "Solar": 0.0084,
+      "Wind": 0.1268
     },
     "2023": {
-      "Bioenergy": 0.0017,
-      "Coal": 0.1594,
-      "Gas": 0.1535,
+      "Bioenergy": 0.0016,
+      "Coal": 0.152,
+      "Gas": 0.1613,
       "Hydro": 0.0002,
-      "Nuclear": 0.5283,
-      "Other Fossil": 0.0017,
+      "Nuclear": 0.5475,
+      "Other Fossil": 0.0016,
       "Other Renewables": 0,
-      "Solar": 0.0116,
-      "Wind": 0.1437
+      "Solar": 0.011,
+      "Wind": 0.1248
     },
     "2024": {
       "Bioenergy": 0.0015,
@@ -1838,14 +1838,14 @@
   "US-IN": {
     "2019": {
       "Bioenergy": 0.0045,
-      "Coal": 0.5886,
-      "Gas": 0.3297,
-      "Hydro": 0.0023,
+      "Coal": 0.5927,
+      "Gas": 0.332,
+      "Hydro": 0.0025,
       "Nuclear": 0,
-      "Other Fossil": 0.0044,
+      "Other Fossil": 0.0045,
       "Other Renewables": 0,
-      "Solar": 0.0033,
-      "Wind": 0.0673
+      "Solar": 0.0031,
+      "Wind": 0.0606
     },
     "2020": {
       "Bioenergy": 0.005,
@@ -1860,36 +1860,36 @@
     },
     "2021": {
       "Bioenergy": 0.0046,
-      "Coal": 0.5787,
-      "Gas": 0.3172,
+      "Coal": 0.5783,
+      "Gas": 0.317,
       "Hydro": 0.0041,
       "Nuclear": 0,
-      "Other Fossil": 0.0061,
+      "Other Fossil": 0.0066,
       "Other Renewables": 0,
-      "Solar": 0.0058,
-      "Wind": 0.0835
+      "Solar": 0.0061,
+      "Wind": 0.0834
     },
     "2022": {
-      "Bioenergy": 0.0038,
-      "Coal": 0.5085,
-      "Gas": 0.3686,
-      "Hydro": 0.0039,
+      "Bioenergy": 0.0039,
+      "Coal": 0.5241,
+      "Gas": 0.3495,
+      "Hydro": 0.0038,
       "Nuclear": 0,
-      "Other Fossil": 0.0058,
+      "Other Fossil": 0.0059,
       "Other Renewables": 0,
-      "Solar": 0.0107,
-      "Wind": 0.0987
+      "Solar": 0.011,
+      "Wind": 0.1018
     },
     "2023": {
-      "Bioenergy": 0.0042,
-      "Coal": 0.4522,
-      "Gas": 0.4113,
-      "Hydro": 0.0035,
+      "Bioenergy": 0.0041,
+      "Coal": 0.4512,
+      "Gas": 0.4129,
+      "Hydro": 0.0038,
       "Nuclear": 0,
-      "Other Fossil": 0.0065,
+      "Other Fossil": 0.0064,
       "Other Renewables": 0,
-      "Solar": 0.0213,
-      "Wind": 0.1011
+      "Solar": 0.0212,
+      "Wind": 0.1004
     },
     "2024": {
       "Bioenergy": 0.0042,
@@ -1906,14 +1906,14 @@
   "US-KS": {
     "2019": {
       "Bioenergy": 0.0012,
-      "Coal": 0.322,
-      "Gas": 0.0611,
+      "Coal": 0.3402,
+      "Gas": 0.0594,
       "Hydro": 0.0004,
-      "Nuclear": 0.1868,
-      "Other Fossil": 0.0017,
+      "Nuclear": 0.1819,
+      "Other Fossil": 0.0016,
       "Other Renewables": 0,
       "Solar": 0.0002,
-      "Wind": 0.4267
+      "Wind": 0.415
     },
     "2020": {
       "Bioenergy": 0.0012,
@@ -1928,36 +1928,36 @@
     },
     "2021": {
       "Bioenergy": 0.001,
-      "Coal": 0.3564,
-      "Gas": 0.0489,
-      "Hydro": 0.0006,
-      "Nuclear": 0.1575,
-      "Other Fossil": 0.0028,
+      "Coal": 0.3426,
+      "Gas": 0.047,
+      "Hydro": 0.0005,
+      "Nuclear": 0.1514,
+      "Other Fossil": 0.0027,
       "Other Renewables": 0,
       "Solar": 0.0011,
-      "Wind": 0.4317
+      "Wind": 0.4537
     },
     "2022": {
       "Bioenergy": 0.001,
-      "Coal": 0.3254,
-      "Gas": 0.0541,
+      "Coal": 0.3243,
+      "Gas": 0.0539,
       "Hydro": 0.0004,
-      "Nuclear": 0.1444,
-      "Other Fossil": -0.0036,
+      "Nuclear": 0.1439,
+      "Other Fossil": 0,
       "Other Renewables": 0,
       "Solar": 0.0012,
-      "Wind": 0.4771
+      "Wind": 0.4754
     },
     "2023": {
       "Bioenergy": 0.001,
-      "Coal": 0.2593,
-      "Gas": 0.0867,
+      "Coal": 0.2764,
+      "Gas": 0.0856,
       "Hydro": 0.0002,
-      "Nuclear": 0.1764,
+      "Nuclear": 0.1746,
       "Other Fossil": 0.0009,
       "Other Renewables": 0,
       "Solar": 0.0013,
-      "Wind": 0.4742
+      "Wind": 0.4599
     },
     "2024": {
       "Bioenergy": 0.0011,
@@ -1973,12 +1973,12 @@
   },
   "US-KY": {
     "2019": {
-      "Bioenergy": 0.0053,
-      "Coal": 0.7203,
+      "Bioenergy": 0.0052,
+      "Coal": 0.7202,
       "Gas": 0.2136,
-      "Hydro": 0.0588,
+      "Hydro": 0.0589,
       "Nuclear": 0,
-      "Other Fossil": 0.0015,
+      "Other Fossil": 0.0014,
       "Other Renewables": 0,
       "Solar": 0.0006,
       "Wind": 0
@@ -1995,12 +1995,12 @@
       "Wind": 0
     },
     "2021": {
-      "Bioenergy": 0.006,
-      "Coal": 0.712,
-      "Gas": 0.2091,
-      "Hydro": 0.0704,
+      "Bioenergy": 0.0059,
+      "Coal": 0.7133,
+      "Gas": 0.2084,
+      "Hydro": 0.0697,
       "Nuclear": 0,
-      "Other Fossil": 0.0019,
+      "Other Fossil": 0.002,
       "Other Renewables": 0,
       "Solar": 0.0007,
       "Wind": 0
@@ -2013,14 +2013,14 @@
       "Nuclear": 0,
       "Other Fossil": 0.0022,
       "Other Renewables": 0,
-      "Solar": 0.0006,
+      "Solar": 0.0007,
       "Wind": 0
     },
     "2023": {
-      "Bioenergy": 0.0066,
-      "Coal": 0.6788,
-      "Gas": 0.2304,
-      "Hydro": 0.0793,
+      "Bioenergy": 0.0067,
+      "Coal": 0.6829,
+      "Gas": 0.2317,
+      "Hydro": 0.0737,
       "Nuclear": 0,
       "Other Fossil": 0.0024,
       "Other Renewables": 0,
@@ -2041,12 +2041,12 @@
   },
   "US-LA": {
     "2019": {
-      "Bioenergy": 0.0206,
-      "Coal": 0.0712,
-      "Gas": 0.715,
-      "Hydro": 0.0137,
-      "Nuclear": 0.14,
-      "Other Fossil": 0.0395,
+      "Bioenergy": 0.0224,
+      "Coal": 0.0741,
+      "Gas": 0.7127,
+      "Hydro": 0.0136,
+      "Nuclear": 0.1396,
+      "Other Fossil": 0.0375,
       "Other Renewables": 0,
       "Solar": 0,
       "Wind": 0
@@ -2063,25 +2063,25 @@
       "Wind": 0
     },
     "2021": {
-      "Bioenergy": 0.0214,
-      "Coal": 0.0831,
-      "Gas": 0.6643,
+      "Bioenergy": 0.0217,
+      "Coal": 0.0797,
+      "Gas": 0.6661,
       "Hydro": 0.0112,
-      "Nuclear": 0.1738,
-      "Other Fossil": 0.0447,
+      "Nuclear": 0.1747,
+      "Other Fossil": 0.045,
       "Other Renewables": 0,
       "Solar": 0.0015,
       "Wind": 0
     },
     "2022": {
-      "Bioenergy": 0.0184,
-      "Coal": 0.0726,
-      "Gas": 0.7075,
-      "Hydro": 0.0081,
-      "Nuclear": 0.1576,
-      "Other Fossil": 0.0339,
+      "Bioenergy": 0.0197,
+      "Coal": 0.0775,
+      "Gas": 0.7029,
+      "Hydro": 0.0087,
+      "Nuclear": 0.1532,
+      "Other Fossil": 0.0362,
       "Other Renewables": 0,
-      "Solar": 0.0017,
+      "Solar": 0.0019,
       "Wind": 0
     },
     "2023": {
@@ -2109,59 +2109,59 @@
   },
   "US-MA": {
     "2019": {
-      "Bioenergy": 0.0465,
+      "Bioenergy": 0.0466,
       "Coal": 0,
-      "Gas": 0.7139,
-      "Hydro": 0.025,
-      "Nuclear": 0.1008,
-      "Other Fossil": 0.047,
+      "Gas": 0.7153,
+      "Hydro": 0.0262,
+      "Nuclear": 0.101,
+      "Other Fossil": 0.0471,
       "Other Renewables": 0,
-      "Solar": 0.0559,
-      "Wind": 0.0109
+      "Solar": 0.054,
+      "Wind": 0.0098
     },
     "2020": {
-      "Bioenergy": 0.0508,
+      "Bioenergy": 0.0551,
       "Coal": 0,
-      "Gas": 0.7831,
-      "Hydro": 0.0231,
+      "Gas": 0.7767,
+      "Hydro": 0.0263,
       "Nuclear": 0,
-      "Other Fossil": 0.0523,
+      "Other Fossil": 0.0519,
       "Other Renewables": 0,
-      "Solar": 0.0776,
-      "Wind": 0.0132
+      "Solar": 0.0769,
+      "Wind": 0.0131
     },
     "2021": {
-      "Bioenergy": 0.0526,
+      "Bioenergy": 0.0499,
       "Coal": 0,
-      "Gas": 0.7696,
-      "Hydro": 0.0375,
+      "Gas": 0.7706,
+      "Hydro": 0.0356,
       "Nuclear": 0,
-      "Other Fossil": 0.05,
+      "Other Fossil": 0.0516,
       "Other Renewables": 0,
-      "Solar": 0.0801,
-      "Wind": 0.0101
+      "Solar": 0.0815,
+      "Wind": 0.0107
     },
     "2022": {
       "Bioenergy": 0.0445,
       "Coal": 0,
-      "Gas": 0.7504,
-      "Hydro": 0.0227,
+      "Gas": 0.749,
+      "Hydro": 0.0246,
       "Nuclear": 0,
-      "Other Fossil": 0.0801,
+      "Other Fossil": 0.08,
       "Other Renewables": 0,
-      "Solar": 0.092,
+      "Solar": 0.0918,
       "Wind": 0.0102
     },
     "2023": {
-      "Bioenergy": 0.0477,
+      "Bioenergy": 0.0484,
       "Coal": 0,
-      "Gas": 0.7598,
-      "Hydro": 0.026,
+      "Gas": 0.7605,
+      "Hydro": 0.0239,
       "Nuclear": 0,
-      "Other Fossil": 0.053,
+      "Other Fossil": 0.0534,
       "Other Renewables": 0,
-      "Solar": 0.1034,
-      "Wind": 0.0102
+      "Solar": 0.1035,
+      "Wind": 0.0103
     },
     "2024": {
       "Bioenergy": 0.0515,
@@ -2178,14 +2178,14 @@
   "US-MD": {
     "2019": {
       "Bioenergy": 0.0099,
-      "Coal": 0.1458,
-      "Gas": 0.3721,
-      "Hydro": 0.0557,
-      "Nuclear": 0.3825,
-      "Other Fossil": 0.0099,
+      "Coal": 0.1455,
+      "Gas": 0.3714,
+      "Hydro": 0.0556,
+      "Nuclear": 0.3818,
+      "Other Fossil": 0.01,
       "Other Renewables": 0,
-      "Solar": 0.0119,
-      "Wind": 0.0121
+      "Solar": 0.0126,
+      "Wind": 0.0132
     },
     "2020": {
       "Bioenergy": 0.0094,
@@ -2199,37 +2199,37 @@
       "Wind": 0.0151
     },
     "2021": {
-      "Bioenergy": 0.0101,
-      "Coal": 0.135,
-      "Gas": 0.3483,
-      "Hydro": 0.0584,
-      "Nuclear": 0.4049,
-      "Other Fossil": 0.012,
+      "Bioenergy": 0.0098,
+      "Coal": 0.1354,
+      "Gas": 0.3655,
+      "Hydro": 0.0554,
+      "Nuclear": 0.3921,
+      "Other Fossil": 0.0117,
       "Other Renewables": 0,
-      "Solar": 0.0169,
-      "Wind": 0.0143
+      "Solar": 0.0165,
+      "Wind": 0.0135
     },
     "2022": {
-      "Bioenergy": 0.0078,
-      "Coal": 0.122,
-      "Gas": 0.3773,
-      "Hydro": 0.0481,
-      "Nuclear": 0.4004,
+      "Bioenergy": 0.0084,
+      "Coal": 0.1249,
+      "Gas": 0.3757,
+      "Hydro": 0.0479,
+      "Nuclear": 0.3988,
       "Other Fossil": 0.0118,
       "Other Renewables": 0,
-      "Solar": 0.0193,
+      "Solar": 0.0192,
       "Wind": 0.0134
     },
     "2023": {
-      "Bioenergy": 0.0089,
-      "Coal": 0.0556,
-      "Gas": 0.4236,
-      "Hydro": 0.0482,
-      "Nuclear": 0.4132,
-      "Other Fossil": 0.0104,
+      "Bioenergy": 0.0091,
+      "Coal": 0.0475,
+      "Gas": 0.4321,
+      "Hydro": 0.0475,
+      "Nuclear": 0.4131,
+      "Other Fossil": 0.0106,
       "Other Renewables": 0,
-      "Solar": 0.0272,
-      "Wind": 0.013
+      "Solar": 0.0269,
+      "Wind": 0.0133
     },
     "2024": {
       "Bioenergy": 0.0101,
@@ -2245,15 +2245,15 @@
   },
   "US-ME": {
     "2019": {
-      "Bioenergy": 0.1841,
-      "Coal": 0.007,
-      "Gas": 0.1737,
-      "Hydro": 0.3467,
+      "Bioenergy": 0.2143,
+      "Coal": 0.0068,
+      "Gas": 0.1713,
+      "Hydro": 0.3336,
       "Nuclear": 0,
-      "Other Fossil": 0.0366,
+      "Other Fossil": 0.0356,
       "Other Renewables": 0,
       "Solar": 0.0007,
-      "Wind": 0.2513
+      "Wind": 0.2377
     },
     "2020": {
       "Bioenergy": 0.2093,
@@ -2278,15 +2278,15 @@
       "Wind": 0.2333
     },
     "2022": {
-      "Bioenergy": 0.1366,
-      "Coal": 0.0032,
-      "Gas": 0.3323,
-      "Hydro": 0.2307,
+      "Bioenergy": 0.142,
+      "Coal": 0.0033,
+      "Gas": 0.3248,
+      "Hydro": 0.2398,
       "Nuclear": 0,
-      "Other Fossil": 0.0439,
+      "Other Fossil": 0.0435,
       "Other Renewables": 0,
-      "Solar": 0.0354,
-      "Wind": 0.218
+      "Solar": 0.0338,
+      "Wind": 0.2127
     },
     "2023": {
       "Bioenergy": 0.1372,
@@ -2313,15 +2313,15 @@
   },
   "US-MI": {
     "2019": {
-      "Bioenergy": 0.02,
-      "Coal": 0.3221,
-      "Gas": 0.3116,
+      "Bioenergy": 0.0198,
+      "Coal": 0.32,
+      "Gas": 0.3096,
       "Hydro": 0.0082,
-      "Nuclear": 0.2839,
-      "Other Fossil": 0.0087,
+      "Nuclear": 0.282,
+      "Other Fossil": 0.0093,
       "Other Renewables": 0,
       "Solar": 0.0012,
-      "Wind": 0.0443
+      "Wind": 0.0499
     },
     "2020": {
       "Bioenergy": 0.0197,
@@ -2335,37 +2335,37 @@
       "Wind": 0.0632
     },
     "2021": {
-      "Bioenergy": 0.022,
-      "Coal": 0.3203,
-      "Gas": 0.2741,
-      "Hydro": 0.0054,
-      "Nuclear": 0.2968,
+      "Bioenergy": 0.0205,
+      "Coal": 0.3208,
+      "Gas": 0.2745,
+      "Hydro": 0.0055,
+      "Nuclear": 0.2972,
       "Other Fossil": 0.0112,
       "Other Renewables": 0,
       "Solar": 0.0037,
-      "Wind": 0.0665
+      "Wind": 0.0666
     },
     "2022": {
-      "Bioenergy": 0.0199,
-      "Coal": 0.3035,
-      "Gas": 0.3404,
-      "Hydro": 0.0041,
-      "Nuclear": 0.229,
-      "Other Fossil": 0.015,
+      "Bioenergy": 0.0192,
+      "Coal": 0.2934,
+      "Gas": 0.3619,
+      "Hydro": 0.0046,
+      "Nuclear": 0.2213,
+      "Other Fossil": 0.0145,
       "Other Renewables": 0,
-      "Solar": 0.0076,
-      "Wind": 0.0805
+      "Solar": 0.0073,
+      "Wind": 0.0778
     },
     "2023": {
       "Bioenergy": 0.0164,
-      "Coal": 0.1929,
-      "Gas": 0.4675,
-      "Hydro": 0.0022,
-      "Nuclear": 0.2269,
+      "Coal": 0.1928,
+      "Gas": 0.4672,
+      "Hydro": 0.0027,
+      "Nuclear": 0.2268,
       "Other Fossil": 0.012,
       "Other Renewables": 0,
       "Solar": 0.011,
-      "Wind": 0.0712
+      "Wind": 0.0711
     },
     "2024": {
       "Bioenergy": 0.0159,
@@ -2381,15 +2381,15 @@
   },
   "US-MN": {
     "2019": {
-      "Bioenergy": 0.0197,
-      "Coal": 0.2946,
-      "Gas": 0.2086,
-      "Hydro": 0.0175,
-      "Nuclear": 0.2334,
-      "Other Fossil": 0.0072,
+      "Bioenergy": 0.02,
+      "Coal": 0.2999,
+      "Gas": 0.2123,
+      "Hydro": 0.0178,
+      "Nuclear": 0.2375,
+      "Other Fossil": 0.0068,
       "Other Renewables": 0,
-      "Solar": 0.0214,
-      "Wind": 0.1976
+      "Solar": 0.021,
+      "Wind": 0.1846
     },
     "2020": {
       "Bioenergy": 0.0205,
@@ -2403,37 +2403,37 @@
       "Wind": 0.2093
     },
     "2021": {
-      "Bioenergy": 0.0217,
+      "Bioenergy": 0.0212,
       "Coal": 0.2663,
-      "Gas": 0.2227,
-      "Hydro": 0.0116,
-      "Nuclear": 0.245,
-      "Other Fossil": 0.0072,
+      "Gas": 0.2161,
+      "Hydro": 0.0115,
+      "Nuclear": 0.2386,
+      "Other Fossil": 0.0071,
       "Other Renewables": 0,
-      "Solar": 0.0302,
-      "Wind": 0.1953
+      "Solar": 0.032,
+      "Wind": 0.2073
     },
     "2022": {
-      "Bioenergy": 0.0205,
-      "Coal": 0.2822,
-      "Gas": 0.1424,
-      "Hydro": 0.0155,
-      "Nuclear": 0.2564,
+      "Bioenergy": 0.0201,
+      "Coal": 0.2741,
+      "Gas": 0.1482,
+      "Hydro": 0.0161,
+      "Nuclear": 0.2492,
       "Other Fossil": 0.0042,
       "Other Renewables": 0,
-      "Solar": 0.0333,
-      "Wind": 0.2457
+      "Solar": 0.0323,
+      "Wind": 0.2558
     },
     "2023": {
-      "Bioenergy": 0.0201,
-      "Coal": 0.2217,
-      "Gas": 0.2398,
+      "Bioenergy": 0.0202,
+      "Coal": 0.2223,
+      "Gas": 0.2405,
       "Hydro": 0.0125,
-      "Nuclear": 0.2066,
-      "Other Fossil": 0.006,
+      "Nuclear": 0.2072,
+      "Other Fossil": 0.0059,
       "Other Renewables": 0,
-      "Solar": 0.0377,
-      "Wind": 0.2557
+      "Solar": 0.035,
+      "Wind": 0.2564
     },
     "2024": {
       "Bioenergy": 0.0225,
@@ -2449,15 +2449,15 @@
   },
   "US-MO": {
     "2019": {
-      "Bioenergy": 0.0016,
-      "Coal": 0.6935,
-      "Gas": 0.1041,
-      "Hydro": 0.0346,
-      "Nuclear": 0.1247,
-      "Other Fossil": 0.0013,
+      "Bioenergy": 0.0015,
+      "Coal": 0.7113,
+      "Gas": 0.098,
+      "Hydro": 0.0326,
+      "Nuclear": 0.1175,
+      "Other Fossil": 0.0012,
       "Other Renewables": 0,
-      "Solar": 0.0014,
-      "Wind": 0.0388
+      "Solar": 0.0013,
+      "Wind": 0.0365
     },
     "2020": {
       "Bioenergy": 0.0017,
@@ -2472,14 +2472,14 @@
     },
     "2021": {
       "Bioenergy": 0.0016,
-      "Coal": 0.7603,
-      "Gas": 0.0796,
-      "Hydro": 0.0207,
-      "Nuclear": 0.0563,
+      "Coal": 0.7518,
+      "Gas": 0.0787,
+      "Hydro": 0.0221,
+      "Nuclear": 0.056,
       "Other Fossil": 0.0034,
       "Other Renewables": 0,
-      "Solar": 0.0014,
-      "Wind": 0.0766
+      "Solar": 0.0015,
+      "Wind": 0.0849
     },
     "2022": {
       "Bioenergy": 0.0014,
@@ -2494,14 +2494,14 @@
     },
     "2023": {
       "Bioenergy": 0.0016,
-      "Coal": 0.6124,
-      "Gas": 0.1368,
-      "Hydro": 0.016,
-      "Nuclear": 0.1254,
+      "Coal": 0.6061,
+      "Gas": 0.1346,
+      "Hydro": 0.0175,
+      "Nuclear": 0.134,
       "Other Fossil": 0.0014,
       "Other Renewables": 0,
-      "Solar": 0.0025,
-      "Wind": 0.104
+      "Solar": 0.0026,
+      "Wind": 0.1022
     },
     "2024": {
       "Bioenergy": 0.0014,
@@ -2517,11 +2517,11 @@
   },
   "US-MS": {
     "2019": {
-      "Bioenergy": 0.018,
-      "Coal": 0.0621,
-      "Gas": 0.7462,
+      "Bioenergy": 0.0212,
+      "Coal": 0.0669,
+      "Gas": 0.7396,
       "Hydro": 0,
-      "Nuclear": 0.1686,
+      "Nuclear": 0.1672,
       "Other Fossil": 0.0002,
       "Other Renewables": 0,
       "Solar": 0.0049,
@@ -2530,9 +2530,9 @@
     "2020": {
       "Bioenergy": 0.0213,
       "Coal": 0.069,
-      "Gas": 0.806,
+      "Gas": 0.8058,
       "Hydro": 0,
-      "Nuclear": 0.0972,
+      "Nuclear": 0.0973,
       "Other Fossil": 0.0001,
       "Other Renewables": 0,
       "Solar": 0.0065,
@@ -2540,10 +2540,10 @@
     },
     "2021": {
       "Bioenergy": 0.0202,
-      "Coal": 0.0813,
-      "Gas": 0.7164,
+      "Coal": 0.0817,
+      "Gas": 0.7179,
       "Hydro": 0,
-      "Nuclear": 0.1756,
+      "Nuclear": 0.1738,
       "Other Fossil": 0.0001,
       "Other Renewables": 0,
       "Solar": 0.0063,
@@ -2561,14 +2561,14 @@
       "Wind": 0
     },
     "2023": {
-      "Bioenergy": 0.0195,
-      "Coal": 0.0608,
-      "Gas": 0.7546,
+      "Bioenergy": 0.0178,
+      "Coal": 0.0564,
+      "Gas": 0.7472,
       "Hydro": 0,
-      "Nuclear": 0.1569,
+      "Nuclear": 0.1698,
       "Other Fossil": 0.0001,
       "Other Renewables": 0,
-      "Solar": 0.0081,
+      "Solar": 0.0087,
       "Wind": 0
     },
     "2024": {
@@ -2586,58 +2586,58 @@
   "US-MT": {
     "2019": {
       "Bioenergy": 0.0007,
-      "Coal": 0.5119,
-      "Gas": 0.0187,
-      "Hydro": 0.3536,
+      "Coal": 0.5073,
+      "Gas": 0.0186,
+      "Hydro": 0.3599,
       "Nuclear": 0,
-      "Other Fossil": 0.0273,
+      "Other Fossil": 0.027,
       "Other Renewables": 0,
-      "Solar": 0.001,
-      "Wind": 0.0867
+      "Solar": 0.0011,
+      "Wind": 0.0854
     },
     "2020": {
       "Bioenergy": 0.0014,
-      "Coal": 0.3621,
-      "Gas": 0.0141,
-      "Hydro": 0.4584,
+      "Coal": 0.3635,
+      "Gas": 0.013,
+      "Hydro": 0.4603,
       "Nuclear": 0,
-      "Other Fossil": 0.0321,
+      "Other Fossil": 0.0295,
       "Other Renewables": 0,
-      "Solar": 0.0015,
-      "Wind": 0.1304
+      "Solar": 0.0014,
+      "Wind": 0.1309
     },
     "2021": {
       "Bioenergy": 0.0013,
-      "Coal": 0.4398,
-      "Gas": 0.0213,
-      "Hydro": 0.3624,
+      "Coal": 0.4359,
+      "Gas": 0.0217,
+      "Hydro": 0.3712,
       "Nuclear": 0,
-      "Other Fossil": 0.0295,
+      "Other Fossil": 0.0294,
       "Other Renewables": 0,
       "Solar": 0.0013,
-      "Wind": 0.1444
+      "Wind": 0.1391
     },
     "2022": {
       "Bioenergy": 0.001,
-      "Coal": 0.4312,
+      "Coal": 0.4302,
       "Gas": 0.0271,
-      "Hydro": 0.3658,
+      "Hydro": 0.365,
       "Nuclear": 0,
-      "Other Fossil": 0.025,
+      "Other Fossil": 0.0272,
       "Other Renewables": 0,
-      "Solar": 0.0011,
-      "Wind": 0.1487
+      "Solar": 0.0012,
+      "Wind": 0.1484
     },
     "2023": {
-      "Bioenergy": 0.0012,
-      "Coal": 0.4665,
-      "Gas": 0.0367,
-      "Hydro": 0.2903,
+      "Bioenergy": 0.0011,
+      "Coal": 0.4484,
+      "Gas": 0.0379,
+      "Hydro": 0.3002,
       "Nuclear": 0,
-      "Other Fossil": 0.0269,
+      "Other Fossil": 0.0278,
       "Other Renewables": 0,
-      "Solar": 0.0092,
-      "Wind": 0.1693
+      "Solar": 0.0095,
+      "Wind": 0.1751
     },
     "2024": {
       "Bioenergy": 0.001,
@@ -2653,15 +2653,15 @@
   },
   "US-NC": {
     "2019": {
-      "Bioenergy": 0.0196,
-      "Coal": 0.2299,
-      "Gas": 0.3139,
-      "Hydro": 0.0475,
-      "Nuclear": 0.3235,
+      "Bioenergy": 0.0194,
+      "Coal": 0.2338,
+      "Gas": 0.3137,
+      "Hydro": 0.0472,
+      "Nuclear": 0.3196,
       "Other Fossil": 0.0056,
       "Other Renewables": 0,
-      "Solar": 0.0559,
-      "Wind": 0.0041
+      "Solar": 0.0568,
+      "Wind": 0.004
     },
     "2020": {
       "Bioenergy": 0.0198,
@@ -2686,26 +2686,26 @@
       "Wind": 0.004
     },
     "2022": {
-      "Bioenergy": 0.0137,
-      "Coal": 0.1113,
-      "Gas": 0.4353,
-      "Hydro": 0.0351,
-      "Nuclear": 0.3193,
+      "Bioenergy": 0.0136,
+      "Coal": 0.1093,
+      "Gas": 0.433,
+      "Hydro": 0.0349,
+      "Nuclear": 0.3176,
       "Other Fossil": 0.0036,
       "Other Renewables": 0,
-      "Solar": 0.0779,
-      "Wind": 0.0038
+      "Solar": 0.0839,
+      "Wind": 0.0041
     },
     "2023": {
-      "Bioenergy": 0.0124,
-      "Coal": 0.0986,
-      "Gas": 0.4206,
-      "Hydro": 0.039,
-      "Nuclear": 0.3322,
-      "Other Fossil": 0.0027,
+      "Bioenergy": 0.0132,
+      "Coal": 0.1052,
+      "Gas": 0.4184,
+      "Hydro": 0.0374,
+      "Nuclear": 0.3299,
+      "Other Fossil": 0.0026,
       "Other Renewables": 0,
-      "Solar": 0.0904,
-      "Wind": 0.004
+      "Solar": 0.0892,
+      "Wind": 0.0041
     },
     "2024": {
       "Bioenergy": 0.0141,
@@ -2722,14 +2722,14 @@
   "US-ND": {
     "2019": {
       "Bioenergy": 0,
-      "Coal": 0.6141,
-      "Gas": 0.0365,
-      "Hydro": 0.0756,
+      "Coal": 0.6113,
+      "Gas": 0.0369,
+      "Hydro": 0.0773,
       "Nuclear": 0,
       "Other Fossil": 0.002,
       "Other Renewables": 0,
       "Solar": 0,
-      "Wind": 0.2718
+      "Wind": 0.2725
     },
     "2020": {
       "Bioenergy": 0,
@@ -2744,14 +2744,14 @@
     },
     "2021": {
       "Bioenergy": 0,
-      "Coal": 0.5875,
-      "Gas": 0.0389,
-      "Hydro": 0.0479,
+      "Coal": 0.5671,
+      "Gas": 0.0376,
+      "Hydro": 0.0462,
       "Nuclear": 0,
-      "Other Fossil": 0.0021,
+      "Other Fossil": 0.002,
       "Other Renewables": 0,
       "Solar": 0,
-      "Wind": 0.3236
+      "Wind": 0.347
     },
     "2022": {
       "Bioenergy": 0,
@@ -2766,14 +2766,14 @@
     },
     "2023": {
       "Bioenergy": 0,
-      "Coal": 0.559,
-      "Gas": 0.0499,
-      "Hydro": 0.0357,
+      "Coal": 0.5516,
+      "Gas": 0.0498,
+      "Hydro": 0.0356,
       "Nuclear": 0,
       "Other Fossil": 0.0013,
       "Other Renewables": 0,
       "Solar": 0,
-      "Wind": 0.3541
+      "Wind": 0.3618
     },
     "2024": {
       "Bioenergy": 0,
@@ -2790,14 +2790,14 @@
   "US-NE": {
     "2019": {
       "Bioenergy": 0.0023,
-      "Coal": 0.5437,
-      "Gas": 0.0333,
-      "Hydro": 0.036,
-      "Nuclear": 0.1875,
+      "Coal": 0.5466,
+      "Gas": 0.0342,
+      "Hydro": 0.0359,
+      "Nuclear": 0.1864,
       "Other Fossil": 0.0004,
       "Other Renewables": 0,
       "Solar": 0.0008,
-      "Wind": 0.1958
+      "Wind": 0.1933
     },
     "2020": {
       "Bioenergy": 0.0024,
@@ -2811,37 +2811,37 @@
       "Wind": 0.2474
     },
     "2021": {
-      "Bioenergy": 0.0025,
-      "Coal": 0.4804,
-      "Gas": 0.0321,
-      "Hydro": 0.0308,
-      "Nuclear": 0.1884,
+      "Bioenergy": 0.0024,
+      "Coal": 0.4994,
+      "Gas": 0.031,
+      "Hydro": 0.0296,
+      "Nuclear": 0.1815,
       "Other Fossil": 0.0015,
       "Other Renewables": 0,
-      "Solar": 0.0017,
-      "Wind": 0.2626
+      "Solar": 0.0016,
+      "Wind": 0.253
     },
     "2022": {
-      "Bioenergy": 0.0021,
-      "Coal": 0.4559,
-      "Gas": 0.0332,
-      "Hydro": 0.0263,
-      "Nuclear": 0.1399,
+      "Bioenergy": 0.0022,
+      "Coal": 0.4903,
+      "Gas": 0.031,
+      "Hydro": 0.026,
+      "Nuclear": 0.138,
       "Other Fossil": 0.0009,
       "Other Renewables": 0,
-      "Solar": 0.002,
-      "Wind": 0.3398
+      "Solar": 0.0018,
+      "Wind": 0.3098
     },
     "2023": {
       "Bioenergy": 0.0022,
-      "Coal": 0.4323,
-      "Gas": 0.057,
-      "Hydro": 0.0208,
-      "Nuclear": 0.1684,
+      "Coal": 0.4433,
+      "Gas": 0.0584,
+      "Hydro": 0.0213,
+      "Nuclear": 0.1726,
       "Other Fossil": 0.0006,
       "Other Renewables": 0,
-      "Solar": 0.002,
-      "Wind": 0.3168
+      "Solar": 0.0021,
+      "Wind": 0.2995
     },
     "2024": {
       "Bioenergy": 0.0021,
@@ -2857,15 +2857,15 @@
   },
   "US-NH": {
     "2019": {
-      "Bioenergy": 0.0623,
-      "Coal": 0.02,
-      "Gas": 0.1979,
-      "Hydro": 0.0824,
-      "Nuclear": 0.6074,
-      "Other Fossil": 0.0049,
+      "Bioenergy": 0.0674,
+      "Coal": 0.019,
+      "Gas": 0.1987,
+      "Hydro": 0.0811,
+      "Nuclear": 0.6051,
+      "Other Fossil": 0.0047,
       "Other Renewables": 0,
       "Solar": 0,
-      "Wind": 0.0251
+      "Wind": 0.024
     },
     "2020": {
       "Bioenergy": 0.0529,
@@ -2890,22 +2890,22 @@
       "Wind": 0.0293
     },
     "2022": {
-      "Bioenergy": 0.0483,
-      "Coal": 0.0162,
-      "Gas": 0.2397,
-      "Hydro": 0.0639,
-      "Nuclear": 0.5811,
-      "Other Fossil": 0.0263,
+      "Bioenergy": 0.0454,
+      "Coal": 0.0163,
+      "Gas": 0.2401,
+      "Hydro": 0.064,
+      "Nuclear": 0.582,
+      "Other Fossil": 0.0264,
       "Other Renewables": 0,
       "Solar": 0.0002,
-      "Wind": 0.0242
+      "Wind": 0.0257
     },
     "2023": {
       "Bioenergy": 0.0422,
-      "Coal": 0.0077,
-      "Gas": 0.2606,
-      "Hydro": 0.0675,
-      "Nuclear": 0.5895,
+      "Coal": 0.0088,
+      "Gas": 0.2603,
+      "Hydro": 0.0674,
+      "Nuclear": 0.5888,
       "Other Fossil": 0.0066,
       "Other Renewables": 0,
       "Solar": 0,
@@ -2925,33 +2925,33 @@
   },
   "US-NJ": {
     "2019": {
-      "Bioenergy": 0.0103,
-      "Coal": 0.0135,
-      "Gas": 0.5701,
-      "Hydro": -0.0009,
-      "Nuclear": 0.3801,
-      "Other Fossil": 0.0108,
+      "Bioenergy": 0.0112,
+      "Coal": 0.0147,
+      "Gas": 0.572,
+      "Hydro": 0,
+      "Nuclear": 0.3747,
+      "Other Fossil": 0.0107,
       "Other Renewables": 0,
-      "Solar": 0.0157,
+      "Solar": 0.0164,
       "Wind": 0.0003
     },
     "2020": {
       "Bioenergy": 0.012,
       "Coal": 0.015,
-      "Gas": 0.5046,
-      "Hydro": -0.0015,
-      "Nuclear": 0.4375,
+      "Gas": 0.5038,
+      "Hydro": 0,
+      "Nuclear": 0.4368,
       "Other Fossil": 0.0107,
       "Other Renewables": 0,
-      "Solar": 0.0214,
+      "Solar": 0.0213,
       "Wind": 0.0003
     },
     "2021": {
       "Bioenergy": 0.0115,
       "Coal": 0.0167,
-      "Gas": 0.4823,
-      "Hydro": -0.0017,
-      "Nuclear": 0.4581,
+      "Gas": 0.4815,
+      "Hydro": 0,
+      "Nuclear": 0.4574,
       "Other Fossil": 0.0102,
       "Other Renewables": 0,
       "Solar": 0.0224,
@@ -2960,31 +2960,31 @@
     "2022": {
       "Bioenergy": 0.0102,
       "Coal": 0.0076,
-      "Gas": 0.5153,
-      "Hydro": -0.002,
-      "Nuclear": 0.4351,
+      "Gas": 0.5143,
+      "Hydro": 0,
+      "Nuclear": 0.4342,
       "Other Fossil": 0.0101,
       "Other Renewables": 0,
       "Solar": 0.0233,
       "Wind": 0.0003
     },
     "2023": {
-      "Bioenergy": 0.0103,
+      "Bioenergy": 0.0102,
       "Coal": 0,
-      "Gas": 0.522,
-      "Hydro": -0.0024,
-      "Nuclear": 0.4358,
+      "Gas": 0.5208,
+      "Hydro": 0,
+      "Nuclear": 0.4347,
       "Other Fossil": 0.0091,
       "Other Renewables": 0,
-      "Solar": 0.0249,
+      "Solar": 0.0248,
       "Wind": 0.0003
     },
     "2024": {
       "Bioenergy": 0.0097,
       "Coal": 0,
-      "Gas": 0.5584,
-      "Hydro": -0.0024,
-      "Nuclear": 0.4051,
+      "Gas": 0.5571,
+      "Hydro": 0,
+      "Nuclear": 0.4042,
       "Other Fossil": 0.0097,
       "Other Renewables": 0,
       "Solar": 0.0191,
@@ -2994,14 +2994,14 @@
   "US-NM": {
     "2019": {
       "Bioenergy": 0.0006,
-      "Coal": 0.3993,
-      "Gas": 0.3462,
-      "Hydro": 0.0046,
+      "Coal": 0.4177,
+      "Gas": 0.3356,
+      "Hydro": 0.0045,
       "Nuclear": 0,
-      "Other Fossil": 0.0054,
+      "Other Fossil": 0.0052,
       "Other Renewables": 0.0017,
-      "Solar": 0.0401,
-      "Wind": 0.2021
+      "Solar": 0.0388,
+      "Wind": 0.1959
     },
     "2020": {
       "Bioenergy": 0.0007,
@@ -3027,48 +3027,48 @@
     },
     "2022": {
       "Bioenergy": 0.0004,
-      "Coal": 0.3166,
-      "Gas": 0.2616,
-      "Hydro": 0.0029,
+      "Coal": 0.3251,
+      "Gas": 0.2686,
+      "Hydro": 0.003,
       "Nuclear": 0,
-      "Other Fossil": 0.0004,
-      "Other Renewables": 0.0011,
-      "Solar": 0.0505,
-      "Wind": 0.3665
+      "Other Fossil": 0.0005,
+      "Other Renewables": 0.0012,
+      "Solar": 0.0484,
+      "Wind": 0.3529
     },
     "2023": {
       "Bioenergy": 0.0006,
-      "Coal": 0.1919,
-      "Gas": 0.3843,
+      "Coal": 0.182,
+      "Gas": 0.3588,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": -0.0004,
-      "Other Renewables": 0.001,
-      "Solar": 0.0605,
-      "Wind": 0.362
+      "Other Fossil": 0,
+      "Other Renewables": 0.0009,
+      "Solar": 0.0672,
+      "Wind": 0.3904
     },
     "2024": {
       "Bioenergy": 0.0009,
       "Coal": 0,
-      "Gas": 0.4669,
+      "Gas": 0.4664,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": -0.001,
+      "Other Fossil": 0,
       "Other Renewables": 0.0015,
-      "Solar": 0.0783,
-      "Wind": 0.4535
+      "Solar": 0.0782,
+      "Wind": 0.453
     }
   },
   "US-NV": {
     "2019": {
       "Bioenergy": 0.0014,
       "Coal": 0.0686,
-      "Gas": 0.6514,
-      "Hydro": 0.0535,
+      "Gas": 0.6462,
+      "Hydro": 0.0562,
       "Nuclear": 0,
       "Other Fossil": 0.0008,
-      "Other Renewables": 0.0989,
-      "Solar": 0.1171,
+      "Other Renewables": 0.098,
+      "Solar": 0.1206,
       "Wind": 0.0083
     },
     "2020": {
@@ -3084,14 +3084,14 @@
     },
     "2021": {
       "Bioenergy": 0.0012,
-      "Coal": 0.0687,
-      "Gas": 0.6236,
-      "Hydro": 0.0451,
+      "Coal": 0.0659,
+      "Gas": 0.6258,
+      "Hydro": 0.0466,
       "Nuclear": 0,
       "Other Fossil": 0.0008,
-      "Other Renewables": 0.0954,
-      "Solar": 0.1571,
-      "Wind": 0.008
+      "Other Renewables": 0.0938,
+      "Solar": 0.1577,
+      "Wind": 0.0081
     },
     "2022": {
       "Bioenergy": 0.0011,
@@ -3106,11 +3106,11 @@
     },
     "2023": {
       "Bioenergy": 0.0012,
-      "Coal": 0.0494,
-      "Gas": 0.5753,
+      "Coal": 0.0493,
+      "Gas": 0.5751,
       "Hydro": 0.0315,
       "Nuclear": 0,
-      "Other Fossil": -0.0001,
+      "Other Fossil": 0.0002,
       "Other Renewables": 0.1021,
       "Solar": 0.2336,
       "Wind": 0.007
@@ -3129,15 +3129,15 @@
   },
   "US-NY": {
     "2019": {
-      "Bioenergy": 0.0162,
-      "Coal": 0.0035,
-      "Gas": 0.3629,
-      "Hydro": 0.2292,
-      "Nuclear": 0.34,
+      "Bioenergy": 0.0148,
+      "Coal": 0.0032,
+      "Gas": 0.3618,
+      "Hydro": 0.2303,
+      "Nuclear": 0.3409,
       "Other Fossil": 0.0112,
       "Other Renewables": 0,
-      "Solar": 0.0042,
-      "Wind": 0.033
+      "Solar": 0.004,
+      "Wind": 0.0339
     },
     "2020": {
       "Bioenergy": 0.0151,
@@ -3151,15 +3151,15 @@
       "Wind": 0.0349
     },
     "2021": {
-      "Bioenergy": 0.0157,
+      "Bioenergy": 0.0153,
       "Coal": 0,
-      "Gas": 0.4691,
-      "Hydro": 0.1999,
-      "Nuclear": 0.2589,
-      "Other Fossil": 0.0121,
+      "Gas": 0.4515,
+      "Hydro": 0.2275,
+      "Nuclear": 0.2499,
+      "Other Fossil": 0.0132,
       "Other Renewables": 0,
-      "Solar": 0.0089,
-      "Wind": 0.0352
+      "Solar": 0.0093,
+      "Wind": 0.0333
     },
     "2022": {
       "Bioenergy": 0.015,
@@ -3173,15 +3173,15 @@
       "Wind": 0.0365
     },
     "2023": {
-      "Bioenergy": 0.0129,
+      "Bioenergy": 0.0131,
       "Coal": 0,
-      "Gas": 0.4726,
-      "Hydro": 0.2324,
-      "Nuclear": 0.2139,
-      "Other Fossil": 0.0103,
+      "Gas": 0.4789,
+      "Hydro": 0.2181,
+      "Nuclear": 0.22,
+      "Other Fossil": 0.0105,
       "Other Renewables": 0,
-      "Solar": 0.0195,
-      "Wind": 0.0384
+      "Solar": 0.0199,
+      "Wind": 0.0394
     },
     "2024": {
       "Bioenergy": 0.013,
@@ -3197,26 +3197,26 @@
   },
   "US-OH": {
     "2019": {
-      "Bioenergy": 0.0051,
-      "Coal": 0.3494,
-      "Gas": 0.4635,
-      "Hydro": 0.003,
-      "Nuclear": 0.1517,
-      "Other Fossil": 0.0075,
+      "Bioenergy": 0.0057,
+      "Coal": 0.3897,
+      "Gas": 0.4342,
+      "Hydro": 0.0034,
+      "Nuclear": 0.1418,
+      "Other Fossil": 0.0071,
       "Other Renewables": 0,
       "Solar": 0.0012,
-      "Wind": 0.0186
+      "Wind": 0.017
     },
     "2020": {
-      "Bioenergy": 0.006,
-      "Coal": 0.371,
-      "Gas": 0.4375,
+      "Bioenergy": 0.0056,
+      "Coal": 0.372,
+      "Gas": 0.4387,
       "Hydro": 0.0031,
-      "Nuclear": 0.1502,
+      "Nuclear": 0.1506,
       "Other Fossil": 0.0097,
       "Other Renewables": 0,
-      "Solar": 0.0013,
-      "Wind": 0.0212
+      "Solar": 0.0014,
+      "Wind": 0.0189
     },
     "2021": {
       "Bioenergy": 0.0051,
@@ -3230,26 +3230,26 @@
       "Wind": 0.0205
     },
     "2022": {
-      "Bioenergy": 0.004,
-      "Coal": 0.3151,
-      "Gas": 0.5133,
+      "Bioenergy": 0.0039,
+      "Coal": 0.3166,
+      "Gas": 0.5125,
       "Hydro": 0.0037,
-      "Nuclear": 0.127,
-      "Other Fossil": 0.0088,
+      "Nuclear": 0.1239,
+      "Other Fossil": 0.0094,
       "Other Renewables": 0,
-      "Solar": 0.0064,
-      "Wind": 0.0218
+      "Solar": 0.0068,
+      "Wind": 0.0232
     },
     "2023": {
       "Bioenergy": 0.0023,
-      "Coal": 0.2559,
-      "Gas": 0.5815,
-      "Hydro": 0.0034,
-      "Nuclear": 0.121,
-      "Other Fossil": 0.0041,
+      "Coal": 0.2416,
+      "Gas": 0.5927,
+      "Hydro": 0.0035,
+      "Nuclear": 0.1233,
+      "Other Fossil": 0.0042,
       "Other Renewables": 0,
-      "Solar": 0.0102,
-      "Wind": 0.0216
+      "Solar": 0.0104,
+      "Wind": 0.022
     },
     "2024": {
       "Bioenergy": 0.0021,
@@ -3265,15 +3265,15 @@
   },
   "US-OK": {
     "2019": {
-      "Bioenergy": 0.004,
-      "Coal": 0.0995,
-      "Gas": 0.5118,
-      "Hydro": 0.0483,
+      "Bioenergy": 0.0036,
+      "Coal": 0.0918,
+      "Gas": 0.5186,
+      "Hydro": 0.0446,
       "Nuclear": 0,
       "Other Fossil": 0.0003,
       "Other Renewables": 0,
       "Solar": 0.0007,
-      "Wind": 0.3354
+      "Wind": 0.3404
     },
     "2020": {
       "Bioenergy": 0.0043,
@@ -3287,15 +3287,15 @@
       "Wind": 0.3574
     },
     "2021": {
-      "Bioenergy": 0.0044,
-      "Coal": 0.1557,
-      "Gas": 0.4281,
-      "Hydro": 0.0356,
+      "Bioenergy": 0.0039,
+      "Coal": 0.1392,
+      "Gas": 0.4193,
+      "Hydro": 0.0332,
       "Nuclear": 0,
       "Other Fossil": 0.0005,
       "Other Renewables": 0,
       "Solar": 0.0009,
-      "Wind": 0.3747
+      "Wind": 0.4029
     },
     "2022": {
       "Bioenergy": 0.0037,
@@ -3309,15 +3309,15 @@
       "Wind": 0.4435
     },
     "2023": {
-      "Bioenergy": 0.0025,
-      "Coal": 0.0625,
-      "Gas": 0.4961,
+      "Bioenergy": 0.0028,
+      "Coal": 0.0624,
+      "Gas": 0.496,
       "Hydro": 0.02,
       "Nuclear": 0,
       "Other Fossil": 0.0005,
       "Other Renewables": 0,
       "Solar": 0.0008,
-      "Wind": 0.4176
+      "Wind": 0.4175
     },
     "2024": {
       "Bioenergy": 0.002,
@@ -3333,26 +3333,26 @@
   },
   "US-OR": {
     "2019": {
-      "Bioenergy": 0.0168,
-      "Coal": 0.0449,
-      "Gas": 0.3269,
-      "Hydro": 0.4854,
+      "Bioenergy": 0.0154,
+      "Coal": 0.0413,
+      "Gas": 0.3362,
+      "Hydro": 0.487,
       "Nuclear": 0,
       "Other Fossil": 0.0007,
       "Other Renewables": 0.003,
-      "Solar": 0.0114,
-      "Wind": 0.1109
+      "Solar": 0.0109,
+      "Wind": 0.1055
     },
     "2020": {
-      "Bioenergy": 0.0147,
-      "Coal": 0.025,
-      "Gas": 0.317,
-      "Hydro": 0.4887,
+      "Bioenergy": 0.0151,
+      "Coal": 0.0256,
+      "Gas": 0.299,
+      "Hydro": 0.5017,
       "Nuclear": 0,
-      "Other Fossil": 0.0008,
-      "Other Renewables": 0.0029,
-      "Solar": 0.0165,
-      "Wind": 0.1344
+      "Other Fossil": 0.0007,
+      "Other Renewables": 0.003,
+      "Solar": 0.0169,
+      "Wind": 0.138
     },
     "2021": {
       "Bioenergy": 0.0165,
@@ -3379,13 +3379,13 @@
     "2023": {
       "Bioenergy": 0.0158,
       "Coal": 0,
-      "Gas": 0.3782,
-      "Hydro": 0.4185,
+      "Gas": 0.378,
+      "Hydro": 0.422,
       "Nuclear": 0,
-      "Other Fossil": 0.0003,
-      "Other Renewables": 0.0033,
-      "Solar": 0.0329,
-      "Wind": 0.151
+      "Other Fossil": 0.0004,
+      "Other Renewables": 0.0034,
+      "Solar": 0.0325,
+      "Wind": 0.1481
     },
     "2024": {
       "Bioenergy": 0.0163,
@@ -3401,15 +3401,15 @@
   },
   "US-PA": {
     "2019": {
-      "Bioenergy": 0.0092,
-      "Coal": 0.1775,
-      "Gas": 0.4232,
-      "Hydro": 0.0138,
-      "Nuclear": 0.3574,
-      "Other Fossil": 0.0045,
+      "Bioenergy": 0.0087,
+      "Coal": 0.1656,
+      "Gas": 0.4303,
+      "Hydro": 0.0128,
+      "Nuclear": 0.3635,
+      "Other Fossil": 0.0046,
       "Other Renewables": 0,
       "Solar": 0.0004,
-      "Wind": 0.014
+      "Wind": 0.0142
     },
     "2020": {
       "Bioenergy": 0.0083,
@@ -3424,36 +3424,36 @@
     },
     "2021": {
       "Bioenergy": 0.0073,
-      "Coal": 0.1216,
-      "Gas": 0.5279,
+      "Coal": 0.1214,
+      "Gas": 0.5271,
       "Hydro": 0.0101,
-      "Nuclear": 0.315,
-      "Other Fossil": 0.0042,
+      "Nuclear": 0.3145,
+      "Other Fossil": 0.0043,
       "Other Renewables": 0,
       "Solar": 0.0009,
-      "Wind": 0.0129
+      "Wind": 0.0143
     },
     "2022": {
       "Bioenergy": 0.0067,
-      "Coal": 0.1001,
-      "Gas": 0.5472,
+      "Coal": 0.1,
+      "Gas": 0.5463,
       "Hydro": 0.008,
-      "Nuclear": 0.3189,
-      "Other Fossil": 0.0045,
+      "Nuclear": 0.3183,
+      "Other Fossil": 0.0048,
       "Other Renewables": 0,
-      "Solar": 0.0009,
-      "Wind": 0.0137
+      "Solar": 0.001,
+      "Wind": 0.0149
     },
     "2023": {
-      "Bioenergy": 0.007,
-      "Coal": 0.0523,
-      "Gas": 0.5896,
-      "Hydro": 0.0086,
-      "Nuclear": 0.324,
-      "Other Fossil": 0.0038,
+      "Bioenergy": 0.0069,
+      "Coal": 0.054,
+      "Gas": 0.5904,
+      "Hydro": 0.0082,
+      "Nuclear": 0.3206,
+      "Other Fossil": 0.0041,
       "Other Renewables": 0,
-      "Solar": 0.0016,
-      "Wind": 0.0132
+      "Solar": 0.0017,
+      "Wind": 0.0141
     },
     "2024": {
       "Bioenergy": 0.0076,
@@ -3469,15 +3469,15 @@
   },
   "US-RI": {
     "2019": {
-      "Bioenergy": 0.0266,
+      "Bioenergy": 0.0273,
       "Coal": 0,
-      "Gas": 0.9376,
+      "Gas": 0.9366,
       "Hydro": 0.0005,
       "Nuclear": 0,
-      "Other Fossil": 0.0018,
+      "Other Fossil": 0.0014,
       "Other Renewables": 0,
       "Solar": 0.0072,
-      "Wind": 0.0264
+      "Wind": 0.027
     },
     "2020": {
       "Bioenergy": 0.0231,
@@ -3491,37 +3491,37 @@
       "Wind": 0.0241
     },
     "2021": {
-      "Bioenergy": 0.0224,
+      "Bioenergy": 0.0223,
       "Coal": 0,
-      "Gas": 0.9223,
+      "Gas": 0.9269,
       "Hydro": 0.0005,
       "Nuclear": 0,
-      "Other Fossil": 0.0014,
+      "Other Fossil": 0.0013,
       "Other Renewables": 0,
-      "Solar": 0.0332,
-      "Wind": 0.0201
+      "Solar": 0.0305,
+      "Wind": 0.0185
     },
     "2022": {
-      "Bioenergy": 0.0306,
+      "Bioenergy": 0.0279,
       "Coal": 0,
-      "Gas": 0.8885,
+      "Gas": 0.8908,
       "Hydro": 0.0009,
       "Nuclear": 0,
-      "Other Fossil": 0.0072,
+      "Other Fossil": 0.0073,
       "Other Renewables": 0,
-      "Solar": 0.0461,
-      "Wind": 0.0267
+      "Solar": 0.0463,
+      "Wind": 0.0268
     },
     "2023": {
-      "Bioenergy": 0.0265,
+      "Bioenergy": 0.0272,
       "Coal": 0,
-      "Gas": 0.9045,
+      "Gas": 0.9025,
       "Hydro": 0,
       "Nuclear": 0,
-      "Other Fossil": 0.0021,
+      "Other Fossil": 0.0023,
       "Other Renewables": 0,
-      "Solar": 0.0469,
-      "Wind": 0.02
+      "Solar": 0.0475,
+      "Wind": 0.0204
     },
     "2024": {
       "Bioenergy": 0.0289,
@@ -3537,14 +3537,14 @@
   },
   "US-SC": {
     "2019": {
-      "Bioenergy": 0.0218,
-      "Coal": 0.1504,
-      "Gas": 0.2395,
-      "Hydro": 0.0194,
-      "Nuclear": 0.5589,
-      "Other Fossil": 0.0013,
+      "Bioenergy": 0.0217,
+      "Coal": 0.1485,
+      "Gas": 0.239,
+      "Hydro": 0.0206,
+      "Nuclear": 0.5604,
+      "Other Fossil": 0.0012,
       "Other Renewables": 0,
-      "Solar": 0.0087,
+      "Solar": 0.0086,
       "Wind": 0
     },
     "2020": {
@@ -3559,36 +3559,36 @@
       "Wind": 0
     },
     "2021": {
-      "Bioenergy": 0.0205,
-      "Coal": 0.1562,
-      "Gas": 0.2371,
-      "Hydro": 0.0185,
-      "Nuclear": 0.5433,
+      "Bioenergy": 0.0204,
+      "Coal": 0.1544,
+      "Gas": 0.2362,
+      "Hydro": 0.0181,
+      "Nuclear": 0.5466,
       "Other Fossil": 0.0013,
       "Other Renewables": 0,
       "Solar": 0.0232,
       "Wind": 0
     },
     "2022": {
-      "Bioenergy": 0.0215,
-      "Coal": 0.1538,
-      "Gas": 0.2383,
-      "Hydro": 0.0136,
-      "Nuclear": 0.5443,
-      "Other Fossil": 0.0024,
+      "Bioenergy": 0.0202,
+      "Coal": 0.1443,
+      "Gas": 0.2446,
+      "Hydro": 0.0133,
+      "Nuclear": 0.5507,
+      "Other Fossil": 0.0023,
       "Other Renewables": 0,
-      "Solar": 0.0262,
+      "Solar": 0.0245,
       "Wind": 0
     },
     "2023": {
-      "Bioenergy": 0.0178,
-      "Coal": 0.1372,
-      "Gas": 0.2415,
-      "Hydro": 0.0183,
-      "Nuclear": 0.5556,
+      "Bioenergy": 0.019,
+      "Coal": 0.1467,
+      "Gas": 0.2398,
+      "Hydro": 0.0196,
+      "Nuclear": 0.5457,
       "Other Fossil": 0.0014,
       "Other Renewables": 0,
-      "Solar": 0.0283,
+      "Solar": 0.0278,
       "Wind": 0
     },
     "2024": {
@@ -3606,14 +3606,14 @@
   "US-SD": {
     "2019": {
       "Bioenergy": 0,
-      "Coal": 0.18,
-      "Gas": 0.081,
-      "Hydro": 0.5401,
+      "Coal": 0.1804,
+      "Gas": 0.0806,
+      "Hydro": 0.5456,
       "Nuclear": 0,
       "Other Fossil": 0.0009,
       "Other Renewables": 0,
       "Solar": 0.0001,
-      "Wind": 0.1979
+      "Wind": 0.1923
     },
     "2020": {
       "Bioenergy": 0.0008,
@@ -3627,37 +3627,37 @@
       "Wind": 0.392
     },
     "2021": {
-      "Bioenergy": 0.0012,
-      "Coal": 0.0974,
-      "Gas": 0.078,
-      "Hydro": 0.3195,
+      "Bioenergy": 0.0013,
+      "Coal": 0.0946,
+      "Gas": 0.0757,
+      "Hydro": 0.2877,
       "Nuclear": 0,
       "Other Fossil": 0.0022,
       "Other Renewables": 0,
       "Solar": 0.0001,
-      "Wind": 0.5016
+      "Wind": 0.5383
     },
     "2022": {
-      "Bioenergy": 0.0017,
-      "Coal": 0.1126,
-      "Gas": 0.0813,
-      "Hydro": 0.2412,
+      "Bioenergy": 0.0016,
+      "Coal": 0.1048,
+      "Gas": 0.0797,
+      "Hydro": 0.2379,
       "Nuclear": 0,
-      "Other Fossil": 0.001,
+      "Other Fossil": 0.0009,
       "Other Renewables": 0,
       "Solar": 0.0001,
-      "Wind": 0.5621
+      "Wind": 0.575
     },
     "2023": {
       "Bioenergy": 0.0001,
-      "Coal": 0.1029,
-      "Gas": 0.1363,
-      "Hydro": 0.2138,
+      "Coal": 0.0921,
+      "Gas": 0.1382,
+      "Hydro": 0.2113,
       "Nuclear": 0,
-      "Other Fossil": 0.0008,
+      "Other Fossil": 0.0009,
       "Other Renewables": 0,
-      "Solar": 0.0022,
-      "Wind": 0.5438
+      "Solar": 0.0029,
+      "Wind": 0.5546
     },
     "2024": {
       "Bioenergy": 0,
@@ -3673,36 +3673,36 @@
   },
   "US-TN": {
     "2019": {
-      "Bioenergy": 0.0113,
-      "Coal": 0.2211,
-      "Gas": 0.2066,
-      "Hydro": 0.1154,
-      "Nuclear": 0.4401,
-      "Other Fossil": 0.0017,
+      "Bioenergy": 0.0112,
+      "Coal": 0.227,
+      "Gas": 0.2061,
+      "Hydro": 0.1156,
+      "Nuclear": 0.4339,
+      "Other Fossil": 0.0018,
       "Other Renewables": 0,
-      "Solar": 0.0035,
-      "Wind": 0.0004
+      "Solar": 0.004,
+      "Wind": 0.0005
     },
     "2020": {
       "Bioenergy": 0.0092,
-      "Coal": 0.1768,
-      "Gas": 0.1945,
+      "Coal": 0.1769,
+      "Gas": 0.1946,
       "Hydro": 0.158,
-      "Nuclear": 0.4552,
+      "Nuclear": 0.4554,
       "Other Fossil": 0.0015,
       "Other Renewables": 0,
-      "Solar": 0.0043,
+      "Solar": 0.004,
       "Wind": 0.0005
     },
     "2021": {
-      "Bioenergy": 0.0093,
-      "Coal": 0.2429,
-      "Gas": 0.1746,
-      "Hydro": 0.126,
-      "Nuclear": 0.4409,
-      "Other Fossil": 0.0015,
+      "Bioenergy": 0.0088,
+      "Coal": 0.231,
+      "Gas": 0.177,
+      "Hydro": 0.1302,
+      "Nuclear": 0.4469,
+      "Other Fossil": 0.0014,
       "Other Renewables": 0,
-      "Solar": 0.0045,
+      "Solar": 0.0043,
       "Wind": 0.0004
     },
     "2022": {
@@ -3718,13 +3718,13 @@
     },
     "2023": {
       "Bioenergy": 0.0058,
-      "Coal": 0.1927,
-      "Gas": 0.1977,
-      "Hydro": 0.1117,
-      "Nuclear": 0.4771,
+      "Coal": 0.1929,
+      "Gas": 0.1979,
+      "Hydro": 0.1118,
+      "Nuclear": 0.4776,
       "Other Fossil": 0.0012,
       "Other Renewables": 0,
-      "Solar": 0.0137,
+      "Solar": 0.0127,
       "Wind": 0
     },
     "2024": {
@@ -3741,15 +3741,15 @@
   },
   "US-TX": {
     "2019": {
-      "Bioenergy": 0.0026,
-      "Coal": 0.1682,
-      "Gas": 0.548,
-      "Hydro": 0.003,
-      "Nuclear": 0.0887,
+      "Bioenergy": 0.003,
+      "Coal": 0.19,
+      "Gas": 0.535,
+      "Hydro": 0.0031,
+      "Nuclear": 0.0855,
       "Other Fossil": 0.0014,
       "Other Renewables": 0,
-      "Solar": 0.0092,
-      "Wind": 0.1788
+      "Solar": 0.009,
+      "Wind": 0.173
     },
     "2020": {
       "Bioenergy": 0.0029,
@@ -3763,37 +3763,37 @@
       "Wind": 0.1952
     },
     "2021": {
-      "Bioenergy": 0.0026,
-      "Coal": 0.181,
-      "Gas": 0.4797,
+      "Bioenergy": 0.0027,
+      "Coal": 0.1843,
+      "Gas": 0.4884,
       "Hydro": 0.0022,
-      "Nuclear": 0.082,
+      "Nuclear": 0.0835,
       "Other Fossil": 0.0015,
       "Other Renewables": 0,
-      "Solar": 0.0304,
-      "Wind": 0.2207
+      "Solar": 0.031,
+      "Wind": 0.2064
     },
     "2022": {
-      "Bioenergy": 0.0026,
+      "Bioenergy": 0.0028,
       "Coal": 0.1624,
-      "Gas": 0.4922,
+      "Gas": 0.4921,
       "Hydro": 0.0012,
-      "Nuclear": 0.0792,
+      "Nuclear": 0.0791,
       "Other Fossil": 0.0014,
       "Other Renewables": 0,
       "Solar": 0.0427,
       "Wind": 0.2183
     },
     "2023": {
-      "Bioenergy": 0.002,
-      "Coal": 0.1265,
-      "Gas": 0.5316,
+      "Bioenergy": 0.0021,
+      "Coal": 0.1338,
+      "Gas": 0.5161,
       "Hydro": 0.0016,
-      "Nuclear": 0.0769,
+      "Nuclear": 0.0747,
       "Other Fossil": 0.0011,
       "Other Renewables": 0,
-      "Solar": 0.052,
-      "Wind": 0.2081
+      "Solar": 0.0505,
+      "Wind": 0.2202
     },
     "2024": {
       "Bioenergy": 0.002,
@@ -3821,47 +3821,47 @@
     },
     "2020": {
       "Bioenergy": 0.0021,
-      "Coal": 0.6247,
-      "Gas": 0.2525,
+      "Coal": 0.6149,
+      "Gas": 0.2553,
       "Hydro": 0.022,
       "Nuclear": 0,
-      "Other Fossil": 0.0042,
-      "Other Renewables": 0.0103,
-      "Solar": 0.0642,
-      "Wind": 0.0201
+      "Other Fossil": 0.0046,
+      "Other Renewables": 0.0102,
+      "Solar": 0.0693,
+      "Wind": 0.0216
     },
     "2021": {
       "Bioenergy": 0.0019,
-      "Coal": 0.6267,
-      "Gas": 0.2435,
+      "Coal": 0.6196,
+      "Gas": 0.2512,
       "Hydro": 0.0116,
       "Nuclear": 0,
-      "Other Fossil": 0.0044,
-      "Other Renewables": 0.0098,
-      "Solar": 0.0826,
-      "Wind": 0.0195
+      "Other Fossil": 0.0047,
+      "Other Renewables": 0.0099,
+      "Solar": 0.0818,
+      "Wind": 0.0194
     },
     "2022": {
-      "Bioenergy": 0.0018,
-      "Coal": 0.5499,
-      "Gas": 0.2964,
-      "Hydro": 0.0146,
+      "Bioenergy": 0.0019,
+      "Coal": 0.5686,
+      "Gas": 0.282,
+      "Hydro": 0.0151,
       "Nuclear": 0,
-      "Other Fossil": 0.0048,
-      "Other Renewables": 0.0114,
-      "Solar": 0.1026,
-      "Wind": 0.0186
+      "Other Fossil": 0.0045,
+      "Other Renewables": 0.0118,
+      "Solar": 0.0978,
+      "Wind": 0.0184
     },
     "2023": {
-      "Bioenergy": 0.0022,
-      "Coal": 0.4621,
-      "Gas": 0.3677,
-      "Hydro": 0.0141,
+      "Bioenergy": 0.0023,
+      "Coal": 0.4739,
+      "Gas": 0.3527,
+      "Hydro": 0.0134,
       "Nuclear": 0,
-      "Other Fossil": 0.0035,
-      "Other Renewables": 0.0153,
-      "Solar": 0.1149,
-      "Wind": 0.0202
+      "Other Fossil": 0.0036,
+      "Other Renewables": 0.0157,
+      "Solar": 0.1178,
+      "Wind": 0.0207
     },
     "2024": {
       "Bioenergy": 0.0026,
@@ -3877,58 +3877,58 @@
   },
   "US-VA": {
     "2019": {
-      "Bioenergy": 0.0391,
-      "Coal": 0.0391,
-      "Gas": 0.595,
-      "Hydro": 0.004,
-      "Nuclear": 0.3042,
-      "Other Fossil": 0.0085,
+      "Bioenergy": 0.0386,
+      "Coal": 0.0352,
+      "Gas": 0.5979,
+      "Hydro": 0.0059,
+      "Nuclear": 0.3041,
+      "Other Fossil": 0.0084,
       "Other Renewables": 0,
-      "Solar": 0.0101,
+      "Solar": 0.0098,
       "Wind": 0
     },
     "2020": {
-      "Bioenergy": 0.0358,
-      "Coal": 0.0385,
-      "Gas": 0.6046,
-      "Hydro": 0.0092,
-      "Nuclear": 0.291,
+      "Bioenergy": 0.0332,
+      "Coal": 0.0365,
+      "Gas": 0.6071,
+      "Hydro": 0.0101,
+      "Nuclear": 0.2922,
       "Other Fossil": 0.0076,
       "Other Renewables": 0,
-      "Solar": 0.0132,
+      "Solar": 0.0133,
       "Wind": 0
     },
     "2021": {
-      "Bioenergy": 0.0383,
-      "Coal": 0.0346,
-      "Gas": 0.5714,
-      "Hydro": 0.0028,
-      "Nuclear": 0.3045,
-      "Other Fossil": 0.01,
+      "Bioenergy": 0.0384,
+      "Coal": 0.0347,
+      "Gas": 0.5729,
+      "Hydro": 0.004,
+      "Nuclear": 0.3053,
+      "Other Fossil": 0.0093,
       "Other Renewables": 0,
-      "Solar": 0.0377,
-      "Wind": 0.0006
+      "Solar": 0.0349,
+      "Wind": 0.0005
     },
     "2022": {
-      "Bioenergy": 0.0409,
-      "Coal": 0.0376,
-      "Gas": 0.5481,
-      "Hydro": -0.0041,
-      "Nuclear": 0.3165,
-      "Other Fossil": 0.0125,
-      "Other Renewables": 0,
-      "Solar": 0.0479,
-      "Wind": 0.0005
+      "Bioenergy": 0.0405,
+      "Coal": 0.0372,
+      "Gas": 0.5425,
+      "Hydro": 0.0015,
+      "Nuclear": 0.3133,
+      "Other Fossil": 0.0131,
+      "Other Renewables": 0,
+      "Solar": 0.0514,
+      "Wind": 0.0006
     },
     "2023": {
-      "Bioenergy": 0.0349,
-      "Coal": 0.0145,
-      "Gas": 0.566,
-      "Hydro": -0.0032,
-      "Nuclear": 0.3216,
+      "Bioenergy": 0.0346,
+      "Coal": 0.0144,
+      "Gas": 0.5517,
+      "Hydro": 0.0053,
+      "Nuclear": 0.3276,
       "Other Fossil": 0.0067,
       "Other Renewables": 0,
-      "Solar": 0.059,
+      "Solar": 0.0592,
       "Wind": 0.0005
     },
     "2024": {
@@ -3945,59 +3945,59 @@
   },
   "US-VT": {
     "2019": {
-      "Bioenergy": 0.181,
+      "Bioenergy": 0.1861,
       "Coal": 0,
       "Gas": 0.0008,
-      "Hydro": 0.5834,
+      "Hydro": 0.5838,
       "Nuclear": 0,
-      "Other Fossil": 0,
+      "Other Fossil": 0.0002,
       "Other Renewables": 0,
-      "Solar": 0.0674,
-      "Wind": 0.1674
+      "Solar": 0.0643,
+      "Wind": 0.1648
     },
     "2020": {
-      "Bioenergy": 0.2129,
+      "Bioenergy": 0.2127,
       "Coal": 0,
       "Gas": 0.0009,
-      "Hydro": 0.5238,
+      "Hydro": 0.5232,
       "Nuclear": 0,
-      "Other Fossil": -0.0004,
+      "Other Fossil": 0.0007,
       "Other Renewables": 0,
-      "Solar": 0.0848,
-      "Wind": 0.1779
+      "Solar": 0.0847,
+      "Wind": 0.1777
     },
     "2021": {
-      "Bioenergy": 0.2539,
+      "Bioenergy": 0.2355,
       "Coal": 0,
-      "Gas": 0.0009,
-      "Hydro": 0.5025,
+      "Gas": 0.001,
+      "Hydro": 0.5184,
       "Nuclear": 0,
       "Other Fossil": 0.0024,
       "Other Renewables": 0,
-      "Solar": 0.0841,
-      "Wind": 0.1562
+      "Solar": 0.0823,
+      "Wind": 0.1604
     },
     "2022": {
-      "Bioenergy": 0.1961,
+      "Bioenergy": 0.1934,
       "Coal": 0,
       "Gas": 0.0007,
-      "Hydro": 0.5076,
+      "Hydro": 0.5221,
       "Nuclear": 0,
-      "Other Fossil": 0.0039,
+      "Other Fossil": 0.0037,
       "Other Renewables": 0,
-      "Solar": 0.0965,
-      "Wind": 0.1952
+      "Solar": 0.0927,
+      "Wind": 0.1874
     },
     "2023": {
-      "Bioenergy": 0.1735,
+      "Bioenergy": 0.1727,
       "Coal": 0,
       "Gas": 0.0007,
-      "Hydro": 0.5591,
+      "Hydro": 0.541,
       "Nuclear": 0,
-      "Other Fossil": 0.0018,
+      "Other Fossil": 0.0017,
       "Other Renewables": 0,
-      "Solar": 0.1024,
-      "Wind": 0.1625
+      "Solar": 0.1052,
+      "Wind": 0.1787
     },
     "2024": {
       "Bioenergy": 0.1773,
@@ -4013,15 +4013,15 @@
   },
   "US-WA": {
     "2019": {
-      "Bioenergy": 0.0132,
-      "Coal": 0.0673,
-      "Gas": 0.1506,
-      "Hydro": 0.6195,
-      "Nuclear": 0.0832,
+      "Bioenergy": 0.0145,
+      "Coal": 0.0674,
+      "Gas": 0.1508,
+      "Hydro": 0.6202,
+      "Nuclear": 0.0833,
       "Other Fossil": 0.0008,
       "Other Renewables": 0,
       "Solar": 0.0004,
-      "Wind": 0.065
+      "Wind": 0.0627
     },
     "2020": {
       "Bioenergy": 0.012,
@@ -4035,26 +4035,26 @@
       "Wind": 0.0798
     },
     "2021": {
-      "Bioenergy": 0.0147,
-      "Coal": 0.0304,
-      "Gas": 0.1497,
-      "Hydro": 0.6392,
-      "Nuclear": 0.0745,
+      "Bioenergy": 0.0136,
+      "Coal": 0.0283,
+      "Gas": 0.1518,
+      "Hydro": 0.6443,
+      "Nuclear": 0.0768,
       "Other Fossil": 0.0009,
       "Other Renewables": 0,
       "Solar": 0.0005,
-      "Wind": 0.0902
+      "Wind": 0.0839
     },
     "2022": {
-      "Bioenergy": 0.0113,
+      "Bioenergy": 0.0112,
       "Coal": 0.0306,
       "Gas": 0.1268,
-      "Hydro": 0.6765,
+      "Hydro": 0.6764,
       "Nuclear": 0.0844,
       "Other Fossil": 0.0009,
       "Other Renewables": 0,
-      "Solar": 0.0006,
-      "Wind": 0.0691
+      "Solar": 0.0007,
+      "Wind": 0.069
     },
     "2023": {
       "Bioenergy": 0.0125,
@@ -4081,37 +4081,37 @@
   },
   "US-WI": {
     "2019": {
-      "Bioenergy": 0.0213,
-      "Coal": 0.421,
-      "Gas": 0.3251,
-      "Hydro": 0.0422,
-      "Nuclear": 0.1604,
-      "Other Fossil": 0.0028,
+      "Bioenergy": 0.0212,
+      "Coal": 0.4195,
+      "Gas": 0.3239,
+      "Hydro": 0.0421,
+      "Nuclear": 0.1598,
+      "Other Fossil": 0.0029,
       "Other Renewables": 0,
       "Solar": 0.0006,
-      "Wind": 0.0266
+      "Wind": 0.0299
     },
     "2020": {
-      "Bioenergy": 0.0193,
-      "Coal": 0.3998,
-      "Gas": 0.3474,
-      "Hydro": 0.0478,
-      "Nuclear": 0.1543,
-      "Other Fossil": 0.0021,
+      "Bioenergy": 0.0185,
+      "Coal": 0.3867,
+      "Gas": 0.3581,
+      "Hydro": 0.0454,
+      "Nuclear": 0.159,
+      "Other Fossil": 0.0022,
       "Other Renewables": 0,
       "Solar": 0.0015,
-      "Wind": 0.0278
+      "Wind": 0.0287
     },
     "2021": {
-      "Bioenergy": 0.0156,
-      "Coal": 0.4154,
-      "Gas": 0.3395,
-      "Hydro": 0.0341,
-      "Nuclear": 0.1586,
-      "Other Fossil": 0.0055,
+      "Bioenergy": 0.0167,
+      "Coal": 0.427,
+      "Gas": 0.332,
+      "Hydro": 0.0334,
+      "Nuclear": 0.1551,
+      "Other Fossil": 0.0054,
       "Other Renewables": 0,
-      "Solar": 0.0058,
-      "Wind": 0.0253
+      "Solar": 0.0057,
+      "Wind": 0.0248
     },
     "2022": {
       "Bioenergy": 0.0188,
@@ -4125,15 +4125,15 @@
       "Wind": 0.0296
     },
     "2023": {
-      "Bioenergy": 0.016,
-      "Coal": 0.3227,
-      "Gas": 0.4345,
-      "Hydro": 0.0246,
-      "Nuclear": 0.1495,
-      "Other Fossil": 0.0015,
+      "Bioenergy": 0.0161,
+      "Coal": 0.324,
+      "Gas": 0.4363,
+      "Hydro": 0.0247,
+      "Nuclear": 0.1501,
+      "Other Fossil": 0.0014,
       "Other Renewables": 0,
-      "Solar": 0.0208,
-      "Wind": 0.0305
+      "Solar": 0.0196,
+      "Wind": 0.0278
     },
     "2024": {
       "Bioenergy": 0.0148,
@@ -4150,14 +4150,14 @@
   "US-WV": {
     "2019": {
       "Bioenergy": 0,
-      "Coal": 0.9104,
-      "Gas": 0.0369,
-      "Hydro": 0.0256,
+      "Coal": 0.9102,
+      "Gas": 0.0357,
+      "Hydro": 0.0267,
       "Nuclear": 0,
       "Other Fossil": 0.0019,
       "Other Renewables": 0,
       "Solar": 0,
-      "Wind": 0.0252
+      "Wind": 0.0255
     },
     "2020": {
       "Bioenergy": 0.0001,
@@ -4172,25 +4172,25 @@
     },
     "2021": {
       "Bioenergy": 0.0002,
-      "Coal": 0.9022,
-      "Gas": 0.0433,
-      "Hydro": 0.0268,
+      "Coal": 0.9063,
+      "Gas": 0.0407,
+      "Hydro": 0.0259,
       "Nuclear": 0,
       "Other Fossil": 0.0023,
       "Other Renewables": 0,
       "Solar": 0,
-      "Wind": 0.0253
+      "Wind": 0.0247
     },
     "2022": {
       "Bioenergy": 0.0002,
-      "Coal": 0.8996,
-      "Gas": 0.0362,
-      "Hydro": 0.0278,
+      "Coal": 0.8951,
+      "Gas": 0.0379,
+      "Hydro": 0.029,
       "Nuclear": 0,
-      "Other Fossil": 0.0023,
+      "Other Fossil": 0.0024,
       "Other Renewables": 0,
       "Solar": 0,
-      "Wind": 0.0339
+      "Wind": 0.0354
     },
     "2023": {
       "Bioenergy": 0,
@@ -4218,14 +4218,14 @@
   "US-WY": {
     "2019": {
       "Bioenergy": 0,
-      "Coal": 0.8374,
-      "Gas": 0.0313,
-      "Hydro": 0.0241,
+      "Coal": 0.8394,
+      "Gas": 0.0312,
+      "Hydro": 0.0235,
       "Nuclear": 0,
       "Other Fossil": 0.0028,
       "Other Renewables": 0,
-      "Solar": 0.0044,
-      "Wind": 0.1
+      "Solar": 0.0043,
+      "Wind": 0.0988
     },
     "2020": {
       "Bioenergy": 0,
@@ -4251,11 +4251,11 @@
     },
     "2022": {
       "Bioenergy": 0,
-      "Coal": 0.7235,
-      "Gas": 0.043,
+      "Coal": 0.7233,
+      "Gas": 0.0429,
       "Hydro": 0.0161,
       "Nuclear": 0,
-      "Other Fossil": 0.0026,
+      "Other Fossil": 0.0028,
       "Other Renewables": 0,
       "Solar": 0.004,
       "Wind": 0.2109