npm - @digital4better/data - Versions diffs - 1.1.12 → 1.1.14 - Mend

@digital4better/data 1.1.12 → 1.1.14

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 +176 -176
package/data/factor/subdivision-monthly-green.json +1584 -1584
package/data/factor/subdivision-monthly.csv +176 -176
package/data/factor/subdivision-monthly.json +1584 -1584
package/data/factor/subdivision-yearly-green.csv +183 -183
package/data/factor/subdivision-yearly-green.json +1646 -1646
package/data/factor/subdivision-yearly.csv +183 -183
package/data/factor/subdivision-yearly.json +1646 -1646
package/data/mix/subdivision-monthly-green.csv +176 -176
package/data/mix/subdivision-monthly-green.json +576 -576
package/data/mix/subdivision-monthly.csv +176 -176
package/data/mix/subdivision-monthly.json +1164 -1164
package/data/mix/subdivision-yearly-green.csv +183 -183
package/data/mix/subdivision-yearly-green.json +614 -614
package/data/mix/subdivision-yearly.csv +183 -183
package/data/mix/subdivision-yearly.json +1112 -1112
package/package.json +1 -1

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

@@ -495,34 +495,34 @@
   },
   "US-AK": {
     "2019": {
-      "Bioenergy": 0.0208,
-      "Hydro": 0.9001,
+      "Bioenergy": 0.021,
+      "Hydro": 0.9053,
       "Solar": 0,
-      "Wind": 0.0791
+      "Wind": 0.0737
     },
     "2020": {
-      "Bioenergy": 0.0201,
-      "Hydro": 0.9074,
+      "Bioenergy": 0.0202,
+      "Hydro": 0.9132,
       "Solar": 0,
-      "Wind": 0.0725
+      "Wind": 0.0665
     },
     "2021": {
-      "Bioenergy": 0.0206,
-      "Hydro": 0.912,
+      "Bioenergy": 0.02,
+      "Hydro": 0.9072,
       "Solar": 0,
-      "Wind": 0.0674
+      "Wind": 0.0728
     },
     "2022": {
-      "Bioenergy": 0.0216,
-      "Hydro": 0.9049,
+      "Bioenergy": 0.0221,
+      "Hydro": 0.904,
       "Solar": 0,
-      "Wind": 0.0736
+      "Wind": 0.0739
     },
     "2023": {
-      "Bioenergy": 0.0267,
-      "Hydro": 0.8949,
+      "Bioenergy": 0.0257,
+      "Hydro": 0.8977,
       "Solar": 0,
-      "Wind": 0.0784
+      "Wind": 0.0767
     },
     "2024": {
       "Bioenergy": 0.024,
@@ -533,21 +533,21 @@
   },
   "US-AL": {
     "2019": {
-      "Bioenergy": 0.2068,
-      "Hydro": 0.7685,
-      "Solar": 0.0247,
+      "Bioenergy": 0.2362,
+      "Hydro": 0.7389,
+      "Solar": 0.0249,
       "Wind": 0
     },
     "2020": {
-      "Bioenergy": 0.1942,
-      "Hydro": 0.7841,
-      "Solar": 0.0217,
+      "Bioenergy": 0.1811,
+      "Hydro": 0.7968,
+      "Solar": 0.022,
       "Wind": 0
     },
     "2021": {
-      "Bioenergy": 0.2152,
-      "Hydro": 0.7518,
-      "Solar": 0.033,
+      "Bioenergy": 0.2161,
+      "Hydro": 0.7517,
+      "Solar": 0.0322,
       "Wind": 0
     },
     "2022": {
@@ -557,9 +557,9 @@
       "Wind": 0
     },
     "2023": {
-      "Bioenergy": 0.215,
-      "Hydro": 0.7131,
-      "Solar": 0.0719,
+      "Bioenergy": 0.2152,
+      "Hydro": 0.6939,
+      "Solar": 0.0909,
       "Wind": 0
     },
     "2024": {
@@ -571,9 +571,9 @@
   },
   "US-AR": {
     "2019": {
-      "Bioenergy": 0.2378,
-      "Hydro": 0.7271,
-      "Solar": 0.0351,
+      "Bioenergy": 0.2448,
+      "Hydro": 0.7191,
+      "Solar": 0.0361,
       "Wind": 0
     },
     "2020": {
@@ -583,21 +583,21 @@
       "Wind": 0
     },
     "2021": {
-      "Bioenergy": 0.1579,
-      "Hydro": 0.757,
-      "Solar": 0.0851,
+      "Bioenergy": 0.157,
+      "Hydro": 0.7524,
+      "Solar": 0.0907,
       "Wind": 0
     },
     "2022": {
-      "Bioenergy": 0.1537,
-      "Hydro": 0.7004,
-      "Solar": 0.1459,
+      "Bioenergy": 0.1666,
+      "Hydro": 0.7003,
+      "Solar": 0.1331,
       "Wind": 0
     },
     "2023": {
-      "Bioenergy": 0.1424,
-      "Hydro": 0.703,
-      "Solar": 0.1545,
+      "Bioenergy": 0.1451,
+      "Hydro": 0.7017,
+      "Solar": 0.1532,
       "Wind": 0
     },
     "2024": {
@@ -621,10 +621,10 @@
       "Wind": 0.0488
     },
     "2021": {
-      "Bioenergy": 0.0157,
-      "Hydro": 0.3864,
-      "Solar": 0.4883,
-      "Wind": 0.1096
+      "Bioenergy": 0.0143,
+      "Hydro": 0.4127,
+      "Solar": 0.4568,
+      "Wind": 0.1162
     },
     "2022": {
       "Bioenergy": 0.0144,
@@ -633,10 +633,10 @@
       "Wind": 0.1099
     },
     "2023": {
-      "Bioenergy": 0.0084,
-      "Hydro": 0.4122,
-      "Solar": 0.4645,
-      "Wind": 0.1149
+      "Bioenergy": 0.0074,
+      "Hydro": 0.3843,
+      "Solar": 0.4889,
+      "Wind": 0.1194
     },
     "2024": {
       "Bioenergy": 0,
@@ -647,34 +647,34 @@
   },
   "US-CA": {
     "2019": {
-      "Bioenergy": 0.0692,
-      "Hydro": 0.4464,
-      "Solar": 0.33,
-      "Wind": 0.1544
+      "Bioenergy": 0.0701,
+      "Hydro": 0.4521,
+      "Solar": 0.3214,
+      "Wind": 0.1564
     },
     "2020": {
-      "Bioenergy": 0.0768,
-      "Hydro": 0.2906,
-      "Solar": 0.4386,
-      "Wind": 0.194
+      "Bioenergy": 0.0796,
+      "Hydro": 0.3013,
+      "Solar": 0.4274,
+      "Wind": 0.1918
     },
     "2021": {
-      "Bioenergy": 0.0729,
-      "Hydro": 0.1981,
-      "Solar": 0.5079,
-      "Wind": 0.2211
+      "Bioenergy": 0.0763,
+      "Hydro": 0.2076,
+      "Solar": 0.4975,
+      "Wind": 0.2186
     },
     "2022": {
-      "Bioenergy": 0.0641,
-      "Hydro": 0.2308,
-      "Solar": 0.5119,
-      "Wind": 0.1932
+      "Bioenergy": 0.0696,
+      "Hydro": 0.2295,
+      "Solar": 0.5089,
+      "Wind": 0.192
     },
     "2023": {
-      "Bioenergy": 0.0478,
-      "Hydro": 0.3115,
-      "Solar": 0.4717,
-      "Wind": 0.169
+      "Bioenergy": 0.0529,
+      "Hydro": 0.3362,
+      "Solar": 0.4497,
+      "Wind": 0.1612
     },
     "2024": {
       "Bioenergy": 0.0711,
@@ -685,34 +685,34 @@
   },
   "US-CO": {
     "2019": {
-      "Bioenergy": 0.0107,
-      "Hydro": 0.117,
-      "Solar": 0.088,
-      "Wind": 0.7843
+      "Bioenergy": 0.011,
+      "Hydro": 0.1035,
+      "Solar": 0.0866,
+      "Wind": 0.7989
     },
     "2020": {
-      "Bioenergy": 0.0093,
-      "Hydro": 0.0845,
-      "Solar": 0.0889,
-      "Wind": 0.8173
+      "Bioenergy": 0.011,
+      "Hydro": 0.0998,
+      "Solar": 0.0929,
+      "Wind": 0.7963
     },
     "2021": {
-      "Bioenergy": 0.0084,
-      "Hydro": 0.0779,
-      "Solar": 0.0928,
-      "Wind": 0.8209
+      "Bioenergy": 0.0091,
+      "Hydro": 0.0849,
+      "Solar": 0.0933,
+      "Wind": 0.8127
     },
     "2022": {
-      "Bioenergy": 0.0074,
+      "Bioenergy": 0.008,
       "Hydro": 0.0628,
-      "Solar": 0.1172,
-      "Wind": 0.8126
+      "Solar": 0.1171,
+      "Wind": 0.8121
     },
     "2023": {
       "Bioenergy": 0.0066,
-      "Hydro": 0.0644,
-      "Solar": 0.1726,
-      "Wind": 0.7564
+      "Hydro": 0.0677,
+      "Solar": 0.172,
+      "Wind": 0.7537
     },
     "2024": {
       "Bioenergy": 0.0074,
@@ -723,10 +723,10 @@
   },
   "US-CT": {
     "2019": {
-      "Bioenergy": 0.5438,
-      "Hydro": 0.3424,
-      "Solar": 0.1052,
-      "Wind": 0.0086
+      "Bioenergy": 0.5485,
+      "Hydro": 0.3468,
+      "Solar": 0.0967,
+      "Wind": 0.0079
     },
     "2020": {
       "Bioenergy": 0.5857,
@@ -735,9 +735,9 @@
       "Wind": 0.0091
     },
     "2021": {
-      "Bioenergy": 0.4686,
-      "Hydro": 0.3572,
-      "Solar": 0.1656,
+      "Bioenergy": 0.4703,
+      "Hydro": 0.3257,
+      "Solar": 0.1953,
       "Wind": 0.0087
     },
     "2022": {
@@ -747,10 +747,10 @@
       "Wind": 0.0096
     },
     "2023": {
-      "Bioenergy": 0.3679,
-      "Hydro": 0.2527,
-      "Solar": 0.3717,
-      "Wind": 0.0077
+      "Bioenergy": 0.3844,
+      "Hydro": 0.2469,
+      "Solar": 0.3612,
+      "Wind": 0.0075
     },
     "2024": {
       "Bioenergy": 0.375,
@@ -761,10 +761,10 @@
   },
   "US-DE": {
     "2019": {
-      "Bioenergy": 0.5181,
+      "Bioenergy": 0.5045,
       "Hydro": 0,
-      "Solar": 0.4411,
-      "Wind": 0.0408
+      "Solar": 0.451,
+      "Wind": 0.0445
     },
     "2020": {
       "Bioenergy": 0.5483,
@@ -773,22 +773,22 @@
       "Wind": 0.0394
     },
     "2021": {
-      "Bioenergy": 0.5417,
+      "Bioenergy": 0.5449,
       "Hydro": 0,
-      "Solar": 0.4224,
-      "Wind": 0.0358
+      "Solar": 0.4187,
+      "Wind": 0.0364
     },
     "2022": {
-      "Bioenergy": 0.5151,
+      "Bioenergy": 0.5363,
       "Hydro": 0,
-      "Solar": 0.4538,
-      "Wind": 0.0311
+      "Solar": 0.434,
+      "Wind": 0.0297
     },
     "2023": {
-      "Bioenergy": 0.3197,
+      "Bioenergy": 0.3373,
       "Hydro": 0,
-      "Solar": 0.6625,
-      "Wind": 0.0179
+      "Solar": 0.6449,
+      "Wind": 0.0178
     },
     "2024": {
       "Bioenergy": 0.4104,
@@ -799,9 +799,9 @@
   },
   "US-FL": {
     "2019": {
-      "Bioenergy": 0.4977,
-      "Hydro": 0.0236,
-      "Solar": 0.4787,
+      "Bioenergy": 0.5553,
+      "Hydro": 0.0261,
+      "Solar": 0.4186,
       "Wind": 0
     },
     "2020": {
@@ -811,9 +811,9 @@
       "Wind": 0
     },
     "2021": {
-      "Bioenergy": 0.3125,
-      "Hydro": 0.0186,
-      "Solar": 0.6689,
+      "Bioenergy": 0.2975,
+      "Hydro": 0.0173,
+      "Solar": 0.6852,
       "Wind": 0
     },
     "2022": {
@@ -837,33 +837,33 @@
   },
   "US-GA": {
     "2019": {
-      "Bioenergy": 0.5088,
-      "Hydro": 0.2903,
-      "Solar": 0.2009,
+      "Bioenergy": 0.5209,
+      "Hydro": 0.2734,
+      "Solar": 0.2057,
       "Wind": 0
     },
     "2020": {
-      "Bioenergy": 0.4309,
-      "Hydro": 0.3126,
-      "Solar": 0.2565,
+      "Bioenergy": 0.411,
+      "Hydro": 0.3235,
+      "Solar": 0.2654,
       "Wind": 0
     },
     "2021": {
-      "Bioenergy": 0.4219,
-      "Hydro": 0.2546,
-      "Solar": 0.3235,
+      "Bioenergy": 0.3863,
+      "Hydro": 0.2375,
+      "Solar": 0.3762,
       "Wind": 0
     },
     "2022": {
-      "Bioenergy": 0.3933,
-      "Hydro": 0.1739,
-      "Solar": 0.4327,
+      "Bioenergy": 0.3766,
+      "Hydro": 0.1666,
+      "Solar": 0.4568,
       "Wind": 0
     },
     "2023": {
-      "Bioenergy": 0.3363,
-      "Hydro": 0.164,
-      "Solar": 0.4996,
+      "Bioenergy": 0.3138,
+      "Hydro": 0.1821,
+      "Solar": 0.5041,
       "Wind": 0
     },
     "2024": {
@@ -875,10 +875,10 @@
   },
   "US-HI": {
     "2019": {
-      "Bioenergy": 0.2443,
-      "Hydro": 0.0782,
-      "Solar": 0.2313,
-      "Wind": 0.4462
+      "Bioenergy": 0.2463,
+      "Hydro": 0.0799,
+      "Solar": 0.2266,
+      "Wind": 0.4472
     },
     "2020": {
       "Bioenergy": 0.179,
@@ -887,22 +887,22 @@
       "Wind": 0.4137
     },
     "2021": {
-      "Bioenergy": 0.1808,
+      "Bioenergy": 0.1765,
       "Hydro": 0.0736,
-      "Solar": 0.3246,
-      "Wind": 0.421
+      "Solar": 0.3206,
+      "Wind": 0.4293
     },
     "2022": {
-      "Bioenergy": 0.1767,
-      "Hydro": 0.0702,
+      "Bioenergy": 0.1743,
+      "Hydro": 0.0676,
       "Solar": 0.3541,
-      "Wind": 0.399
+      "Wind": 0.4041
     },
     "2023": {
-      "Bioenergy": 0.1789,
+      "Bioenergy": 0.1822,
       "Hydro": 0,
-      "Solar": 0.4299,
-      "Wind": 0.3912
+      "Solar": 0.438,
+      "Wind": 0.3798
     },
     "2024": {
       "Bioenergy": 0.1856,
@@ -913,28 +913,28 @@
   },
   "US-IA": {
     "2019": {
-      "Bioenergy": 0.0066,
+      "Bioenergy": 0.0072,
       "Hydro": 0.0246,
       "Solar": 0.0005,
-      "Wind": 0.9682
+      "Wind": 0.9677
     },
     "2020": {
-      "Bioenergy": 0.0053,
-      "Hydro": 0.0276,
+      "Bioenergy": 0.0059,
+      "Hydro": 0.0289,
       "Solar": 0.0006,
-      "Wind": 0.9665
+      "Wind": 0.9646
     },
     "2021": {
-      "Bioenergy": 0.0059,
-      "Hydro": 0.0262,
+      "Bioenergy": 0.0054,
+      "Hydro": 0.0286,
       "Solar": 0.0062,
-      "Wind": 0.9617
+      "Wind": 0.9598
     },
     "2022": {
-      "Bioenergy": 0.0054,
-      "Hydro": 0.0231,
-      "Solar": 0.0079,
-      "Wind": 0.9636
+      "Bioenergy": 0.0046,
+      "Hydro": 0.0213,
+      "Solar": 0.0082,
+      "Wind": 0.9659
     },
     "2023": {
       "Bioenergy": 0.0047,
@@ -951,10 +951,10 @@
   },
   "US-ID": {
     "2019": {
-      "Bioenergy": 0.0395,
-      "Hydro": 0.742,
-      "Solar": 0.041,
-      "Wind": 0.1775
+      "Bioenergy": 0.0342,
+      "Hydro": 0.7425,
+      "Solar": 0.04,
+      "Wind": 0.1833
     },
     "2020": {
       "Bioenergy": 0.039,
@@ -963,10 +963,10 @@
       "Wind": 0.2072
     },
     "2021": {
-      "Bioenergy": 0.0417,
-      "Hydro": 0.6816,
-      "Solar": 0.0482,
-      "Wind": 0.2285
+      "Bioenergy": 0.0419,
+      "Hydro": 0.6799,
+      "Solar": 0.0489,
+      "Wind": 0.2293
     },
     "2022": {
       "Bioenergy": 0.039,
@@ -975,10 +975,10 @@
       "Wind": 0.2069
     },
     "2023": {
-      "Bioenergy": 0.0422,
-      "Hydro": 0.6505,
-      "Solar": 0.0832,
-      "Wind": 0.224
+      "Bioenergy": 0.0477,
+      "Hydro": 0.6334,
+      "Solar": 0.0864,
+      "Wind": 0.2325
     },
     "2024": {
       "Bioenergy": 0.0456,
@@ -989,10 +989,10 @@
   },
   "US-IL": {
     "2019": {
-      "Bioenergy": 0.0245,
-      "Hydro": 0.0074,
-      "Solar": 0.0039,
-      "Wind": 0.9642
+      "Bioenergy": 0.0297,
+      "Hydro": 0.009,
+      "Solar": 0.0041,
+      "Wind": 0.9573
     },
     "2020": {
       "Bioenergy": 0.0232,
@@ -1001,10 +1001,10 @@
       "Wind": 0.964
     },
     "2021": {
-      "Bioenergy": 0.0193,
-      "Hydro": 0.0068,
-      "Solar": 0.0284,
-      "Wind": 0.9455
+      "Bioenergy": 0.0162,
+      "Hydro": 0.0057,
+      "Solar": 0.0256,
+      "Wind": 0.9525
     },
     "2022": {
       "Bioenergy": 0.0111,
@@ -1013,10 +1013,10 @@
       "Wind": 0.9234
     },
     "2023": {
-      "Bioenergy": 0.0106,
+      "Bioenergy": 0.0115,
       "Hydro": 0.0013,
-      "Solar": 0.0686,
-      "Wind": 0.9195
+      "Solar": 0.0735,
+      "Wind": 0.9137
     },
     "2024": {
       "Bioenergy": 0.009,
@@ -1027,34 +1027,34 @@
   },
   "US-IN": {
     "2019": {
-      "Bioenergy": 0.0577,
-      "Hydro": 0.0347,
-      "Solar": 0.0419,
-      "Wind": 0.8658
+      "Bioenergy": 0.0531,
+      "Hydro": 0.0322,
+      "Solar": 0.0422,
+      "Wind": 0.8725
     },
     "2020": {
-      "Bioenergy": 0.0548,
-      "Hydro": 0.0332,
-      "Solar": 0.044,
-      "Wind": 0.8681
+      "Bioenergy": 0.0608,
+      "Hydro": 0.0368,
+      "Solar": 0.0487,
+      "Wind": 0.8537
     },
     "2021": {
-      "Bioenergy": 0.0544,
-      "Hydro": 0.0458,
-      "Solar": 0.0678,
-      "Wind": 0.832
+      "Bioenergy": 0.0546,
+      "Hydro": 0.046,
+      "Solar": 0.0647,
+      "Wind": 0.8347
     },
     "2022": {
-      "Bioenergy": 0.0301,
-      "Hydro": 0.0335,
-      "Solar": 0.0917,
-      "Wind": 0.8447
+      "Bioenergy": 0.0326,
+      "Hydro": 0.0314,
+      "Solar": 0.0916,
+      "Wind": 0.8443
     },
     "2023": {
-      "Bioenergy": 0.032,
-      "Hydro": 0.0269,
-      "Solar": 0.1635,
-      "Wind": 0.7776
+      "Bioenergy": 0.0295,
+      "Hydro": 0.027,
+      "Solar": 0.1639,
+      "Wind": 0.7796
     },
     "2024": {
       "Bioenergy": 0.0276,
@@ -1065,10 +1065,10 @@
   },
   "US-KS": {
     "2019": {
-      "Bioenergy": 0.0035,
-      "Hydro": 0.0012,
-      "Solar": 0.0006,
-      "Wind": 0.9947
+      "Bioenergy": 0.003,
+      "Hydro": 0.0009,
+      "Solar": 0.0005,
+      "Wind": 0.9956
     },
     "2020": {
       "Bioenergy": 0.0026,
@@ -1077,22 +1077,22 @@
       "Wind": 0.9936
     },
     "2021": {
-      "Bioenergy": 0.0025,
-      "Hydro": 0.0013,
-      "Solar": 0.0026,
-      "Wind": 0.9936
+      "Bioenergy": 0.0023,
+      "Hydro": 0.0012,
+      "Solar": 0.0022,
+      "Wind": 0.9943
     },
     "2022": {
-      "Bioenergy": 0.002,
+      "Bioenergy": 0.0019,
       "Hydro": 0.0008,
       "Solar": 0.0025,
-      "Wind": 0.9947
+      "Wind": 0.9949
     },
     "2023": {
-      "Bioenergy": 0.0024,
-      "Hydro": 0.0005,
+      "Bioenergy": 0.0021,
+      "Hydro": 0.0004,
       "Solar": 0.0028,
-      "Wind": 0.9942
+      "Wind": 0.9947
     },
     "2024": {
       "Bioenergy": 0.0022,
@@ -1103,9 +1103,9 @@
   },
   "US-KY": {
     "2019": {
-      "Bioenergy": 0.0814,
-      "Hydro": 0.9092,
-      "Solar": 0.0093,
+      "Bioenergy": 0.0872,
+      "Hydro": 0.9032,
+      "Solar": 0.0096,
       "Wind": 0
     },
     "2020": {
@@ -1121,15 +1121,15 @@
       "Wind": 0
     },
     "2022": {
-      "Bioenergy": 0.0901,
-      "Hydro": 0.9012,
+      "Bioenergy": 0.0843,
+      "Hydro": 0.9068,
       "Solar": 0.0088,
       "Wind": 0
     },
     "2023": {
-      "Bioenergy": 0.0804,
-      "Hydro": 0.889,
-      "Solar": 0.0306,
+      "Bioenergy": 0.0862,
+      "Hydro": 0.8834,
+      "Solar": 0.0304,
       "Wind": 0
     },
     "2024": {
@@ -1143,25 +1143,25 @@
     "2019": {
       "Bioenergy": 0.6005,
       "Hydro": 0.3991,
-      "Solar": 0.0005,
+      "Solar": 0.0004,
       "Wind": 0
     },
     "2020": {
-      "Bioenergy": 0.6299,
-      "Hydro": 0.3584,
-      "Solar": 0.0117,
+      "Bioenergy": 0.5978,
+      "Hydro": 0.3901,
+      "Solar": 0.0121,
       "Wind": 0
     },
     "2021": {
-      "Bioenergy": 0.659,
-      "Hydro": 0.2994,
-      "Solar": 0.0416,
+      "Bioenergy": 0.6204,
+      "Hydro": 0.3333,
+      "Solar": 0.0463,
       "Wind": 0
     },
     "2022": {
-      "Bioenergy": 0.6512,
-      "Hydro": 0.2873,
-      "Solar": 0.0615,
+      "Bioenergy": 0.6562,
+      "Hydro": 0.2895,
+      "Solar": 0.0543,
       "Wind": 0
     },
     "2023": {
@@ -1179,10 +1179,10 @@
   },
   "US-MA": {
     "2019": {
-      "Bioenergy": 0.3603,
-      "Hydro": 0.2003,
-      "Solar": 0.3698,
-      "Wind": 0.0695
+      "Bioenergy": 0.3527,
+      "Hydro": 0.196,
+      "Solar": 0.3754,
+      "Wind": 0.0759
     },
     "2020": {
       "Bioenergy": 0.3256,
@@ -1197,16 +1197,16 @@
       "Wind": 0.0632
     },
     "2022": {
-      "Bioenergy": 0.2629,
-      "Hydro": 0.1337,
-      "Solar": 0.5429,
-      "Wind": 0.0605
+      "Bioenergy": 0.2749,
+      "Hydro": 0.1398,
+      "Solar": 0.5278,
+      "Wind": 0.0575
     },
     "2023": {
-      "Bioenergy": 0.2599,
-      "Hydro": 0.1286,
-      "Solar": 0.5563,
-      "Wind": 0.0551
+      "Bioenergy": 0.2749,
+      "Hydro": 0.1304,
+      "Solar": 0.5411,
+      "Wind": 0.0537
     },
     "2024": {
       "Bioenergy": 0.2808,
@@ -1217,10 +1217,10 @@
   },
   "US-MD": {
     "2019": {
-      "Bioenergy": 0.1077,
-      "Hydro": 0.6133,
-      "Solar": 0.1338,
-      "Wind": 0.1452
+      "Bioenergy": 0.1065,
+      "Hydro": 0.5968,
+      "Solar": 0.1423,
+      "Wind": 0.1544
     },
     "2020": {
       "Bioenergy": 0.1086,
@@ -1235,16 +1235,16 @@
       "Wind": 0.143
     },
     "2022": {
-      "Bioenergy": 0.0947,
-      "Hydro": 0.5385,
-      "Solar": 0.2162,
-      "Wind": 0.1506
+      "Bioenergy": 0.0878,
+      "Hydro": 0.5426,
+      "Solar": 0.2179,
+      "Wind": 0.1518
     },
     "2023": {
-      "Bioenergy": 0.0948,
-      "Hydro": 0.4959,
-      "Solar": 0.2809,
-      "Wind": 0.1284
+      "Bioenergy": 0.0938,
+      "Hydro": 0.4905,
+      "Solar": 0.2779,
+      "Wind": 0.1378
     },
     "2024": {
       "Bioenergy": 0.1148,
@@ -1255,34 +1255,34 @@
   },
   "US-ME": {
     "2019": {
-      "Bioenergy": 0.2702,
-      "Hydro": 0.4226,
+      "Bioenergy": 0.2905,
+      "Hydro": 0.4137,
       "Solar": 0.0008,
-      "Wind": 0.3063
+      "Wind": 0.2949
     },
     "2020": {
-      "Bioenergy": 0.2642,
-      "Hydro": 0.3984,
-      "Solar": 0.0041,
-      "Wind": 0.3334
+      "Bioenergy": 0.2728,
+      "Hydro": 0.4115,
+      "Solar": 0.0036,
+      "Wind": 0.3121
     },
     "2021": {
-      "Bioenergy": 0.2768,
-      "Hydro": 0.3514,
-      "Solar": 0.0219,
-      "Wind": 0.35
+      "Bioenergy": 0.2801,
+      "Hydro": 0.3661,
+      "Solar": 0.0206,
+      "Wind": 0.3332
     },
     "2022": {
-      "Bioenergy": 0.2204,
-      "Hydro": 0.3708,
-      "Solar": 0.0561,
-      "Wind": 0.3526
+      "Bioenergy": 0.226,
+      "Hydro": 0.3816,
+      "Solar": 0.0539,
+      "Wind": 0.3385
     },
     "2023": {
-      "Bioenergy": 0.2017,
-      "Hydro": 0.3791,
-      "Solar": 0.0792,
-      "Wind": 0.3401
+      "Bioenergy": 0.2001,
+      "Hydro": 0.3866,
+      "Solar": 0.0735,
+      "Wind": 0.3398
     },
     "2024": {
       "Bioenergy": 0.2055,
@@ -1293,16 +1293,16 @@
   },
   "US-MI": {
     "2019": {
-      "Bioenergy": 0.2649,
-      "Hydro": 0.1012,
-      "Solar": 0.0152,
-      "Wind": 0.6187
+      "Bioenergy": 0.2675,
+      "Hydro": 0.1229,
+      "Solar": 0.0159,
+      "Wind": 0.5937
     },
     "2020": {
-      "Bioenergy": 0.2132,
-      "Hydro": 0.088,
-      "Solar": 0.0157,
-      "Wind": 0.6831
+      "Bioenergy": 0.1988,
+      "Hydro": 0.0831,
+      "Solar": 0.0162,
+      "Wind": 0.7019
     },
     "2021": {
       "Bioenergy": 0.2424,
@@ -1317,10 +1317,10 @@
       "Wind": 0.7156
     },
     "2023": {
-      "Bioenergy": 0.1715,
-      "Hydro": 0.0255,
-      "Solar": 0.1074,
-      "Wind": 0.6956
+      "Bioenergy": 0.152,
+      "Hydro": 0.0204,
+      "Solar": 0.1081,
+      "Wind": 0.7196
     },
     "2024": {
       "Bioenergy": 0.1219,
@@ -1331,10 +1331,10 @@
   },
   "US-MN": {
     "2019": {
-      "Bioenergy": 0.0822,
-      "Hydro": 0.073,
-      "Solar": 0.0864,
-      "Wind": 0.7584
+      "Bioenergy": 0.0884,
+      "Hydro": 0.0774,
+      "Solar": 0.0853,
+      "Wind": 0.7489
     },
     "2020": {
       "Bioenergy": 0.074,
@@ -1349,16 +1349,16 @@
       "Wind": 0.7448
     },
     "2022": {
-      "Bioenergy": 0.0651,
-      "Hydro": 0.0492,
-      "Solar": 0.1056,
-      "Wind": 0.7802
+      "Bioenergy": 0.0621,
+      "Hydro": 0.0497,
+      "Solar": 0.0995,
+      "Wind": 0.7888
     },
     "2023": {
-      "Bioenergy": 0.0576,
-      "Hydro": 0.0361,
-      "Solar": 0.1164,
-      "Wind": 0.79
+      "Bioenergy": 0.0577,
+      "Hydro": 0.0357,
+      "Solar": 0.108,
+      "Wind": 0.7987
     },
     "2024": {
       "Bioenergy": 0.0581,
@@ -1369,22 +1369,22 @@
   },
   "US-MO": {
     "2019": {
-      "Bioenergy": 0.0211,
-      "Hydro": 0.445,
-      "Solar": 0.017,
-      "Wind": 0.5169
+      "Bioenergy": 0.0228,
+      "Hydro": 0.4527,
+      "Solar": 0.0177,
+      "Wind": 0.5068
     },
     "2020": {
       "Bioenergy": 0.0215,
-      "Hydro": 0.3291,
+      "Hydro": 0.3288,
       "Solar": 0.019,
-      "Wind": 0.6304
+      "Wind": 0.6307
     },
     "2021": {
-      "Bioenergy": 0.0137,
-      "Hydro": 0.1743,
-      "Solar": 0.0138,
-      "Wind": 0.7983
+      "Bioenergy": 0.0149,
+      "Hydro": 0.2067,
+      "Solar": 0.0152,
+      "Wind": 0.7632
     },
     "2022": {
       "Bioenergy": 0.0121,
@@ -1393,10 +1393,10 @@
       "Wind": 0.8056
     },
     "2023": {
-      "Bioenergy": 0.0119,
-      "Hydro": 0.1412,
-      "Solar": 0.023,
-      "Wind": 0.8238
+      "Bioenergy": 0.0127,
+      "Hydro": 0.1288,
+      "Solar": 0.0199,
+      "Wind": 0.8386
     },
     "2024": {
       "Bioenergy": 0.0094,
@@ -1407,9 +1407,9 @@
   },
   "US-MS": {
     "2019": {
-      "Bioenergy": 0.8153,
+      "Bioenergy": 0.8228,
       "Hydro": 0,
-      "Solar": 0.1847,
+      "Solar": 0.1772,
       "Wind": 0
     },
     "2020": {
@@ -1425,15 +1425,15 @@
       "Wind": 0
     },
     "2022": {
-      "Bioenergy": 0.7422,
+      "Bioenergy": 0.7059,
       "Hydro": 0,
-      "Solar": 0.2578,
+      "Solar": 0.2941,
       "Wind": 0
     },
     "2023": {
-      "Bioenergy": 0.6893,
+      "Bioenergy": 0.7064,
       "Hydro": 0,
-      "Solar": 0.3107,
+      "Solar": 0.2936,
       "Wind": 0
     },
     "2024": {
@@ -1445,10 +1445,10 @@
   },
   "US-MT": {
     "2019": {
-      "Bioenergy": 0.0017,
-      "Hydro": 0.7999,
-      "Solar": 0.0023,
-      "Wind": 0.1961
+      "Bioenergy": 0.0018,
+      "Hydro": 0.8049,
+      "Solar": 0.0024,
+      "Wind": 0.191
     },
     "2020": {
       "Bioenergy": 0.0024,
@@ -1458,9 +1458,9 @@
     },
     "2021": {
       "Bioenergy": 0.0025,
-      "Hydro": 0.7306,
-      "Solar": 0.0027,
-      "Wind": 0.2642
+      "Hydro": 0.7236,
+      "Solar": 0.0026,
+      "Wind": 0.2712
     },
     "2022": {
       "Bioenergy": 0.002,
@@ -1469,10 +1469,10 @@
       "Wind": 0.2878
     },
     "2023": {
-      "Bioenergy": 0.002,
-      "Hydro": 0.6144,
-      "Solar": 0.02,
-      "Wind": 0.3635
+      "Bioenergy": 0.0025,
+      "Hydro": 0.6177,
+      "Solar": 0.0195,
+      "Wind": 0.3603
     },
     "2024": {
       "Bioenergy": 0.002,
@@ -1483,10 +1483,10 @@
   },
   "US-NC": {
     "2019": {
-      "Bioenergy": 0.1541,
-      "Hydro": 0.3739,
-      "Solar": 0.4398,
-      "Wind": 0.0322
+      "Bioenergy": 0.1587,
+      "Hydro": 0.3853,
+      "Solar": 0.4261,
+      "Wind": 0.0299
     },
     "2020": {
       "Bioenergy": 0.1279,
@@ -1495,22 +1495,22 @@
       "Wind": 0.0284
     },
     "2021": {
-      "Bioenergy": 0.1144,
-      "Hydro": 0.3288,
-      "Solar": 0.5309,
-      "Wind": 0.0259
+      "Bioenergy": 0.1089,
+      "Hydro": 0.3136,
+      "Solar": 0.5504,
+      "Wind": 0.0272
     },
     "2022": {
-      "Bioenergy": 0.1057,
-      "Hydro": 0.2646,
-      "Solar": 0.6005,
-      "Wind": 0.0291
+      "Bioenergy": 0.0996,
+      "Hydro": 0.2557,
+      "Solar": 0.6148,
+      "Wind": 0.0298
     },
     "2023": {
-      "Bioenergy": 0.1,
-      "Hydro": 0.2516,
-      "Solar": 0.6197,
-      "Wind": 0.0286
+      "Bioenergy": 0.0935,
+      "Hydro": 0.252,
+      "Solar": 0.6265,
+      "Wind": 0.0281
     },
     "2024": {
       "Bioenergy": 0.118,
@@ -1522,9 +1522,9 @@
   "US-ND": {
     "2019": {
       "Bioenergy": 0,
-      "Hydro": 0.2209,
+      "Hydro": 0.2175,
       "Solar": 0,
-      "Wind": 0.7791
+      "Wind": 0.7825
     },
     "2020": {
       "Bioenergy": 0,
@@ -1534,9 +1534,9 @@
     },
     "2021": {
       "Bioenergy": 0.0001,
-      "Hydro": 0.1156,
+      "Hydro": 0.1376,
       "Solar": 0,
-      "Wind": 0.8843
+      "Wind": 0.8623
     },
     "2022": {
       "Bioenergy": 0,
@@ -1559,10 +1559,10 @@
   },
   "US-NE": {
     "2019": {
-      "Bioenergy": 0.0091,
-      "Hydro": 0.1452,
-      "Solar": 0.0037,
-      "Wind": 0.8421
+      "Bioenergy": 0.0106,
+      "Hydro": 0.1688,
+      "Solar": 0.0038,
+      "Wind": 0.8167
     },
     "2020": {
       "Bioenergy": 0.0084,
@@ -1571,22 +1571,22 @@
       "Wind": 0.856
     },
     "2021": {
-      "Bioenergy": 0.0093,
-      "Hydro": 0.1135,
-      "Solar": 0.0058,
-      "Wind": 0.8713
+      "Bioenergy": 0.0071,
+      "Hydro": 0.1017,
+      "Solar": 0.0053,
+      "Wind": 0.886
     },
     "2022": {
-      "Bioenergy": 0.0064,
+      "Bioenergy": 0.006,
       "Hydro": 0.0765,
       "Solar": 0.0053,
-      "Wind": 0.9118
+      "Wind": 0.9122
     },
     "2023": {
-      "Bioenergy": 0.0073,
-      "Hydro": 0.0693,
-      "Solar": 0.0059,
-      "Wind": 0.9175
+      "Bioenergy": 0.0063,
+      "Hydro": 0.0608,
+      "Solar": 0.0064,
+      "Wind": 0.9265
     },
     "2024": {
       "Bioenergy": 0.0059,
@@ -1597,10 +1597,10 @@
   },
   "US-NH": {
     "2019": {
-      "Bioenergy": 0.4128,
-      "Hydro": 0.4529,
+      "Bioenergy": 0.3888,
+      "Hydro": 0.4686,
       "Solar": 0,
-      "Wind": 0.1343
+      "Wind": 0.1426
     },
     "2020": {
       "Bioenergy": 0.3298,
@@ -1609,22 +1609,22 @@
       "Wind": 0.2002
     },
     "2021": {
-      "Bioenergy": 0.3773,
-      "Hydro": 0.4164,
-      "Solar": 0.0015,
-      "Wind": 0.2048
+      "Bioenergy": 0.3699,
+      "Hydro": 0.4083,
+      "Solar": 0.0016,
+      "Wind": 0.2202
     },
     "2022": {
-      "Bioenergy": 0.3536,
-      "Hydro": 0.4677,
-      "Solar": 0.0015,
-      "Wind": 0.1771
+      "Bioenergy": 0.3395,
+      "Hydro": 0.4779,
+      "Solar": 0.0016,
+      "Wind": 0.181
     },
     "2023": {
-      "Bioenergy": 0.3113,
-      "Hydro": 0.4976,
+      "Bioenergy": 0.3061,
+      "Hydro": 0.4894,
       "Solar": 0,
-      "Wind": 0.1911
+      "Wind": 0.2045
     },
     "2024": {
       "Bioenergy": 0.3316,
@@ -1647,21 +1647,21 @@
       "Wind": 0.0102
     },
     "2021": {
-      "Bioenergy": 0.3532,
-      "Hydro": -0.0508,
-      "Solar": 0.6878,
-      "Wind": 0.0098
+      "Bioenergy": 0.3559,
+      "Hydro": -0.0506,
+      "Solar": 0.6845,
+      "Wind": 0.0101
     },
     "2022": {
-      "Bioenergy": 0.32,
-      "Hydro": -0.0631,
-      "Solar": 0.7327,
-      "Wind": 0.0104
+      "Bioenergy": 0.335,
+      "Hydro": -0.0617,
+      "Solar": 0.7165,
+      "Wind": 0.0102
     },
     "2023": {
-      "Bioenergy": 0.2923,
-      "Hydro": -0.0674,
-      "Solar": 0.7664,
+      "Bioenergy": 0.3103,
+      "Hydro": -0.0716,
+      "Solar": 0.7526,
       "Wind": 0.0087
     },
     "2024": {
@@ -1685,10 +1685,10 @@
       "Wind": 0.7851
     },
     "2021": {
-      "Bioenergy": 0.0021,
-      "Hydro": 0.0099,
-      "Solar": 0.1403,
-      "Wind": 0.8478
+      "Bioenergy": 0.002,
+      "Hydro": 0.0096,
+      "Solar": 0.1358,
+      "Wind": 0.8526
     },
     "2022": {
       "Bioenergy": 0.001,
@@ -1699,8 +1699,8 @@
     "2023": {
       "Bioenergy": 0.0011,
       "Hydro": 0,
-      "Solar": 0.1499,
-      "Wind": 0.849
+      "Solar": 0.1467,
+      "Wind": 0.8522
     },
     "2024": {
       "Bioenergy": 0.0017,
@@ -1711,9 +1711,9 @@
   },
   "US-NV": {
     "2019": {
-      "Bioenergy": 0.007,
-      "Hydro": 0.2968,
-      "Solar": 0.65,
+      "Bioenergy": 0.0076,
+      "Hydro": 0.2966,
+      "Solar": 0.6496,
       "Wind": 0.0462
     },
     "2020": {
@@ -1730,15 +1730,15 @@
     },
     "2022": {
       "Bioenergy": 0.0044,
-      "Hydro": 0.1513,
-      "Solar": 0.8155,
-      "Wind": 0.0288
+      "Hydro": 0.1521,
+      "Solar": 0.815,
+      "Wind": 0.0285
     },
     "2023": {
-      "Bioenergy": 0.0044,
-      "Hydro": 0.1152,
-      "Solar": 0.8547,
-      "Wind": 0.0257
+      "Bioenergy": 0.0048,
+      "Hydro": 0.124,
+      "Solar": 0.8458,
+      "Wind": 0.0254
     },
     "2024": {
       "Bioenergy": 0.006,
@@ -1749,10 +1749,10 @@
   },
   "US-NY": {
     "2019": {
-      "Bioenergy": 0.0573,
-      "Hydro": 0.8112,
-      "Solar": 0.0147,
-      "Wind": 0.1168
+      "Bioenergy": 0.0523,
+      "Hydro": 0.814,
+      "Solar": 0.0141,
+      "Wind": 0.1197
     },
     "2020": {
       "Bioenergy": 0.0536,
@@ -1761,10 +1761,10 @@
       "Wind": 0.1237
     },
     "2021": {
-      "Bioenergy": 0.0606,
-      "Hydro": 0.7716,
-      "Solar": 0.032,
-      "Wind": 0.1357
+      "Bioenergy": 0.0499,
+      "Hydro": 0.8023,
+      "Solar": 0.0304,
+      "Wind": 0.1174
     },
     "2022": {
       "Bioenergy": 0.0534,
@@ -1773,10 +1773,10 @@
       "Wind": 0.1297
     },
     "2023": {
-      "Bioenergy": 0.0487,
-      "Hydro": 0.7479,
-      "Solar": 0.0684,
-      "Wind": 0.135
+      "Bioenergy": 0.0445,
+      "Hydro": 0.7366,
+      "Solar": 0.0736,
+      "Wind": 0.1453
     },
     "2024": {
       "Bioenergy": 0.045,
@@ -1787,10 +1787,10 @@
   },
   "US-OH": {
     "2019": {
-      "Bioenergy": 0.1826,
-      "Hydro": 0.1075,
-      "Solar": 0.0431,
-      "Wind": 0.6668
+      "Bioenergy": 0.2094,
+      "Hydro": 0.123,
+      "Solar": 0.0433,
+      "Wind": 0.6243
     },
     "2020": {
       "Bioenergy": 0.1925,
@@ -1805,16 +1805,16 @@
       "Wind": 0.5859
     },
     "2022": {
-      "Bioenergy": 0.1113,
-      "Hydro": 0.0984,
-      "Solar": 0.1788,
-      "Wind": 0.6115
+      "Bioenergy": 0.1037,
+      "Hydro": 0.0992,
+      "Solar": 0.1803,
+      "Wind": 0.6167
     },
     "2023": {
-      "Bioenergy": 0.0608,
-      "Hydro": 0.0908,
-      "Solar": 0.2712,
-      "Wind": 0.5772
+      "Bioenergy": 0.0611,
+      "Hydro": 0.0987,
+      "Solar": 0.2696,
+      "Wind": 0.5706
     },
     "2024": {
       "Bioenergy": 0.0478,
@@ -1825,34 +1825,34 @@
   },
   "US-OK": {
     "2019": {
-      "Bioenergy": 0.0102,
-      "Hydro": 0.1244,
+      "Bioenergy": 0.0092,
+      "Hydro": 0.1245,
       "Solar": 0.0018,
-      "Wind": 0.8636
+      "Wind": 0.8644
     },
     "2020": {
-      "Bioenergy": 0.0119,
-      "Hydro": 0.0922,
-      "Solar": 0.0021,
-      "Wind": 0.8937
+      "Bioenergy": 0.0099,
+      "Hydro": 0.0843,
+      "Solar": 0.0019,
+      "Wind": 0.9038
     },
     "2021": {
-      "Bioenergy": 0.0075,
-      "Hydro": 0.0663,
+      "Bioenergy": 0.0083,
+      "Hydro": 0.0696,
       "Solar": 0.002,
-      "Wind": 0.9242
+      "Wind": 0.9201
     },
     "2022": {
-      "Bioenergy": 0.0081,
-      "Hydro": 0.0378,
-      "Solar": 0.0018,
-      "Wind": 0.9524
+      "Bioenergy": 0.008,
+      "Hydro": 0.0397,
+      "Solar": 0.0019,
+      "Wind": 0.9503
     },
     "2023": {
-      "Bioenergy": 0.007,
-      "Hydro": 0.0435,
-      "Solar": 0.0019,
-      "Wind": 0.9476
+      "Bioenergy": 0.0057,
+      "Hydro": 0.0396,
+      "Solar": 0.0018,
+      "Wind": 0.9529
     },
     "2024": {
       "Bioenergy": 0.004,
@@ -1863,34 +1863,34 @@
   },
   "US-OR": {
     "2019": {
-      "Bioenergy": 0.0269,
-      "Hydro": 0.7772,
-      "Solar": 0.0182,
-      "Wind": 0.1776
+      "Bioenergy": 0.025,
+      "Hydro": 0.787,
+      "Solar": 0.0176,
+      "Wind": 0.1705
     },
     "2020": {
-      "Bioenergy": 0.0225,
-      "Hydro": 0.7469,
-      "Solar": 0.0252,
-      "Wind": 0.2054
+      "Bioenergy": 0.0228,
+      "Hydro": 0.7498,
+      "Solar": 0.0244,
+      "Wind": 0.2029
     },
     "2021": {
-      "Bioenergy": 0.0248,
-      "Hydro": 0.6829,
-      "Solar": 0.0394,
-      "Wind": 0.2528
+      "Bioenergy": 0.026,
+      "Hydro": 0.7154,
+      "Solar": 0.0349,
+      "Wind": 0.2237
     },
     "2022": {
-      "Bioenergy": 0.0234,
-      "Hydro": 0.7445,
-      "Solar": 0.0383,
-      "Wind": 0.1938
+      "Bioenergy": 0.0243,
+      "Hydro": 0.7527,
+      "Solar": 0.0368,
+      "Wind": 0.1862
     },
     "2023": {
-      "Bioenergy": 0.0256,
-      "Hydro": 0.6825,
-      "Solar": 0.0525,
-      "Wind": 0.2395
+      "Bioenergy": 0.026,
+      "Hydro": 0.694,
+      "Solar": 0.0495,
+      "Wind": 0.2305
     },
     "2024": {
       "Bioenergy": 0.0265,
@@ -1901,10 +1901,10 @@
   },
   "US-PA": {
     "2019": {
-      "Bioenergy": 0.252,
-      "Hydro": 0.3723,
-      "Solar": 0.0101,
-      "Wind": 0.3656
+      "Bioenergy": 0.2408,
+      "Hydro": 0.3557,
+      "Solar": 0.01,
+      "Wind": 0.3936
     },
     "2020": {
       "Bioenergy": 0.2426,
@@ -1913,10 +1913,10 @@
       "Wind": 0.4758
     },
     "2021": {
-      "Bioenergy": 0.2202,
-      "Hydro": 0.3109,
-      "Solar": 0.0276,
-      "Wind": 0.4412
+      "Bioenergy": 0.2074,
+      "Hydro": 0.2802,
+      "Solar": 0.0302,
+      "Wind": 0.4822
     },
     "2022": {
       "Bioenergy": 0.2179,
@@ -1925,10 +1925,10 @@
       "Wind": 0.4883
     },
     "2023": {
-      "Bioenergy": 0.2392,
-      "Hydro": 0.2949,
-      "Solar": 0.0513,
-      "Wind": 0.4146
+      "Bioenergy": 0.2326,
+      "Hydro": 0.276,
+      "Solar": 0.0541,
+      "Wind": 0.4373
     },
     "2024": {
       "Bioenergy": 0.2046,
@@ -1951,22 +1951,22 @@
       "Wind": 0.3474
     },
     "2021": {
-      "Bioenergy": 0.3091,
-      "Hydro": 0.0065,
-      "Solar": 0.4307,
-      "Wind": 0.2537
+      "Bioenergy": 0.2807,
+      "Hydro": 0.0059,
+      "Solar": 0.4401,
+      "Wind": 0.2733
     },
     "2022": {
-      "Bioenergy": 0.2742,
-      "Hydro": 0.0092,
-      "Solar": 0.454,
-      "Wind": 0.2626
+      "Bioenergy": 0.2596,
+      "Hydro": 0.0093,
+      "Solar": 0.4618,
+      "Wind": 0.2693
     },
     "2023": {
-      "Bioenergy": 0.2863,
+      "Bioenergy": 0.289,
       "Hydro": 0,
-      "Solar": 0.4989,
-      "Wind": 0.2148
+      "Solar": 0.4973,
+      "Wind": 0.2137
     },
     "2024": {
       "Bioenergy": 0.3141,
@@ -1977,9 +1977,9 @@
   },
   "US-SC": {
     "2019": {
-      "Bioenergy": 0.4212,
-      "Hydro": 0.3966,
-      "Solar": 0.1822,
+      "Bioenergy": 0.4314,
+      "Hydro": 0.4113,
+      "Solar": 0.1574,
       "Wind": 0
     },
     "2020": {
@@ -1995,15 +1995,15 @@
       "Wind": 0
     },
     "2022": {
-      "Bioenergy": 0.3547,
-      "Hydro": 0.2141,
-      "Solar": 0.4312,
+      "Bioenergy": 0.3481,
+      "Hydro": 0.2287,
+      "Solar": 0.4232,
       "Wind": 0
     },
     "2023": {
-      "Bioenergy": 0.2865,
-      "Hydro": 0.2949,
-      "Solar": 0.4186,
+      "Bioenergy": 0.2844,
+      "Hydro": 0.3119,
+      "Solar": 0.4038,
       "Wind": 0
     },
     "2024": {
@@ -2027,10 +2027,10 @@
       "Wind": 0.4869
     },
     "2021": {
-      "Bioenergy": 0.0015,
-      "Hydro": 0.365,
+      "Bioenergy": 0.0016,
+      "Hydro": 0.3707,
       "Solar": 0.0001,
-      "Wind": 0.6333
+      "Wind": 0.6276
     },
     "2022": {
       "Bioenergy": 0.002,
@@ -2040,9 +2040,9 @@
     },
     "2023": {
       "Bioenergy": 0.0002,
-      "Hydro": 0.2693,
-      "Solar": 0.0044,
-      "Wind": 0.7262
+      "Hydro": 0.2748,
+      "Solar": 0.0037,
+      "Wind": 0.7213
     },
     "2024": {
       "Bioenergy": 0,
@@ -2065,10 +2065,10 @@
       "Wind": 0.0028
     },
     "2021": {
-      "Bioenergy": 0.0616,
-      "Hydro": 0.9061,
-      "Solar": 0.0298,
-      "Wind": 0.0025
+      "Bioenergy": 0.0574,
+      "Hydro": 0.9124,
+      "Solar": 0.0278,
+      "Wind": 0.0023
     },
     "2022": {
       "Bioenergy": 0.0441,
@@ -2077,9 +2077,9 @@
       "Wind": 0.0015
     },
     "2023": {
-      "Bioenergy": 0.0445,
-      "Hydro": 0.8582,
-      "Solar": 0.0973,
+      "Bioenergy": 0.0448,
+      "Hydro": 0.8725,
+      "Solar": 0.0827,
       "Wind": 0
     },
     "2024": {
@@ -2091,10 +2091,10 @@
   },
   "US-TX": {
     "2019": {
-      "Bioenergy": 0.0176,
-      "Hydro": 0.017,
-      "Solar": 0.0487,
-      "Wind": 0.9168
+      "Bioenergy": 0.016,
+      "Hydro": 0.0164,
+      "Solar": 0.0477,
+      "Wind": 0.9198
     },
     "2020": {
       "Bioenergy": 0.0133,
@@ -2103,10 +2103,10 @@
       "Wind": 0.8937
     },
     "2021": {
-      "Bioenergy": 0.0119,
-      "Hydro": 0.01,
-      "Solar": 0.1382,
-      "Wind": 0.8399
+      "Bioenergy": 0.0117,
+      "Hydro": 0.0097,
+      "Solar": 0.1361,
+      "Wind": 0.8425
     },
     "2022": {
       "Bioenergy": 0.0106,
@@ -2115,10 +2115,10 @@
       "Wind": 0.8238
     },
     "2023": {
-      "Bioenergy": 0.0072,
-      "Hydro": 0.0064,
-      "Solar": 0.1842,
-      "Wind": 0.8023
+      "Bioenergy": 0.0083,
+      "Hydro": 0.0062,
+      "Solar": 0.1971,
+      "Wind": 0.7884
     },
     "2024": {
       "Bioenergy": 0.0075,
@@ -2129,34 +2129,34 @@
   },
   "US-UT": {
     "2019": {
-      "Bioenergy": 0.0186,
-      "Hydro": 0.2304,
-      "Solar": 0.5515,
-      "Wind": 0.1995
+      "Bioenergy": 0.0194,
+      "Hydro": 0.2212,
+      "Solar": 0.5525,
+      "Wind": 0.2069
     },
     "2020": {
-      "Bioenergy": 0.0182,
-      "Hydro": 0.1913,
-      "Solar": 0.6024,
-      "Wind": 0.188
+      "Bioenergy": 0.0173,
+      "Hydro": 0.1816,
+      "Solar": 0.6067,
+      "Wind": 0.1944
     },
     "2021": {
-      "Bioenergy": 0.0165,
-      "Hydro": 0.1012,
-      "Solar": 0.7132,
-      "Wind": 0.1691
+      "Bioenergy": 0.0152,
+      "Hydro": 0.1013,
+      "Solar": 0.7142,
+      "Wind": 0.1693
     },
     "2022": {
-      "Bioenergy": 0.0132,
-      "Hydro": 0.1062,
-      "Solar": 0.7456,
-      "Wind": 0.1351
+      "Bioenergy": 0.0141,
+      "Hydro": 0.1135,
+      "Solar": 0.7346,
+      "Wind": 0.1379
     },
     "2023": {
-      "Bioenergy": 0.0139,
-      "Hydro": 0.0752,
-      "Solar": 0.7769,
-      "Wind": 0.1339
+      "Bioenergy": 0.015,
+      "Hydro": 0.0808,
+      "Solar": 0.769,
+      "Wind": 0.1352
     },
     "2024": {
       "Bioenergy": 0.0198,
@@ -2167,22 +2167,22 @@
   },
   "US-VA": {
     "2019": {
-      "Bioenergy": 0.7306,
-      "Hydro": 0.0808,
-      "Solar": 0.1886,
+      "Bioenergy": 0.7474,
+      "Hydro": 0.0748,
+      "Solar": 0.1778,
       "Wind": 0
     },
     "2020": {
-      "Bioenergy": 0.5957,
-      "Hydro": 0.1654,
-      "Solar": 0.2388,
+      "Bioenergy": 0.5769,
+      "Hydro": 0.1732,
+      "Solar": 0.2499,
       "Wind": 0
     },
     "2021": {
-      "Bioenergy": 0.5007,
-      "Hydro": 0.0372,
-      "Solar": 0.4552,
-      "Wind": 0.0069
+      "Bioenergy": 0.5161,
+      "Hydro": 0.044,
+      "Solar": 0.4333,
+      "Wind": 0.0066
     },
     "2022": {
       "Bioenergy": 0.4581,
@@ -2191,9 +2191,9 @@
       "Wind": 0.0064
     },
     "2023": {
-      "Bioenergy": 0.3777,
-      "Hydro": -0.0294,
-      "Solar": 0.6461,
+      "Bioenergy": 0.3826,
+      "Hydro": -0.0355,
+      "Solar": 0.6473,
       "Wind": 0.0056
     },
     "2024": {
@@ -2205,10 +2205,10 @@
   },
   "US-VT": {
     "2019": {
-      "Bioenergy": 0.1977,
-      "Hydro": 0.5589,
-      "Solar": 0.0683,
-      "Wind": 0.1751
+      "Bioenergy": 0.1603,
+      "Hydro": 0.6187,
+      "Solar": 0.062,
+      "Wind": 0.159
     },
     "2020": {
       "Bioenergy": 0.213,
@@ -2217,22 +2217,22 @@
       "Wind": 0.178
     },
     "2021": {
-      "Bioenergy": 0.227,
-      "Hydro": 0.5265,
-      "Solar": 0.0835,
-      "Wind": 0.1629
+      "Bioenergy": 0.2483,
+      "Hydro": 0.5068,
+      "Solar": 0.084,
+      "Wind": 0.1609
     },
     "2022": {
-      "Bioenergy": 0.1943,
-      "Hydro": 0.5244,
-      "Solar": 0.0931,
-      "Wind": 0.1882
+      "Bioenergy": 0.197,
+      "Hydro": 0.51,
+      "Solar": 0.097,
+      "Wind": 0.1961
     },
     "2023": {
-      "Bioenergy": 0.1689,
-      "Hydro": 0.529,
-      "Solar": 0.1104,
-      "Wind": 0.1918
+      "Bioenergy": 0.1739,
+      "Hydro": 0.5605,
+      "Solar": 0.1027,
+      "Wind": 0.1629
     },
     "2024": {
       "Bioenergy": 0.1777,
@@ -2243,10 +2243,10 @@
   },
   "US-WA": {
     "2019": {
-      "Bioenergy": 0.0224,
-      "Hydro": 0.8837,
+      "Bioenergy": 0.0208,
+      "Hydro": 0.888,
       "Solar": 0.0006,
-      "Wind": 0.0933
+      "Wind": 0.0906
     },
     "2020": {
       "Bioenergy": 0.0159,
@@ -2255,22 +2255,22 @@
       "Wind": 0.1063
     },
     "2021": {
-      "Bioenergy": 0.02,
-      "Hydro": 0.8765,
+      "Bioenergy": 0.0159,
+      "Hydro": 0.8775,
       "Solar": 0.0006,
-      "Wind": 0.1029
+      "Wind": 0.1061
     },
     "2022": {
-      "Bioenergy": 0.0149,
-      "Hydro": 0.893,
-      "Solar": 0.0009,
-      "Wind": 0.0912
+      "Bioenergy": 0.0141,
+      "Hydro": 0.8893,
+      "Solar": 0.001,
+      "Wind": 0.0956
     },
     "2023": {
-      "Bioenergy": 0.0181,
-      "Hydro": 0.8747,
-      "Solar": 0.0049,
-      "Wind": 0.1022
+      "Bioenergy": 0.0183,
+      "Hydro": 0.8668,
+      "Solar": 0.0054,
+      "Wind": 0.1096
     },
     "2024": {
       "Bioenergy": 0.018,
@@ -2281,10 +2281,10 @@
   },
   "US-WI": {
     "2019": {
-      "Bioenergy": 0.2348,
-      "Hydro": 0.4653,
-      "Solar": 0.0063,
-      "Wind": 0.2935
+      "Bioenergy": 0.212,
+      "Hydro": 0.4179,
+      "Solar": 0.0069,
+      "Wind": 0.3632
     },
     "2020": {
       "Bioenergy": 0.1965,
@@ -2293,10 +2293,10 @@
       "Wind": 0.305
     },
     "2021": {
-      "Bioenergy": 0.2209,
-      "Hydro": 0.4071,
-      "Solar": 0.0696,
-      "Wind": 0.3024
+      "Bioenergy": 0.1791,
+      "Hydro": 0.4226,
+      "Solar": 0.0721,
+      "Wind": 0.3261
     },
     "2022": {
       "Bioenergy": 0.2,
@@ -2305,10 +2305,10 @@
       "Wind": 0.3145
     },
     "2023": {
-      "Bioenergy": 0.1744,
-      "Hydro": 0.2676,
-      "Solar": 0.2261,
-      "Wind": 0.3319
+      "Bioenergy": 0.1823,
+      "Hydro": 0.2798,
+      "Solar": 0.2222,
+      "Wind": 0.3156
     },
     "2024": {
       "Bioenergy": 0.155,
@@ -2320,27 +2320,27 @@
   "US-WV": {
     "2019": {
       "Bioenergy": 0,
-      "Hydro": 0.5034,
+      "Hydro": 0.5322,
       "Solar": 0,
-      "Wind": 0.4966
+      "Wind": 0.4678
     },
     "2020": {
-      "Bioenergy": 0.0019,
-      "Hydro": 0.4588,
+      "Bioenergy": 0.0018,
+      "Hydro": 0.4553,
       "Solar": 0,
-      "Wind": 0.5393
+      "Wind": 0.5428
     },
     "2021": {
       "Bioenergy": 0.003,
-      "Hydro": 0.5084,
+      "Hydro": 0.5105,
       "Solar": 0,
-      "Wind": 0.4885
+      "Wind": 0.4864
     },
     "2022": {
-      "Bioenergy": 0.003,
-      "Hydro": 0.4494,
+      "Bioenergy": 0.0028,
+      "Hydro": 0.4495,
       "Solar": 0,
-      "Wind": 0.5475
+      "Wind": 0.5477
     },
     "2023": {
       "Bioenergy": 0,
@@ -2364,21 +2364,21 @@
     },
     "2020": {
       "Bioenergy": 0,
-      "Hydro": 0.1606,
-      "Solar": 0.0245,
-      "Wind": 0.815
+      "Hydro": 0.1675,
+      "Solar": 0.0262,
+      "Wind": 0.8063
     },
     "2021": {
       "Bioenergy": 0,
-      "Hydro": 0.084,
-      "Solar": 0.019,
-      "Wind": 0.897
+      "Hydro": 0.0794,
+      "Solar": 0.0178,
+      "Wind": 0.9028
     },
     "2022": {
       "Bioenergy": 0,
-      "Hydro": 0.0717,
-      "Solar": 0.018,
-      "Wind": 0.9103
+      "Hydro": 0.0704,
+      "Solar": 0.0172,
+      "Wind": 0.9124
     },
     "2023": {
       "Bioenergy": 0,