diff --git a/public/data/textile/processes.json b/public/data/textile/processes.json
index 416c085e8..05b556354 100644
--- a/public/data/textile/processes.json
+++ b/public/data/textile/processes.json
@@ -718,7 +718,7 @@
     "heat_MJ": 0,
     "elec_pppm": 0,
     "elec_MJ": 0,
-    "waste": 0.270519,
+    "waste": 0.21292,
     "alias": null
   },
   {
@@ -756,7 +756,7 @@
     "heat_MJ": 0,
     "elec_pppm": 0,
     "elec_MJ": 0,
-    "waste": 0.270519,
+    "waste": 0.21292,
     "alias": null
   },
   {
@@ -794,7 +794,7 @@
     "heat_MJ": 0,
     "elec_pppm": 0,
     "elec_MJ": 0,
-    "waste": 0.270519,
+    "waste": 0.21292,
     "alias": null
   },
   {
@@ -832,7 +832,7 @@
     "heat_MJ": 0,
     "elec_pppm": 0,
     "elec_MJ": 0,
-    "waste": 0.0319569,
+    "waste": 0.03097,
     "alias": null
   },
   {
@@ -870,7 +870,7 @@
     "heat_MJ": 0,
     "elec_pppm": 0,
     "elec_MJ": 0,
-    "waste": 0.0319569,
+    "waste": 0.03097,
     "alias": null
   },
   {
@@ -908,7 +908,7 @@
     "heat_MJ": 0,
     "elec_pppm": 0,
     "elec_MJ": 0,
-    "waste": 0.0319569,
+    "waste": 0.03097,
     "alias": null
   },
   {
@@ -946,7 +946,7 @@
     "heat_MJ": 0,
     "elec_pppm": 0,
     "elec_MJ": 0,
-    "waste": 0.0319569,
+    "waste": 0.03097,
     "alias": null
   },
   {
@@ -984,7 +984,7 @@
     "heat_MJ": 0,
     "elec_pppm": 0,
     "elec_MJ": 0,
-    "waste": 0.0765978,
+    "waste": 0.07115,
     "alias": null
   },
   {
@@ -1022,7 +1022,7 @@
     "heat_MJ": 0,
     "elec_pppm": 0,
     "elec_MJ": 0,
-    "waste": 0.538462,
+    "waste": 0.35,
     "alias": null
   },
   {
@@ -1060,7 +1060,7 @@
     "heat_MJ": 0,
     "elec_pppm": 0,
     "elec_MJ": 0,
-    "waste": 0.538462,
+    "waste": 0.35,
     "alias": null
   },
   {
@@ -1098,7 +1098,7 @@
     "heat_MJ": 0,
     "elec_pppm": 0,
     "elec_MJ": 0,
-    "waste": 0.201201,
+    "waste": 0.1675,
     "alias": null
   },
   {
@@ -1136,7 +1136,7 @@
     "heat_MJ": 0,
     "elec_pppm": 0,
     "elec_MJ": 0,
-    "waste": 0.105105,
+    "waste": 0.09511,
     "alias": null
   },
   {
@@ -1174,7 +1174,7 @@
     "heat_MJ": 0,
     "elec_pppm": 0,
     "elec_MJ": 0,
-    "waste": 0.221094,
+    "waste": 0.18106,
     "alias": null
   },
   {
@@ -1212,7 +1212,7 @@
     "heat_MJ": 0,
     "elec_pppm": 0,
     "elec_MJ": 0,
-    "waste": 0.0582011,
+    "waste": 0.055,
     "alias": null
   },
   {
@@ -1250,7 +1250,7 @@
     "heat_MJ": 0,
     "elec_pppm": 0,
     "elec_MJ": 0,
-    "waste": 0.631206,
+    "waste": 0.38696,
     "alias": null
   },
   {
@@ -1288,7 +1288,7 @@
     "heat_MJ": 0,
     "elec_pppm": 0,
     "elec_MJ": 0,
-    "waste": 0.21716,
+    "waste": 0.17842,
     "alias": null
   },
   {
@@ -1326,7 +1326,7 @@
     "heat_MJ": 0,
     "elec_pppm": 0,
     "elec_MJ": 8.64,
-    "waste": 0.0576,
+    "waste": 0.05446,
     "alias": "knitting-mix"
   },
   {
@@ -1364,7 +1364,7 @@
     "heat_MJ": 0,
     "elec_pppm": 0,
     "elec_MJ": 6.06443,
-    "waste": 0.00502513,
+    "waste": 0.005,
     "alias": "knitting-fully-fashioned"
   },
   {
@@ -1402,7 +1402,7 @@
     "heat_MJ": 0,
     "elec_pppm": 0,
     "elec_MJ": 13.2112,
-    "waste": 0.00502513,
+    "waste": 0.005,
     "alias": "knitting-seamless"
   },
   {
@@ -1440,7 +1440,7 @@
     "heat_MJ": 0,
     "elec_pppm": 0.0003145,
     "elec_MJ": 0,
-    "waste": 0.0667,
+    "waste": 0.06253,
     "alias": "weaving"
   },
   {
@@ -2694,7 +2694,7 @@
     "heat_MJ": 0,
     "elec_pppm": 0,
     "elec_MJ": 4.194,
-    "waste": 0.0417,
+    "waste": 0.04003,
     "alias": "knitting-straight"
   },
   {
@@ -2732,7 +2732,7 @@
     "heat_MJ": 0,
     "elec_pppm": 0,
     "elec_MJ": 4.25101,
-    "waste": 0.0351967,
+    "waste": 0.034,
     "alias": "knitting-circular"
   },
   {
diff --git a/src/Data/Textile/Formula.elm b/src/Data/Textile/Formula.elm
index 3b5a12e86..4a5ef6043 100644
--- a/src/Data/Textile/Formula.elm
+++ b/src/Data/Textile/Formula.elm
@@ -9,7 +9,6 @@ module Data.Textile.Formula exposing
     , knittingImpacts
     , makingDeadStock
     , makingImpacts
-    , makingWaste
     , materialDyeingToxicityImpacts
     , materialPrintingToxicityImpacts
     , printingImpacts
@@ -51,27 +50,18 @@ type alias StepValues =
 {-| Compute source mass needed and waste generated by the operation.
 -}
 genericWaste : Split -> Mass -> { mass : Mass, waste : Mass }
-genericWaste processWaste baseMass =
+genericWaste processWaste stepOutputMass =
     let
-        waste =
-            baseMass
-                |> Quantity.multiplyBy (Split.toFloat processWaste)
-    in
-    { mass = baseMass |> Quantity.plus waste, waste = waste }
-
-
-{-| Compute source material mass needed and waste generated by the operation, according to
-material & product waste data.
--}
-makingWaste : Split -> Mass -> { mass : Mass, waste : Mass }
-makingWaste pcrWaste baseMass =
-    let
-        mass =
-            -- (product weight + textile waste for confection) / (1 - PCR product waste rate)
-            baseMass
-                |> Quantity.divideBy (Split.toFloat (Split.complement pcrWaste))
+        stepInputMass =
+            -- Use input mass waste ratio formula by default
+            -- See https://fabrique-numerique.gitbook.io/ecobalyse/textile/cycle-de-vie-des-produits-textiles/pertes-et-rebus
+            --
+            -- inputMass = outputMass / 1 - Input processWasteRatio
+            stepOutputMass
+                |> Quantity.divideBy (1 - Split.toFloat processWaste)
     in
-    { mass = mass, waste = Quantity.minus baseMass mass }
+    -- We return the inputMass of this step (considered as the output mass of the previous step)
+    { mass = stepInputMass, waste = Quantity.minus stepOutputMass stepInputMass }
 
 
 {-| Compute source material mass needed and deadstock generated by the operation, according to
diff --git a/src/Data/Textile/Simulator.elm b/src/Data/Textile/Simulator.elm
index 8c9b24500..1a881f0bc 100644
--- a/src/Data/Textile/Simulator.elm
+++ b/src/Data/Textile/Simulator.elm
@@ -592,7 +592,7 @@ computeMakingStepWaste ({ inputs } as simulator) =
 
         { mass, waste } =
             inputs.mass
-                |> Formula.makingWaste
+                |> Formula.genericWaste
                     (fabricProcess
                         |> Fabric.getMakingWaste product.making.pcrWaste makingWaste
                     )
diff --git a/tests/Data/Textile/FormulaTest.elm b/tests/Data/Textile/FormulaTest.elm
index 404a67302..216e02f70 100644
--- a/tests/Data/Textile/FormulaTest.elm
+++ b/tests/Data/Textile/FormulaTest.elm
@@ -58,14 +58,8 @@ suite =
             [ describe "Formula.genericWaste"
                 [ kg 1
                     |> Formula.genericWaste Split.half
-                    |> Expect.equal { mass = kg 1.5, waste = kg 0.5 }
-                    |> asTest "should compute material waste"
-                ]
-            , describe "Formula.makingWaste"
-                [ kg 1
-                    |> Formula.makingWaste Split.half
                     |> Expect.equal { mass = kg 2, waste = kg 1 }
-                    |> asTest "should compute material waste from material and product waste data"
+                    |> asTest "should compute generic waste using input waste ratio"
                 ]
             , describe "Formula.makingDeadStock"
                 [ kg 1
diff --git a/tests/Data/Textile/SimulatorTest.elm b/tests/Data/Textile/SimulatorTest.elm
index 80c0355ac..dc8d39a7b 100644
--- a/tests/Data/Textile/SimulatorTest.elm
+++ b/tests/Data/Textile/SimulatorTest.elm
@@ -50,7 +50,7 @@ suite =
                 [ { tShirtCotonFrance
                     | countrySpinning = Nothing
                   }
-                    |> expectImpact db ecs 1471.1431913678628
+                    |> expectImpact db ecs 1473.9780976999311
                     |> asTest "should compute a simulation ecs impact"
                 , describe "disabled steps"
                     [ { tShirtCotonFrance | disabledSteps = [ Label.Ennobling ] }
diff --git a/tests/e2e-textile.json b/tests/e2e-textile.json
index 00a0dcbf4..ee03eaee0 100644
--- a/tests/e2e-textile.json
+++ b/tests/e2e-textile.json
@@ -10,27 +10,27 @@
       "countryMaking=FR"
     ],
     "impacts": {
-      "acd": 0.04153487006753191,
-      "cch": 6.067777205881373,
-      "etf": 133.65645343559225,
-      "etf-c": 281.2926479963204,
-      "fru": 108.68581289752039,
-      "fwe": 0.0015983421964925867,
-      "htc": 9.306515988784065e-10,
-      "htc-c": 1.5283072906748826e-9,
-      "htn": 2.290193830873215e-8,
-      "htn-c": 3.3853886876092924e-8,
-      "ior": 13.31360395097679,
-      "ldu": 105.73125765928776,
-      "mru": 0.000052137692964225585,
-      "ozd": 0.000030370813215460624,
-      "pco": 0.01711920859600319,
-      "pma": 3.6426618342305054e-7,
-      "swe": 0.02539551688556483,
-      "tre": 0.12611503184774034,
-      "wtu": 13.977094827606113,
-      "ecs": 1471.1431913678628,
-      "pef": 941.5376554453319
+      "acd": 0.04163544680574335,
+      "cch": 6.076074899448809,
+      "etf": 134.0863054530789,
+      "etf-c": 282.1219011261312,
+      "fru": 108.75723225108744,
+      "fwe": 0.0016020599526329704,
+      "htc": 9.324883616149098e-10,
+      "htc-c": 1.5316938071499886e-9,
+      "htn": 2.2958539136038225e-8,
+      "htn-c": 3.396278638169421e-8,
+      "ior": 13.313836563271293,
+      "ldu": 106.0312189737267,
+      "mru": 0.000052176453397729595,
+      "ozd": 0.00003037113615558597,
+      "pco": 0.017158026522891636,
+      "pma": 3.650629404142302e-7,
+      "swe": 0.025467662607441162,
+      "tre": 0.12648609991631055,
+      "wtu": 14.022971246600134,
+      "ecs": 1473.9780976999311,
+      "pef": 942.9643784896306
     }
   },
   {
@@ -45,27 +45,27 @@
       "countryMaking=FR"
     ],
     "impacts": {
-      "acd": 0.040083034998082204,
-      "cch": 5.610399786097431,
-      "etf": 132.2264106258813,
-      "etf-c": 279.89146571093204,
-      "fru": 105.78490542940658,
-      "fwe": 0.002141549830267799,
-      "htc": 9.236903446647858e-10,
-      "htc-c": 1.504974275331958e-9,
-      "htn": 2.277388762027098e-8,
-      "htn-c": 3.3401939914054145e-8,
-      "ior": 13.299487443678606,
-      "ldu": 104.1537899446527,
-      "mru": 0.00005206834549709496,
-      "ozd": 0.0000303819910824867,
-      "pco": 0.015491171242633323,
-      "pma": 2.938543221437438e-7,
-      "swe": 0.024877965700482157,
-      "tre": 0.11928553954473609,
-      "wtu": 14.120875328829483,
-      "ecs": 1447.5351157339805,
-      "pef": 918.3653812238522
+      "acd": 0.04017877886165545,
+      "cch": 5.617174959801102,
+      "etf": 132.65150231089498,
+      "etf-c": 280.7160545793037,
+      "fru": 105.84666823008729,
+      "fwe": 0.00214707581824648,
+      "htc": 9.255039347492112e-10,
+      "htc-c": 1.5082831207682146e-9,
+      "htn": 2.2830062191910908e-8,
+      "htn-c": 3.3509334976722056e-8,
+      "ior": 13.299673064884704,
+      "ldu": 104.44850017797987,
+      "mru": 0.000052106875086460975,
+      "ozd": 0.000030382351231542455,
+      "pco": 0.015524569751985531,
+      "pma": 2.944166918372446e-7,
+      "swe": 0.02494838859581367,
+      "tre": 0.1196338735708263,
+      "wtu": 14.167230364956025,
+      "ecs": 1450.2914354053546,
+      "pef": 919.7149683050168
     }
   },
   {
@@ -80,27 +80,27 @@
       "countryMaking=FR"
     ],
     "impacts": {
-      "acd": 0.057405122707008045,
-      "cch": 11.460880865465585,
-      "etf": 15.595574342296226,
-      "etf-c": 35.2581850339179,
-      "fru": 206.44628152701202,
-      "fwe": 0.001182111442559251,
-      "htc": 1.1707541670974682e-9,
-      "htc-c": 9.648627939464513e-10,
-      "htn": 1.7072761796464283e-8,
-      "htn-c": 8.567746025558896e-9,
-      "ior": 13.251903379741115,
-      "ldu": 21.64622267951263,
-      "mru": 0.00007190387646188032,
-      "ozd": 0.000051346140521133825,
-      "pco": 0.033754964773876364,
-      "pma": 5.366510816896363e-7,
-      "swe": 0.01175525117716854,
-      "tre": 0.07933831796632931,
-      "wtu": 1.1686890189426382,
-      "ecs": 1620.5539631121571,
-      "pef": 1146.1234932835043
+      "acd": 0.057581557642514186,
+      "cch": 11.486772334324144,
+      "etf": 15.634225651652217,
+      "etf-c": 35.30084273467208,
+      "fru": 206.83621120280137,
+      "fwe": 0.0011841875998579946,
+      "htc": 1.1733390915883777e-9,
+      "htc-c": 9.657327058055596e-10,
+      "htn": 1.7104907125727847e-8,
+      "htn-c": 8.594192534789848e-9,
+      "ior": 13.251972542033904,
+      "ldu": 21.656481609935792,
+      "mru": 0.00007192741894281859,
+      "ozd": 0.00005134618451117797,
+      "pco": 0.03386786925642574,
+      "pma": 5.381982335152771e-7,
+      "swe": 0.011781122757516282,
+      "tre": 0.07959215390253874,
+      "wtu": 1.1726385765499685,
+      "ecs": 1622.3567024833867,
+      "pef": 1148.1148870018326
     }
   },
   {
@@ -116,27 +116,27 @@
       "countryMaking=FR"
     ],
     "impacts": {
-      "acd": 0.03145778348815787,
-      "cch": 5.755082393572394,
-      "etf": 73.791458066637,
-      "etf-c": 151.01533820239038,
-      "fru": 115.2760782251925,
-      "fwe": 0.001203592482277773,
-      "htc": 9.390159782968622e-10,
-      "htc-c": 1.4376158751378587e-9,
-      "htn": 1.6666988742461577e-8,
-      "htn-c": 1.9010665675086265e-8,
-      "ior": 13.307299056145208,
-      "ldu": 60.64370515578003,
-      "mru": 0.000051697432436773615,
-      "ozd": 0.000033060548708091644,
-      "pco": 0.014531222835538368,
-      "pma": 3.002787753363536e-7,
-      "swe": 0.01528189746657156,
-      "tre": 0.0805767439619328,
-      "wtu": 6.941456237348496,
-      "ecs": 1266.2433761304576,
-      "pef": 810.4452679750791
+      "acd": 0.03152481557850885,
+      "cch": 5.7623391873436365,
+      "etf": 74.02203123770292,
+      "etf-c": 151.43828158178619,
+      "fru": 115.3694352814857,
+      "fwe": 0.0012059961939220561,
+      "htc": 9.408805844144814e-10,
+      "htc-c": 1.4406978925029883e-9,
+      "htn": 1.670283464363093e-8,
+      "htn-c": 1.906926773536258e-8,
+      "ior": 13.307510680679485,
+      "ldu": 60.793578837279895,
+      "mru": 0.00005173472732919651,
+      "ozd": 0.000033069825250950026,
+      "pco": 0.014561425864626854,
+      "pma": 3.008625307764535e-7,
+      "swe": 0.015320376929918441,
+      "tre": 0.08079622398774226,
+      "wtu": 6.9639123932412055,
+      "ecs": 1267.9101496135304,
+      "pef": 811.4356101328748
     }
   },
   {
@@ -151,27 +151,27 @@
       "disabledSteps=ennobling"
     ],
     "impacts": {
-      "acd": 0.03294081897082252,
-      "cch": 3.4863653460944724,
-      "etf": 131.39075731036985,
-      "etf-c": 252.1771894637737,
-      "fru": 83.46357620761727,
-      "fwe": 0.0012828786456837292,
-      "htc": 6.98198366757677e-10,
-      "htc-c": 1.2787940033804526e-9,
-      "htn": 1.7944492068956902e-8,
-      "htn-c": 3.33350112101179e-8,
-      "ior": 12.84427501010654,
-      "ldu": 100.58000015674304,
-      "mru": 0.000015858113507680858,
-      "ozd": 1.7745154455752405e-7,
-      "pco": 0.013655377091474696,
-      "pma": 2.830599465837179e-7,
-      "swe": 0.02259604193746533,
-      "tre": 0.11767587907015174,
-      "wtu": 13.895915210358915,
-      "ecs": 1213.958470608311,
-      "pef": 712.9075657041376
+      "acd": 0.03304139570903395,
+      "cch": 3.4946630396619085,
+      "etf": 131.8206093278565,
+      "etf-c": 253.00644259358452,
+      "fru": 83.53499556118432,
+      "fwe": 0.0012865964018241127,
+      "htc": 7.000351294941802e-10,
+      "htc-c": 1.2821805198555586e-9,
+      "htn": 1.8001092896262975e-8,
+      "htn-c": 3.344391071571918e-8,
+      "ior": 12.844507622401041,
+      "ldu": 100.87996147118199,
+      "mru": 0.000015896873941184877,
+      "ozd": 1.7777448468287237e-7,
+      "pco": 0.013694195018363142,
+      "pma": 2.838567035748975e-7,
+      "swe": 0.022668187659341657,
+      "tre": 0.11804694713872195,
+      "wtu": 13.941791629352936,
+      "ecs": 1216.7933769403794,
+      "pef": 714.3342887484364
     }
   },
   {
@@ -188,27 +188,27 @@
       "airTransportRatio=1"
     ],
     "impacts": {
-      "acd": 0.17744978711315887,
-      "cch": 29.26775770963706,
-      "etf": 398.5019700032957,
-      "etf-c": 928.3605218698891,
-      "fru": 306.44729677920924,
-      "fwe": 0.00586008517913027,
-      "htc": 4.319819839514111e-9,
-      "htc-c": 6.307891394536701e-9,
-      "htn": 1.2463505190323504e-7,
-      "htn-c": 9.020922761524635e-8,
-      "ior": 16.326890660772733,
-      "ldu": 274.900072566578,
-      "mru": 0.00014297100716302284,
-      "ozd": 0.00008057471507299866,
-      "pco": 0.09763663256031894,
-      "pma": 0.0000019688971918134832,
-      "swe": 0.07977174559738691,
-      "tre": 0.5010505866679853,
-      "wtu": 35.03100571558292,
-      "ecs": 4801.5906867848225,
-      "pef": 3047.7780417613644
+      "acd": 0.17776530284519634,
+      "cch": 29.29713112389512,
+      "etf": 400.0061382866833,
+      "etf-c": 931.1534694580287,
+      "fru": 306.7250384898656,
+      "fwe": 0.005872724272504519,
+      "htc": 4.330174862471458e-9,
+      "htc-c": 6.325543794413083e-9,
+      "htn": 1.2485534139249358e-7,
+      "htn-c": 9.056708643635269e-8,
+      "ior": 16.32772384454294,
+      "ldu": 275.870695207961,
+      "mru": 0.00014311958620352283,
+      "ozd": 0.00008057582979176627,
+      "pco": 0.09775567050471355,
+      "pma": 0.0000019718066464557678,
+      "swe": 0.08000116470598892,
+      "tre": 0.5022110547143145,
+      "wtu": 35.180613817523366,
+      "ecs": 4811.167813476992,
+      "pef": 3052.638092437028
     }
   },
   {
@@ -224,27 +224,27 @@
       "fading=true"
     ],
     "impacts": {
-      "acd": 0.19614424437103536,
-      "cch": 27.312447020944372,
-      "etf": 389.2298662448399,
-      "etf-c": 982.3744403287121,
-      "fru": 277.9246551683675,
-      "fwe": 0.013010683469026186,
-      "htc": 4.155976769406196e-9,
-      "htc-c": 6.070069719159224e-9,
-      "htn": 1.0380017563577683e-7,
-      "htn-c": 9.664363825271524e-8,
-      "ior": 16.250176242814245,
-      "ldu": 314.7559786953524,
-      "mru": 0.00014657454559566287,
-      "ozd": 0.00008274416185728233,
-      "pco": 0.07995895540035163,
-      "pma": 0.000001960719796085715,
-      "swe": 0.08584602982183426,
-      "tre": 0.4621671693434817,
-      "wtu": 40.979823175341615,
-      "ecs": 4939.441492071301,
-      "pef": 3128.9396061344764
+      "acd": 0.19650754361129413,
+      "cch": 27.34278194470025,
+      "etf": 390.8126880668444,
+      "etf-c": 985.4292861961296,
+      "fru": 278.1848505021621,
+      "fwe": 0.013024377908051372,
+      "htc": 4.162600787641573e-9,
+      "htc-c": 6.082474936122221e-9,
+      "htn": 1.0400791489444354e-7,
+      "htn-c": 9.70449168665708e-8,
+      "ior": 16.251032132818466,
+      "ldu": 315.86133436995925,
+      "mru": 0.00014671716699291178,
+      "ozd": 0.00008274534837021724,
+      "pco": 0.08009650824743483,
+      "pma": 0.0000019636491591381196,
+      "swe": 0.08611009389584703,
+      "tre": 0.4635144069953214,
+      "wtu": 41.14890419887185,
+      "ecs": 4949.858297610277,
+      "pef": 3134.1630944264157
     }
   },
   {
@@ -260,27 +260,27 @@
       "fading=false"
     ],
     "impacts": {
-      "acd": 0.16768768448688,
-      "cch": 23.37580695999885,
-      "etf": 380.6472136052979,
-      "etf-c": 973.1970357737249,
-      "fru": 240.47117459495195,
-      "fwe": 0.011027761768506516,
-      "htc": 3.2016193517774856e-9,
-      "htc-c": 4.964185301972769e-9,
-      "htn": 8.134086608470096e-8,
-      "htn-c": 9.514085438678234e-8,
-      "ior": 16.22391049614299,
-      "ldu": 295.43351310279155,
-      "mru": 0.00014412002681408675,
-      "ozd": 0.00008270048312692301,
-      "pco": 0.06789581012139556,
-      "pma": 0.0000015326980959944441,
-      "swe": 0.07926613793151471,
-      "tre": 0.4229106109385381,
-      "wtu": 40.6148147047388,
-      "ecs": 4636.573859335382,
-      "pef": 2793.053100468075
+      "acd": 0.16805098372713878,
+      "cch": 23.406141883754728,
+      "etf": 382.2300354273023,
+      "etf-c": 976.2518816411425,
+      "fru": 240.7313699287465,
+      "fwe": 0.011041456207531702,
+      "htc": 3.2082433700128635e-9,
+      "htc-c": 4.9765905189357655e-9,
+      "htn": 8.154860534336768e-8,
+      "htn-c": 9.554213300063791e-8,
+      "ior": 16.224766386147213,
+      "ldu": 296.5388687773984,
+      "mru": 0.00014426264821133564,
+      "ozd": 0.00008270166963985792,
+      "pco": 0.06803336296847878,
+      "pma": 0.0000015356274590468485,
+      "swe": 0.07953020200552749,
+      "tre": 0.42425784859037785,
+      "wtu": 40.78389572826903,
+      "ecs": 4646.99066487436,
+      "pef": 2798.276588760015
     }
   },
   {
@@ -296,27 +296,27 @@
       "reparability=1.15"
     ],
     "impacts": {
-      "acd": 0.04153487006753191,
-      "cch": 6.067777205881373,
-      "etf": 133.65645343559225,
-      "etf-c": 281.2926479963204,
-      "fru": 108.68581289752039,
-      "fwe": 0.0015983421964925867,
-      "htc": 9.306515988784065e-10,
-      "htc-c": 1.5283072906748826e-9,
-      "htn": 2.290193830873215e-8,
-      "htn-c": 3.3853886876092924e-8,
-      "ior": 13.31360395097679,
-      "ldu": 105.73125765928776,
-      "mru": 0.000052137692964225585,
-      "ozd": 0.000030370813215460624,
-      "pco": 0.01711920859600319,
-      "pma": 3.6426618342305054e-7,
-      "swe": 0.02539551688556483,
-      "tre": 0.12611503184774034,
-      "wtu": 13.977094827606113,
-      "ecs": 1471.1431913678628,
-      "pef": 941.5376554453319
+      "acd": 0.04163544680574335,
+      "cch": 6.076074899448809,
+      "etf": 134.0863054530789,
+      "etf-c": 282.1219011261312,
+      "fru": 108.75723225108744,
+      "fwe": 0.0016020599526329704,
+      "htc": 9.324883616149098e-10,
+      "htc-c": 1.5316938071499886e-9,
+      "htn": 2.2958539136038225e-8,
+      "htn-c": 3.396278638169421e-8,
+      "ior": 13.313836563271293,
+      "ldu": 106.0312189737267,
+      "mru": 0.000052176453397729595,
+      "ozd": 0.00003037113615558597,
+      "pco": 0.017158026522891636,
+      "pma": 3.650629404142302e-7,
+      "swe": 0.025467662607441162,
+      "tre": 0.12648609991631055,
+      "wtu": 14.022971246600134,
+      "ecs": 1473.9780976999311,
+      "pef": 942.9643784896306
     }
   },
   {
@@ -331,27 +331,27 @@
       "makingWaste=0"
     ],
     "impacts": {
-      "acd": 0.0356529755480355,
-      "cch": 5.292914334332009,
-      "etf": 113.86406600065946,
-      "etf-c": 239.4470040232815,
-      "fru": 100.16324705294412,
-      "fwe": 0.0013812282352816273,
-      "htc": 8.079410912312295e-10,
-      "htc-c": 1.330053559529385e-9,
-      "htn": 1.9557357522275022e-8,
-      "htn-c": 2.884500935361957e-8,
-      "ior": 13.166089250103674,
-      "ldu": 91.35374073827695,
-      "mru": 0.000044857227074816925,
-      "ozd": 0.00002582679033625902,
-      "pco": 0.014801565958015742,
-      "pma": 3.152271041189512e-7,
-      "swe": 0.02170501561547716,
-      "tre": 0.10796066240698407,
-      "wtu": 11.89437636216219,
-      "ecs": 1301.6218005407243,
-      "pef": 839.2749405231975
+      "acd": 0.03573846577551521,
+      "cch": 5.29996737386433,
+      "etf": 114.22944021552313,
+      "etf-c": 240.15186918362068,
+      "fru": 100.2239535034761,
+      "fwe": 0.0013843883280009535,
+      "htc": 8.095023395572573e-10,
+      "htc-c": 1.3329320985332255e-9,
+      "htn": 1.9605468225485186e-8,
+      "htn-c": 2.8937573933380658e-8,
+      "ior": 13.166286970554003,
+      "ldu": 91.60870785555007,
+      "mru": 0.00004489017344329534,
+      "ozd": 0.000025827064835365563,
+      "pco": 0.014834561195870921,
+      "pma": 3.159043475614539e-7,
+      "swe": 0.02176633947907204,
+      "tre": 0.10827607026526874,
+      "wtu": 11.933371318307108,
+      "ecs": 1304.0314709229826,
+      "pef": 840.4876551108515
     }
   },
   {
@@ -366,27 +366,27 @@
       "makingWaste=0.25"
     ],
     "impacts": {
-      "acd": 0.04676322075152873,
-      "cch": 6.756544202814142,
-      "etf": 151.24968671108803,
-      "etf-c": 318.4887759723551,
-      "fru": 116.26142698158817,
-      "fwe": 0.001791332384235662,
-      "htc": 1.0397276056758974e-9,
-      "htc-c": 1.7045328294708795e-9,
-      "htn": 2.587489900780515e-8,
-      "htn-c": 3.83062224516248e-8,
-      "ior": 13.44472812953067,
-      "ldu": 118.51127270018627,
-      "mru": 0.00005860921819925552,
-      "ozd": 0.000034409944663639815,
-      "pco": 0.01917933538532537,
-      "pma": 4.0785647613780546e-7,
-      "swe": 0.02867596245897609,
-      "tre": 0.14225224912841264,
-      "wtu": 15.828400130222938,
-      "ecs": 1621.8288721030963,
-      "pef": 1032.437846487229
+      "acd": 0.04687720772150169,
+      "cch": 6.765948255523903,
+      "etf": 151.73685233090626,
+      "etf-c": 319.4285961861407,
+      "fru": 116.34236891563084,
+      "fwe": 0.001795545841194763,
+      "htc": 1.041809270110601e-9,
+      "htc-c": 1.7083708814760004e-9,
+      "htn": 2.593904661208537e-8,
+      "htn-c": 3.842964189130624e-8,
+      "ior": 13.444991756797775,
+      "ldu": 118.85122885655039,
+      "mru": 0.000058653146690560065,
+      "ozd": 0.00003441031066244854,
+      "pco": 0.019223329035798944,
+      "pma": 4.087594673944759e-7,
+      "swe": 0.028757727610435928,
+      "tre": 0.14267279293945884,
+      "wtu": 15.880393405082835,
+      "ecs": 1625.0417659461073,
+      "pef": 1034.0547992707675
     }
   },
   {
@@ -402,27 +402,27 @@
       "surfaceMass=300"
     ],
     "impacts": {
-      "acd": 0.07283552307981908,
-      "cch": 10.599728050435788,
-      "etf": 235.408705019765,
-      "etf-c": 495.7717272500211,
-      "fru": 175.72451274684457,
-      "fwe": 0.0027993385809968042,
-      "htc": 1.6103997922112883e-9,
-      "htc-c": 2.6331597483956397e-9,
-      "htn": 4.0355716824425985e-8,
-      "htn-c": 5.962628607763369e-8,
-      "ior": 22.7642963105701,
-      "ldu": 186.10031994620073,
-      "mru": 0.00009113358021381689,
-      "ozd": 0.000053591197966987444,
-      "pco": 0.029957218135902026,
-      "pma": 6.365809548764983e-7,
-      "swe": 0.044678774036167775,
-      "tre": 0.2215437659380141,
-      "wtu": 24.635094230004217,
-      "ecs": 2565.554343300411,
-      "pef": 1625.2221240956594
+      "acd": 0.07301301144136867,
+      "cch": 10.614371039084205,
+      "etf": 236.16726740356503,
+      "etf-c": 497.23511512615795,
+      "fru": 175.8505469001982,
+      "fwe": 0.0028058993271268926,
+      "htc": 1.6136411382168829e-9,
+      "htc-c": 2.6391359539399452e-9,
+      "htn": 4.0455600637319064e-8,
+      "htn-c": 5.98184616757536e-8,
+      "ior": 22.76470680285452,
+      "ldu": 186.62966344226942,
+      "mru": 0.00009120198097882398,
+      "ozd": 0.00005359176786132629,
+      "pco": 0.03002572035982282,
+      "pma": 6.379869966256389e-7,
+      "swe": 0.04480609001594954,
+      "tre": 0.22219859194137329,
+      "wtu": 24.71605261646426,
+      "ecs": 2570.5571191805325,
+      "pef": 1627.7398706444221
     }
   },
   {
@@ -438,27 +438,27 @@
       "printing=pigment"
     ],
     "impacts": {
-      "acd": 0.07410506399713974,
-      "cch": 10.86938384256717,
-      "etf": 235.96792869205754,
-      "etf-c": 508.1155749989024,
-      "fru": 184.85906063562211,
-      "fwe": 0.0028996246285357186,
-      "htc": 1.6682780479658716e-9,
-      "htc-c": 2.7017213497607865e-9,
-      "htn": 4.1453509166323423e-8,
-      "htn-c": 5.998576382110336e-8,
-      "ior": 23.04239434294855,
-      "ldu": 187.35551845435134,
-      "mru": 0.00009169035244654943,
-      "ozd": 0.00005360175895333543,
-      "pco": 0.030727075891745646,
-      "pma": 6.515945121971615e-7,
-      "swe": 0.04572814127874796,
-      "tre": 0.22354394413986292,
-      "wtu": 24.652205210071255,
-      "ecs": 2618.780106334382,
-      "pef": 1657.4062591148506
+      "acd": 0.07428255235868933,
+      "cch": 10.884026831215587,
+      "etf": 236.72649107585758,
+      "etf-c": 509.5789628750392,
+      "fru": 184.98509478897574,
+      "fwe": 0.0029061853746658066,
+      "htc": 1.671519393971466e-9,
+      "htc-c": 2.707697555305092e-9,
+      "htn": 4.15533929792165e-8,
+      "htn-c": 6.017793941922328e-8,
+      "ior": 23.04280483523297,
+      "ldu": 187.88486195042003,
+      "mru": 0.0000917587532115565,
+      "ozd": 0.000053602328847674277,
+      "pco": 0.030795578115666435,
+      "pma": 6.53000553946302e-7,
+      "swe": 0.04585545725852972,
+      "tre": 0.22419877014322215,
+      "wtu": 24.7331635965313,
+      "ecs": 2623.782882214503,
+      "pef": 1659.9240056636133
     }
   },
   {
@@ -474,27 +474,27 @@
       "printing=substantive"
     ],
     "impacts": {
-      "acd": 0.07462366047428068,
-      "cch": 10.898816957570592,
-      "etf": 236.0713395264576,
-      "etf-c": 501.06271937193003,
-      "fru": 185.73368534537826,
-      "fwe": 0.002924948186571973,
-      "htc": 1.6793142831947102e-9,
-      "htc-c": 2.7141101705908394e-9,
-      "htn": 4.167479387663484e-8,
-      "htn-c": 5.979344838688171e-8,
-      "ior": 23.082977297363037,
-      "ldu": 187.5233641502848,
-      "mru": 0.000091923189232502,
-      "ozd": 0.00005360047738482931,
-      "pco": 0.030804059790402676,
-      "pma": 6.549416657580766e-7,
-      "swe": 0.04578631203652723,
-      "tre": 0.2238185218128913,
-      "wtu": 24.65500967255285,
-      "ecs": 2607.3726096105706,
-      "pef": 1661.9796936528298
+      "acd": 0.07480114883583026,
+      "cch": 10.913459946219007,
+      "etf": 236.82990191025763,
+      "etf-c": 502.52610724806686,
+      "fru": 185.8597194987319,
+      "fwe": 0.0029315089327020608,
+      "htc": 1.6825556292003047e-9,
+      "htc-c": 2.720086376135145e-9,
+      "htn": 4.177467768952792e-8,
+      "htn-c": 5.998562398500163e-8,
+      "ior": 23.083387789647457,
+      "ldu": 188.0527076463535,
+      "mru": 0.00009199158999750911,
+      "ozd": 0.000053601047279168154,
+      "pco": 0.030872562014323462,
+      "pma": 6.563477075072172e-7,
+      "swe": 0.045913628016308994,
+      "tre": 0.22447334781625053,
+      "wtu": 24.735968059012894,
+      "ecs": 2612.3753854906913,
+      "pef": 1664.4974402015926
     }
   },
   {
@@ -510,27 +510,27 @@
       "printing=pigment;0.5"
     ],
     "impacts": {
-      "acd": 0.0758123096291761,
-      "cch": 11.216183308278065,
-      "etf": 236.80676420049633,
-      "etf-c": 526.6313466222243,
-      "fru": 197.2977682819373,
-      "fwe": 0.00298669617260141,
-      "htc": 1.755095431597747e-9,
-      "htc-c": 2.8045637518085064e-9,
-      "htn": 4.3100197679169574e-8,
-      "htn-c": 6.052498043630788e-8,
-      "ior": 23.45866935970298,
-      "ldu": 188.96190656931182,
-      "mru": 0.00009225793986139216,
-      "ozd": 0.00005361051443068832,
-      "pco": 0.03164656665193777,
-      "pma": 6.703087168968463e-7,
-      "swe": 0.04601072491130076,
-      "tre": 0.22630516460072128,
-      "wtu": 24.677871680171805,
-      "ecs": 2692.1281661075905,
-      "pef": 1697.916408661411
+      "acd": 0.07598979799072568,
+      "cch": 11.230826296926482,
+      "etf": 237.56532658429637,
+      "etf-c": 528.0947344983612,
+      "fru": 197.42380243529087,
+      "fwe": 0.002993256918731499,
+      "htc": 1.7583367776033414e-9,
+      "htc-c": 2.810539957352812e-9,
+      "htn": 4.3200081492062654e-8,
+      "htn-c": 6.071715603442778e-8,
+      "ior": 23.4590798519874,
+      "ldu": 189.4912500653805,
+      "mru": 0.00009232634062639925,
+      "ozd": 0.000053611084325027164,
+      "pco": 0.03171506887585856,
+      "pma": 6.71714758645987e-7,
+      "swe": 0.046138040891082525,
+      "tre": 0.2269599906040805,
+      "wtu": 24.758830066631848,
+      "ecs": 2697.130941987712,
+      "pef": 1700.4341552101737
     }
   },
   {