diff --git a/gradle.properties b/gradle.properties
index 7d1f97a19d19aece332aac8b05f8a0430b4d30a3..e032ed5c7248ce7be883ba92d40ba11663bb4acb 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,7 +11,7 @@ micronautVersion = 3.2.3
 micronautRxVersion = 2.1.1
 nodePluginVersion = 3.0.1
 nodeVersion = 16.3.0
-nshmpLibVersion = 1.3.1
+nshmpLibVersion = 1.3.2
 nshmpWsUtilsVersion = 0.3.11
 openApiVersion = 4.0.0
 shadowVersion = 7.1.2
diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
index 921cce17f15e4bcae871255cb0aa8bc86cf49b27..f53119eb152a78bb393127605ebb3628af7fb6ac 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
@@ -31,6 +31,7 @@ import gov.usgs.earthquake.nshmp.calc.Hazard;
 import gov.usgs.earthquake.nshmp.calc.HazardCalcs;
 import gov.usgs.earthquake.nshmp.calc.Site;
 import gov.usgs.earthquake.nshmp.data.XySequence;
+import gov.usgs.earthquake.nshmp.geo.Location;
 import gov.usgs.earthquake.nshmp.gmm.Imt;
 
 import io.swagger.v3.core.util.Yaml;
@@ -140,7 +141,10 @@ class NshmTestUtils {
   private static Map<String, XySequence> generateActual(
       NshmModel nshmModel,
       NamedLocation location) {
-    Site site = Site.builder().location(location.location()).build();
+
+    Site site = createSite(
+        location.location(),
+        nshmModel.model.siteData());
 
     CalcConfig config = CalcConfig.copyOf(nshmModel.model.config())
         .imts(nshmModel.nshm.imts())
@@ -193,6 +197,16 @@ class NshmTestUtils {
     Files.write(resultPath, json.getBytes());
   }
 
+  private static Site createSite(Location loc, SiteData siteData) {
+    Site.Builder builder = Site.builder().location(loc);
+    SiteData.Values values = siteData.get(loc);
+    values.z1p0.ifPresent(builder::z1p0);
+    values.z2p5.ifPresent(builder::z2p5);
+    values.zSed.ifPresent(builder::zSed);
+    builder.gmmTrees(values.gmmTrees);
+    return builder.build();
+  }
+
   private static class Curve {
     double[] xs;
     double[] ys;
diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
index dc4e70a45d4d18059a383c066f16dda06d08bd69..a0668cb41122988c442b32125a07e9cfdf8bddb3 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
@@ -90,7 +90,7 @@ class NshmTests {
 
     // run single model
     NshmModel nshmModel =
-        NshmTestUtils.loadModel(NSHMS.get("nshm-conus-2023"));
+        NshmTestUtils.loadModel(NSHMS.get("nshm-conus-2018"));
     NshmTestUtils.writeExpecteds(nshmModel);
     nshmModel.exec.shutdown();
 
diff --git a/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-BOSTON_MA.json b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-BOSTON_MA.json
index 721e62a33568dcf285e27c7d3871f14566898126..6cd46fdf5aab35ccb26cf26318ed43260739e97d 100644
--- a/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-BOSTON_MA.json
+++ b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-BOSTON_MA.json
@@ -24,21 +24,21 @@
     ],
     "ys": [
       0.020784550979940135,
-      0.013752036153143974,
-      0.008853912425965713,
-      0.005504502737593541,
-      0.0032956032209899917,
-      0.001851496392326522,
+      0.013752036153143977,
+      0.008853912425965714,
+      0.00550450273759354,
+      0.0032956032209899913,
+      0.0018514963923265217,
       9.931435977960567E-4,
-      4.956595518220796E-4,
-      2.340154899279777E-4,
-      1.0471944598011258E-4,
-      4.508421273772284E-5,
-      1.8896301560235418E-5,
-      7.725874681605789E-6,
+      4.956595518220795E-4,
+      2.3401548992797765E-4,
+      1.0471944598011257E-4,
+      4.5084212737722834E-5,
+      1.8896301560235415E-5,
+      7.72587468160579E-6,
       3.039143578552158E-6,
-      1.1170515811344104E-6,
-      3.7451324017266463E-7,
+      1.1170515811344102E-6,
+      3.7451324017266453E-7,
       1.0752962397804165E-7,
       2.596070736658151E-8,
       4.917918081492094E-9,
@@ -69,24 +69,24 @@
       0.7929925155296614
     ],
     "ys": [
-      0.003849668670011357,
-      0.0025078664183317764,
+      0.0038496686700113573,
+      0.0025078664183317773,
       0.0015597948853785957,
       9.157017059864714E-4,
-      5.001931310456336E-4,
+      5.001931310456337E-4,
       2.547249918503188E-4,
       1.194486623970574E-4,
-      5.232735935686701E-5,
+      5.2327359356867026E-5,
       2.1561183371151274E-5,
       8.4003477208669E-6,
       3.1469958181727807E-6,
-      1.1420236854051995E-6,
+      1.142023685405199E-6,
       3.9303700685767176E-7,
-      1.2947742656347805E-7,
-      3.7186688126926624E-8,
-      9.324871744942213E-9,
+      1.2947742656347803E-7,
+      3.718668812692663E-8,
+      9.324871744942211E-9,
       1.8778829487123563E-9,
-      2.8466329320775244E-10,
+      2.846632932077524E-10,
       2.69747315108036E-11,
       1.0385526508492285E-12
     ]
@@ -115,26 +115,26 @@
       1.6428726885203377
     ],
     "ys": [
-      0.039154336261104566,
+      0.03915433626110455,
       0.02887498777638114,
       0.02088358144124329,
-      0.014675088491569479,
-      0.009966398305490466,
-      0.006525399875535824,
-      0.0041221943891111765,
-      0.0025039012846601923,
-      0.0014759816292745382,
-      8.455590549998984E-4,
-      4.744378692952328E-4,
-      2.5614908673281055E-4,
+      0.014675088491569477,
+      0.009966398305490462,
+      0.006525399875535825,
+      0.004122194389111177,
+      0.0025039012846601928,
+      0.0014759816292745384,
+      8.455590549998981E-4,
+      4.744378692952327E-4,
+      2.561490867328106E-4,
       1.357929724979682E-4,
       6.854218948534535E-5,
-      3.291803684798866E-5,
-      1.4569587193494363E-5,
-      5.782794746110383E-6,
+      3.2918036847988655E-5,
+      1.456958719349436E-5,
+      5.782794746110381E-6,
       1.973718325030945E-6,
       5.657594675445636E-7,
-      1.2462940285422407E-7
+      1.2462940285422412E-7
     ]
   },
   "0.20 Second Spectral Acceleration": {
@@ -162,24 +162,24 @@
     ],
     "ys": [
       0.06054799387340501,
-      0.0450109371656889,
-      0.03238422553470724,
-      0.022605947101161115,
-      0.01506013117511144,
-      0.009690757366506483,
-      0.005957079199326996,
-      0.003490107511158219,
+      0.04501093716568888,
+      0.032384225534707246,
+      0.02260594710116112,
+      0.015060131175111444,
+      0.009690757366506481,
+      0.0059570791993269956,
+      0.0034901075111582196,
       0.001962702434309726,
-      0.0010598138716072614,
-      5.526846406248316E-4,
+      0.0010598138716072611,
+      5.526846406248315E-4,
       2.787643997578851E-4,
-      1.358294857340756E-4,
+      1.3582948573407562E-4,
       6.359388081275608E-5,
-      2.828782529363822E-5,
-      1.170707349148745E-5,
-      4.419923256430147E-6,
+      2.8287825293638217E-5,
+      1.1707073491487452E-5,
+      4.419923256430148E-6,
       1.4745471754128643E-6,
-      4.1424535992947296E-7,
+      4.142453599294729E-7,
       9.342364439170646E-8
     ]
   }
diff --git a/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-CHICAGO_IL.json b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-CHICAGO_IL.json
index 0dd5f89df3effefa04920b8a699bb141d5a7d926..c9f8abcc0014707c5ae80b09d8ac7d4b42e79b64 100644
--- a/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-CHICAGO_IL.json
+++ b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-CHICAGO_IL.json
@@ -24,24 +24,24 @@
     ],
     "ys": [
       0.017675500237871122,
-      0.011804993270225165,
-      0.007916670756587604,
-      0.005349147248044571,
-      0.003631390427708422,
-      0.0023844055384784854,
+      0.011804993270225163,
+      0.007916670756587606,
+      0.005349147248044569,
+      0.0036313904277084225,
+      0.002384405538478486,
       0.0014870231028831253,
-      8.355484214788528E-4,
-      4.146065777693269E-4,
+      8.355484214788524E-4,
+      4.1460657776932683E-4,
       1.7579111278565786E-4,
       6.24093534270055E-5,
-      1.8240832144136128E-5,
-      4.4149279640637774E-6,
-      9.99445704495612E-7,
+      1.824083214413613E-5,
+      4.414927964063776E-6,
+      9.994457044956114E-7,
       2.485513364750664E-7,
       7.726459746150788E-8,
-      2.121042318488014E-8,
+      2.1210423184880143E-8,
       4.860565864414978E-9,
-      8.641052442615079E-10,
+      8.64105244261508E-10,
       1.0633132855584107E-10
     ]
   },
@@ -69,20 +69,20 @@
       0.7929925155296614
     ],
     "ys": [
-      0.004904504983066266,
+      0.004904504983066267,
       0.003755611824541405,
-      0.002900685498117759,
-      0.002197256906365073,
-      0.0015714972511203789,
-      0.0010317853455482512,
-      5.98813717644033E-4,
-      2.9998980927107953E-4,
-      1.2636087757687212E-4,
-      4.334153727062959E-5,
-      1.172795102583687E-5,
-      2.3832470064242068E-6,
-      3.5209264942037684E-7,
-      3.7851796592772213E-8,
+      0.0029006854981177598,
+      0.002197256906365074,
+      0.0015714972511203787,
+      0.0010317853455482514,
+      5.988137176440332E-4,
+      2.999898092710794E-4,
+      1.263608775768721E-4,
+      4.334153727062958E-5,
+      1.1727951025836873E-5,
+      2.383247006424207E-6,
+      3.520926494203767E-7,
+      3.785179659277222E-8,
       5.963076928168122E-9,
       1.4910332126633127E-9,
       3.1417887372376505E-10,
@@ -115,24 +115,24 @@
       1.6428726885203377
     ],
     "ys": [
-      0.02270915099639857,
+      0.022709150996398576,
       0.01551640012938908,
-      0.010635650588663541,
-      0.007250987342509733,
-      0.004847475264828739,
-      0.003111424318650424,
+      0.010635650588663543,
+      0.007250987342509734,
+      0.00484747526482874,
+      0.0031114243186504244,
       0.0018782779132334622,
-      0.001050022497993213,
-      5.534113089259504E-4,
+      0.0010500224979932131,
+      5.534113089259503E-4,
       2.81605357092695E-4,
-      1.4369489671881908E-4,
-      7.346403339083295E-5,
+      1.4369489671881906E-4,
+      7.346403339083293E-5,
       3.832529799905897E-5,
       1.9431569974270375E-5,
       9.421592539610684E-6,
-      4.1976884388553816E-6,
+      4.197688438855382E-6,
       1.6696279770654772E-6,
-      5.688244700978396E-7,
+      5.688244700978395E-7,
       1.6230550529800464E-7,
       3.549954903295298E-8
     ]
@@ -161,26 +161,26 @@
       1.998773638612381
     ],
     "ys": [
-      0.04184772415672416,
+      0.041847724156724164,
       0.028519812182555625,
       0.01902862263652819,
-      0.012597694078764632,
+      0.012597694078764637,
       0.008183488070776035,
       0.005256326568188243,
-      0.0032378832457639973,
+      0.003237883245763997,
       0.0018635316801681949,
       9.907119514822528E-4,
-      4.830130551236983E-4,
-      2.1935879450693267E-4,
-      9.551470151347582E-5,
-      4.1247826827249706E-5,
+      4.8301305512369827E-4,
+      2.1935879450693264E-4,
+      9.551470151347578E-5,
+      4.124782682724972E-5,
       1.7924007974639768E-5,
-      7.691633829460732E-6,
-      3.129256114185964E-6,
+      7.69163382946073E-6,
+      3.1292561141859636E-6,
       1.1644839692951635E-6,
-      3.8155425174464243E-7,
-      1.0444941528551557E-7,
-      2.2656380775801956E-8
+      3.815542517446425E-7,
+      1.0444941528551558E-7,
+      2.265638077580196E-8
     ]
   }
 }
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-LOS_ANGELES_CA.json b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-LOS_ANGELES_CA.json
index 8564b1025910a23fb7018c01e8dfe4696afeb0a2..ec0f3335bf5438bdc76fa037fd953b3adccef8bd 100644
--- a/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-LOS_ANGELES_CA.json
+++ b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-LOS_ANGELES_CA.json
@@ -23,26 +23,26 @@
       1.7119945007591924
     ],
     "ys": [
-      0.6366574720501088,
-      0.47180374791963997,
-      0.336364557146257,
-      0.2311796226192394,
-      0.15426255108470943,
-      0.09868641697941964,
-      0.06168226983900997,
-      0.037095482704419605,
-      0.021775137700280892,
-      0.012418053525144834,
-      0.006834724125143083,
-      0.0035759571677002966,
-      0.0017322386889934245,
-      7.490722245704205E-4,
-      2.781308992738419E-4,
-      8.55525189246937E-5,
-      1.9638736883809428E-5,
-      2.96393173511507E-6,
-      2.2713550419680115E-7,
-      2.172828515836533E-9
+      0.6444967283734224,
+      0.4786476505852358,
+      0.3418978122787615,
+      0.23536712871936552,
+      0.1572845756613975,
+      0.10076562824016512,
+      0.06307025481893916,
+      0.03797804997470734,
+      0.0223137162137564,
+      0.012734581775620556,
+      0.007015495084129503,
+      0.003676691440227366,
+      0.001786887951792699,
+      7.767736549077123E-4,
+      2.9051610420050656E-4,
+      9.026480491656594E-5,
+      2.1057670916542444E-5,
+      3.258978636010242E-6,
+      2.6316028187002163E-7,
+      3.5384348649550975E-9
     ]
   },
   "5.00 Second Spectral Acceleration": {
@@ -69,25 +69,25 @@
       0.7929925155296614
     ],
     "ys": [
-      0.16844377244854847,
-      0.11829589663275786,
-      0.08101452065128258,
-      0.05406282717487072,
-      0.035127313944556586,
-      0.02246250359719528,
-      0.014022392026120642,
-      0.008468146251691493,
-      0.004802617000237273,
-      0.0024617049089227135,
-      0.0011102558974719061,
-      4.306689571156029E-4,
-      1.3931953053831388E-4,
-      3.7833745729080926E-5,
-      8.044063188459818E-6,
-      1.3835389066707896E-6,
-      1.5518435606411874E-7,
-      7.36238777232291E-9,
-      8.557445185989779E-13,
+      0.17190851157293338,
+      0.12089405741909341,
+      0.08292418234503335,
+      0.05541876162969711,
+      0.03604252603328373,
+      0.02305917040930336,
+      0.014410278305400367,
+      0.008727857901185023,
+      0.0049764060485146455,
+      0.0025700813872072195,
+      0.0011698516159577923,
+      4.5862786746358016E-4,
+      1.5016391076528804E-4,
+      4.130953934310594E-5,
+      8.900525843800577E-6,
+      1.5452350696020578E-6,
+      1.737638951879189E-7,
+      8.150971945903305E-9,
+      1.3140056152584432E-12,
       0.0
     ]
   },
@@ -124,13 +124,13 @@
       0.12154240052962642,
       0.07901532677500141,
       0.04903288877565289,
-      0.02903200372417984,
+      0.029032003724179835,
       0.016462922915925538,
       0.00872825444898973,
       0.004380357672598145,
       0.001967488906616791,
-      7.622024986858485E-4,
-      2.3627494155631915E-4,
+      7.622024986858483E-4,
+      2.3627494155631918E-4,
       5.435263402828678E-5,
       7.931956663151682E-6,
       6.324809604637381E-7,
@@ -163,8 +163,8 @@
     "ys": [
       0.9277678999858486,
       0.753748033038108,
-      0.5931923233025838,
-      0.45540482519284387,
+      0.5931923233025839,
+      0.4554048251928438,
       0.3391134734752599,
       0.24809053741765913,
       0.1766116798966622,
@@ -173,14 +173,14 @@
       0.050147609948821836,
       0.030081503068165788,
       0.01724538444217736,
-      0.009432364207667705,
+      0.009432364207667703,
       0.004883172427187242,
       0.002333377346825734,
       9.819488750632801E-4,
-      3.476070212087309E-4,
+      3.4760702120873095E-4,
       9.771982942272988E-5,
       1.9713363600257578E-5,
-      2.3576513888748996E-6
+      2.3576513888748992E-6
     ]
   }
 }
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-NEW_MADRID_MO.json b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-NEW_MADRID_MO.json
index 50f06aaa26e7414f7dc7c35c5619dde05085e6b1..cbfaef763ed3464290ca15cec470c1473758237a 100644
--- a/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-NEW_MADRID_MO.json
+++ b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-NEW_MADRID_MO.json
@@ -23,25 +23,25 @@
       1.7119945007591924
     ],
     "ys": [
-      0.05460474620644813,
+      0.05460474620644812,
       0.039322200263679656,
-      0.0277425218885836,
-      0.019256487920663253,
-      0.013309032474447955,
-      0.009158100387208453,
-      0.006469954492673558,
+      0.027742521888583595,
+      0.01925648792066325,
+      0.013309032474447957,
+      0.009158100387208452,
+      0.006469954492673557,
       0.004711825464791655,
-      0.0036144199686035917,
-      0.0029237508993505785,
-      0.002458976181859004,
-      0.0020724707675324784,
-      0.0016635058660181762,
-      0.0012069209745320141,
-      7.580051949212137E-4,
-      4.0281368863859235E-4,
-      1.7473743872927874E-4,
-      6.143664863718949E-5,
-      1.660370716466394E-5,
+      0.0036144199686035904,
+      0.002923750899350579,
+      0.0024589761818590043,
+      0.002072470767532479,
+      0.0016635058660181765,
+      0.001206920974532014,
+      7.580051949212135E-4,
+      4.0281368863859257E-4,
+      1.7473743872927871E-4,
+      6.143664863718952E-5,
+      1.660370716466393E-5,
       3.2819885795529324E-6
     ]
   },
@@ -69,26 +69,26 @@
       0.7929925155296614
     ],
     "ys": [
-      0.011183350950193821,
+      0.01118335095019382,
       0.00820850133786319,
-      0.006125994378655951,
-      0.004704029030923134,
-      0.0037445097750955793,
-      0.0031134253259270835,
+      0.00612599437865595,
+      0.004704029030923133,
+      0.003744509775095578,
+      0.003113425325927083,
       0.0026896900327019677,
-      0.0023879637030226153,
-      0.002117544110718752,
-      0.001801150174848246,
-      0.001417347172951655,
-      0.0010068130175955078,
+      0.0023879637030226144,
+      0.0021175441107187517,
+      0.0018011501748482464,
+      0.0014173471729516547,
+      0.001006813017595508,
       6.301951022408453E-4,
       3.444781699140508E-4,
-      1.561396083486973E-4,
+      1.5613960834869736E-4,
       5.887416288449928E-5,
-      1.7483012613921875E-5,
+      1.748301261392188E-5,
       3.8576776780498505E-6,
-      5.776336202494065E-7,
-      3.6035648979050615E-8
+      5.776336202494064E-7,
+      3.603564897905062E-8
     ]
   },
   "Peak Ground Acceleration": {
@@ -117,24 +117,24 @@
     "ys": [
       0.111110726211362,
       0.09432125494016416,
-      0.07822805599600462,
-      0.06292369383675943,
+      0.07822805599600459,
+      0.06292369383675941,
       0.048970144357273364,
       0.036942153943163344,
-      0.027163843299139248,
+      0.027163843299139255,
       0.019537877568746243,
-      0.01391583248845552,
-      0.009887221698272164,
-      0.007094041349666849,
-      0.005146435316179507,
+      0.013915832488455519,
+      0.009887221698272166,
+      0.007094041349666844,
+      0.005146435316179509,
       0.0038656085903222065,
-      0.0029837666408947206,
-      0.0023260711475453035,
-      0.0017237133487967345,
+      0.0029837666408947198,
+      0.0023260711475453053,
+      0.0017237133487967337,
       0.00112653887918541,
-      6.015982295191784E-4,
-      2.510477911128341E-4,
-      7.632592705118941E-5
+      6.015982295191785E-4,
+      2.5104779111283416E-4,
+      7.632592705118938E-5
     ]
   },
   "0.20 Second Spectral Acceleration": {
@@ -162,24 +162,24 @@
     ],
     "ys": [
       0.13557175676510386,
-      0.11487697773688867,
-      0.09473336922159183,
-      0.0757652391662049,
+      0.11487697773688868,
+      0.09473336922159181,
+      0.07576523916620488,
       0.0580616563992429,
-      0.04307702076073273,
-      0.030893330875149037,
-      0.021543361926184883,
+      0.043077020760732714,
+      0.03089333087514904,
+      0.021543361926184886,
       0.014802677054253845,
-      0.010119114510192408,
-      0.006988258677940676,
-      0.00495471722552012,
-      0.003663126515262554,
-      0.002832444396585899,
-      0.0022379408457528773,
-      0.001716493007062966,
-      0.0011926180558950762,
-      6.96553553664501E-4,
-      3.2111317564048007E-4,
+      0.010119114510192404,
+      0.006988258677940675,
+      0.004954717225520119,
+      0.0036631265152625545,
+      0.0028324443965858995,
+      0.0022379408457528756,
+      0.0017164930070629652,
+      0.0011926180558950767,
+      6.965535536645012E-4,
+      3.211131756404801E-4,
       1.1269789534198826E-4
     ]
   }
diff --git a/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-NEW_YORK_NY.json b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-NEW_YORK_NY.json
index d623559b6fbc695718bfec7e43b77e72815fe1a0..e16e65b3f1d48e858080fb32d4cc02ae21ad15ec 100644
--- a/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-NEW_YORK_NY.json
+++ b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-NEW_YORK_NY.json
@@ -24,25 +24,25 @@
     ],
     "ys": [
       0.018666421015364296,
-      0.012277714382170502,
-      0.007819753747405414,
-      0.004783588386662286,
+      0.0122777143821705,
+      0.007819753747405416,
+      0.004783588386662287,
       0.0028112191687725903,
-      0.001554045340731735,
-      8.285075887238437E-4,
-      4.1827330817572434E-4,
-      2.0477961806545262E-4,
-      9.768413828648058E-5,
+      0.0015540453407317345,
+      8.285075887238439E-4,
+      4.1827330817572424E-4,
+      2.0477961806545264E-4,
+      9.76841382864806E-5,
       4.582979651500823E-5,
-      2.1108151934584483E-5,
-      9.403078808734168E-6,
+      2.1108151934584487E-5,
+      9.40307880873417E-6,
       3.952177823009206E-6,
       1.52393681070903E-6,
       5.283693302216128E-7,
       1.5532448868679193E-7,
       3.807576669004164E-8,
       7.285190754922316E-9,
-      9.71330593082485E-10
+      9.713305930824852E-10
     ]
   },
   "5.00 Second Spectral Acceleration": {
@@ -70,23 +70,23 @@
     ],
     "ys": [
       0.0036839290291613563,
-      0.0023350507514869807,
-      0.001402579620737425,
-      7.930112908299474E-4,
-      4.1808903382999877E-4,
+      0.002335050751486981,
+      0.0014025796207374252,
+      7.930112908299477E-4,
+      4.1808903382999866E-4,
       2.0733134457052304E-4,
       9.623213274255235E-5,
-      4.2792093503938167E-5,
+      4.279209350393816E-5,
       1.848842803384079E-5,
-      7.785121676935125E-6,
+      7.785121676935123E-6,
       3.20942446688357E-6,
-      1.2788721198896174E-6,
-      4.76403657405383E-7,
-      1.651037823961913E-7,
-      4.934185476859842E-8,
+      1.2788721198896172E-6,
+      4.7640365740538307E-7,
+      1.6510378239619132E-7,
+      4.934185476859843E-8,
       1.273898355111994E-8,
       2.620252585057269E-9,
-      4.048583749596044E-10,
+      4.048583749596045E-10,
       3.904486628199482E-11,
       1.5324451927867105E-12
     ]
@@ -115,26 +115,26 @@
       1.6428726885203377
     ],
     "ys": [
-      0.02987894297965619,
-      0.021699314985705948,
+      0.029878942979656188,
+      0.021699314985705955,
       0.015627345176841466,
-      0.011107491120984697,
+      0.011107491120984695,
       0.0077765862922841225,
-      0.0053497753310025545,
-      0.003606839800316038,
-      0.00236476621256421,
+      0.005349775331002556,
+      0.0036068398003160384,
+      0.0023647662125642096,
       0.001511483656252948,
       9.383042482967955E-4,
       5.672612883032051E-4,
       3.2775630190425736E-4,
-      1.8379026685332684E-4,
-      9.707147245294275E-5,
-      4.821670939105443E-5,
-      2.1867540425618328E-5,
-      8.83267345573992E-6,
+      1.8379026685332682E-4,
+      9.707147245294278E-5,
+      4.8216709391054424E-5,
+      2.186754042561833E-5,
+      8.832673455739918E-6,
       3.054523154324783E-6,
       8.847978732985681E-7,
-      1.9672786782893157E-7
+      1.967278678289316E-7
     ]
   },
   "0.20 Second Spectral Acceleration": {
@@ -162,24 +162,24 @@
     ],
     "ys": [
       0.0483019839592341,
-      0.03504973561764059,
-      0.024744052454742885,
+      0.0350497356176406,
+      0.02474405245474289,
       0.017095234304717735,
-      0.011415111740065452,
+      0.011415111740065454,
       0.007482577963101015,
-      0.0047698738556462535,
+      0.004769873855646254,
       0.002948091284747602,
-      0.0017725798590443338,
+      0.0017725798590443333,
       0.0010323738247512595,
-      5.823000408387339E-4,
+      5.82300040838734E-4,
       3.1694058457143036E-4,
-      1.656074574036077E-4,
-      8.238484623559817E-5,
-      3.852324830287548E-5,
-      1.657549901909999E-5,
+      1.6560745740360768E-4,
+      8.238484623559819E-5,
+      3.852324830287547E-5,
+      1.6575499019099995E-5,
       6.439186747078615E-6,
       2.192582065492888E-6,
-      6.24971939170665E-7,
+      6.249719391706649E-7,
       1.4238886738032342E-7
     ]
   }
diff --git a/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-RENO_NV.json b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-RENO_NV.json
index bafa93fbacb40d09fbb220fed30ff634ac6fcc9a..a3d21f9edbd8e822d3398c2ca9a4a92136e50559 100644
--- a/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-RENO_NV.json
+++ b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-RENO_NV.json
@@ -37,9 +37,9 @@
       0.002420101079214425,
       0.0010564988095787106,
       3.945561117465654E-4,
-      1.2048922319737728E-4,
+      1.2048922319737725E-4,
       2.8266770250121335E-5,
-      4.252380705836177E-6,
+      4.252380705836178E-6,
       4.4029329263288646E-7,
       2.573585831849357E-8,
       8.240992980384035E-11
@@ -69,19 +69,19 @@
       0.7929925155296614
     ],
     "ys": [
-      0.16195200240025112,
-      0.11197070315750861,
-      0.07461644808670248,
+      0.1619520024002511,
+      0.11197070315750862,
+      0.0746164480867025,
       0.04806931482649302,
-      0.029904421907731293,
-      0.018097205110430375,
+      0.029904421907731286,
+      0.01809720511043038,
       0.010526649862628145,
-      0.005849703609065979,
-      0.0030248691579733374,
+      0.005849703609065978,
+      0.003024869157973338,
       0.0013988990917255157,
       5.607903420664931E-4,
       1.884917390363045E-4,
-      5.034839107343866E-5,
+      5.034839107343867E-5,
       1.0331505761726529E-5,
       1.5403732253339458E-6,
       1.766940560506774E-7,
@@ -118,7 +118,7 @@
       0.6547357887817037,
       0.5154175476805015,
       0.3956456162265481,
-      0.2946377853731455,
+      0.29463778537314556,
       0.21261726439098355,
       0.14856083770157558,
       0.10023112298791949,
@@ -130,8 +130,8 @@
       0.0028672800399024167,
       0.001131585475187518,
       3.666664317975439E-4,
-      9.021209601637859E-5,
-      1.523566711127091E-5,
+      9.021209601637857E-5,
+      1.5235667111270909E-5,
       1.4539154793262797E-6,
       6.099357830874233E-8,
       4.063222371389606E-12
@@ -162,22 +162,22 @@
     ],
     "ys": [
       0.7737520693137596,
-      0.626158058671475,
+      0.6261580586714751,
       0.4943026693905384,
-      0.38152373161093633,
+      0.38152373161093645,
       0.2849928378328236,
       0.20811270361164624,
-      0.14726293268062962,
+      0.14726293268062965,
       0.1003374121401908,
       0.06562437576887947,
       0.04081755703105158,
-      0.02407438562720991,
-      0.013446854247539832,
+      0.024074385627209913,
+      0.013446854247539834,
       0.007078613802080741,
       0.003434334658947344,
       0.0014729955574711105,
       5.304815215680369E-4,
-      1.5325010460188717E-4,
+      1.532501046018872E-4,
       3.2864405116884194E-5,
       4.5541957008082325E-6,
       3.3625843088903307E-7
diff --git a/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-SALT_LAKE_CITY_UT.json b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-SALT_LAKE_CITY_UT.json
index 14f35cdc2ca7befbb18070c9f8d24d5fb6a6eb70..d4c53478937a7f9a14b446ee40bff966f0904a6c 100644
--- a/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-SALT_LAKE_CITY_UT.json
+++ b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-SALT_LAKE_CITY_UT.json
@@ -23,26 +23,26 @@
       1.7119945007591924
     ],
     "ys": [
-      0.10141210582180435,
-      0.07447849798602046,
-      0.05330127231316856,
-      0.03710281879513821,
-      0.025232028167263762,
-      0.01661034649634634,
-      0.010874067593129606,
-      0.00708922479836808,
-      0.004735625457686324,
-      0.003249464756093951,
-      0.002245495226811023,
-      0.001491447877255857,
-      8.988552768687257E-4,
-      4.6566809395121093E-4,
-      1.9882970591587768E-4,
-      6.78502921280055E-5,
-      1.6876651512201572E-5,
-      2.653741741725593E-6,
-      1.731813940276621E-7,
-      1.035570404004172E-10
+      0.10757811162031562,
+      0.07957011355012675,
+      0.05737827016380388,
+      0.04027976431795187,
+      0.0276408517828518,
+      0.018357720422996257,
+      0.012093857135505218,
+      0.007896369062561259,
+      0.005254206301457623,
+      0.003587002037983353,
+      0.0024827837917689175,
+      0.0016732098651853502,
+      0.0010380702649216227,
+      5.606219620093439E-4,
+      2.5202853095702125E-4,
+      9.160154941360827E-5,
+      2.4864160867042876E-5,
+      4.544185142396868E-6,
+      3.732917476243578E-7,
+      4.214779787490519E-9
     ]
   },
   "5.00 Second Spectral Acceleration": {
@@ -69,25 +69,25 @@
       0.7929925155296614
     ],
     "ys": [
-      0.033387015764916865,
-      0.024650966455601664,
-      0.01764423071929716,
-      0.012269680846161648,
-      0.008337057201618096,
-      0.005635024432572454,
-      0.0037891327023550246,
-      0.0025149123784953846,
-      0.0015863429059217115,
-      9.014315449747967E-4,
-      4.4140296504165355E-4,
-      1.7921117169766217E-4,
-      5.7541181003569944E-5,
-      1.4224526877692225E-5,
-      2.2078569144162733E-6,
-      1.888075384391226E-7,
-      2.916565870061634E-9,
-      1.3533194681297857E-11,
-      1.4761223207476853E-12,
+      0.03805908121278129,
+      0.028580222602703518,
+      0.020845823977263308,
+      0.014740037128774407,
+      0.010119958839797551,
+      0.006857311368365846,
+      0.004613646647606711,
+      0.003097068370084498,
+      0.002020602295091759,
+      0.0012191649154324918,
+      6.4862821952059E-4,
+      2.917614881440183E-4,
+      1.0616704525758154E-4,
+      3.09035228115567E-5,
+      6.223105810275529E-6,
+      7.737881323191248E-7,
+      4.828818955173788E-8,
+      5.045450350623247E-10,
+      1.4761223207476851E-12,
       7.36531590202622E-14
     ]
   },
@@ -116,25 +116,25 @@
     ],
     "ys": [
       0.13047100258720737,
-      0.09849712329595019,
+      0.0984971232959502,
       0.07246017969843056,
       0.05191828655903307,
       0.03636526505318483,
-      0.024993217741374765,
+      0.02499321774137477,
       0.01690096807101634,
-      0.011231650127527281,
-      0.007452801108191978,
-      0.005017181957434342,
+      0.011231650127527283,
+      0.00745280110819198,
+      0.005017181957434343,
       0.0034705679298442814,
       0.002402368539815233,
-      0.0016078002266633948,
+      0.0016078002266633952,
       9.514053815001428E-4,
-      4.656644721669266E-4,
-      1.753633004388021E-4,
-      4.8116672189662925E-5,
-      8.632653500921544E-6,
+      4.656644721669268E-4,
+      1.753633004388022E-4,
+      4.811667218966292E-5,
+      8.632653500921547E-6,
       8.008388400062674E-7,
-      2.268010646406833E-8
+      2.2680106464068334E-8
     ]
   },
   "0.20 Second Spectral Acceleration": {
@@ -167,19 +167,19 @@
       0.0720099099078939,
       0.05129669394322607,
       0.03606585232915037,
-      0.02491600581620359,
+      0.024916005816203592,
       0.01691309964162624,
-      0.011363408680915814,
-      0.007619737320678117,
+      0.011363408680915815,
+      0.007619737320678116,
       0.00518641999113049,
-      0.003611556059854821,
-      0.0025392805366635405,
+      0.00361155605985482,
+      0.00253928053666354,
       0.0017305585661145017,
       0.0010724055561078666,
-      5.639609734298514E-4,
-      2.3956867451954396E-4,
-      7.882123713799233E-5,
-      1.8675841989591893E-5,
+      5.639609734298516E-4,
+      2.39568674519544E-4,
+      7.88212371379923E-5,
+      1.8675841989591896E-5,
       2.7011160805776843E-6
     ]
   }
diff --git a/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-SAN_FRANCISCO_CA.json b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-SAN_FRANCISCO_CA.json
index b115702a4fb11f0f2e2a2b93f7af3cac3a36201f..1ef0c588a4967cb4085ef7cac588beb242ba2dbd 100644
--- a/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-SAN_FRANCISCO_CA.json
+++ b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-SAN_FRANCISCO_CA.json
@@ -32,7 +32,7 @@
       0.06138384495043732,
       0.039071093308164724,
       0.024201671562405724,
-      0.014386438506911663,
+      0.014386438506911667,
       0.008094350202773508,
       0.004200420158829751,
       0.0019393747258170354,
@@ -71,7 +71,7 @@
     "ys": [
       0.15758937503731726,
       0.11247692685397596,
-      0.07946884297427434,
+      0.07946884297427431,
       0.05560574371886311,
       0.03824085383493095,
       0.02585465059626231,
@@ -82,7 +82,7 @@
       0.002153405881721278,
       0.0010132607735766973,
       4.0392561747766895E-4,
-      1.357315165926373E-4,
+      1.3573151659263734E-4,
       3.5070265791185964E-5,
       6.763084787261478E-6,
       8.40775820950977E-7,
@@ -165,7 +165,7 @@
       0.6798282480043856,
       0.529575106126662,
       0.4029924331123037,
-      0.2978878788706715,
+      0.2978878788706714,
       0.21720849261933428,
       0.15561695133652087,
       0.10937917498336787,
@@ -174,10 +174,10 @@
       0.031720239807918466,
       0.018914948303394897,
       0.010396290099441215,
-      0.005116134863810127,
+      0.005116134863810128,
       0.002168905715322163,
       7.537255830739884E-4,
-      2.043519900756787E-4,
+      2.0435199007567872E-4,
       3.950315353965148E-5,
       4.114149996331726E-6,
       1.1332666265240459E-7
diff --git a/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-SEATTLE_WA.json b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-SEATTLE_WA.json
index 60e08a3b75b79add1c166d7d7ad4b3fc3cba3a38..a84b8b1376497287ff07f012c35ae9d408a78118 100644
--- a/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-SEATTLE_WA.json
+++ b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-SEATTLE_WA.json
@@ -23,26 +23,26 @@
       1.7119945007591924
     ],
     "ys": [
-      0.18974076473276455,
-      0.15035830377424855,
-      0.11450746102005707,
-      0.08372212205395724,
-      0.05905693494677333,
-      0.03979043310304015,
-      0.026081869846344616,
-      0.016390117896193383,
-      0.009939769051733804,
-      0.0057322926082014215,
-      0.003091115228735578,
-      0.0015239775147447626,
-      6.709168675782273E-4,
-      2.5748470068598036E-4,
-      8.378741714286619E-5,
-      2.2516613948134413E-5,
-      4.500727576177568E-6,
-      6.144243207535918E-7,
-      4.524870395276403E-8,
-      4.3303919732436456E-10
+      0.22241570623093976,
+      0.1829280451577437,
+      0.1448318147490399,
+      0.11014079807928763,
+      0.08073188866721041,
+      0.056523154956151345,
+      0.03845680832081368,
+      0.025122691683551766,
+      0.01589752884256221,
+      0.009661504852378041,
+      0.005579041181458256,
+      0.0030025526411616497,
+      0.0014690971633349753,
+      6.364442444196518E-4,
+      2.3763115583014073E-4,
+      7.483075324811945E-5,
+      1.849159244838621E-5,
+      3.3895460556769015E-6,
+      3.9675850091614954E-7,
+      2.354050123798512E-8
     ]
   },
   "5.00 Second Spectral Acceleration": {
@@ -69,26 +69,26 @@
       0.7929925155296614
     ],
     "ys": [
-      0.05798340021258257,
-      0.04190422736568196,
-      0.02936624320782965,
-      0.01992526977609041,
-      0.013059136945119223,
-      0.008356470041248175,
-      0.005219092927360337,
-      0.0032087975808839653,
-      0.0019199405262616406,
-      0.0010855264302155054,
-      5.619278902307794E-4,
-      2.563270845634497E-4,
-      9.79582646732166E-5,
-      3.0939506848565075E-5,
-      7.164683336505891E-6,
-      9.927613969917701E-7,
-      3.041624502650113E-8,
-      2.0591305604095127E-11,
-      0.0,
-      0.0
+      0.08205577100705908,
+      0.061266834717159734,
+      0.04455728997923758,
+      0.03145010836689442,
+      0.021405885334622142,
+      0.014124098414222007,
+      0.009024213385085463,
+      0.0056644003126977704,
+      0.003499891539804657,
+      0.002098701424790068,
+      0.0011956688842710385,
+      6.256461321358485E-4,
+      2.8749119746093553E-4,
+      1.1405401273930701E-4,
+      3.594228048167488E-5,
+      8.754027822126098E-6,
+      1.2809718721036886E-6,
+      5.8477442571272573E-8,
+      3.312385113009849E-10,
+      8.135310824349085E-12
     ]
   },
   "Peak Ground Acceleration": {
@@ -115,24 +115,24 @@
       1.6428726885203377
     ],
     "ys": [
-      0.24771893078422796,
+      0.247718930784228,
       0.21523675836712639,
       0.18161823548824618,
-      0.1478057991464071,
+      0.14780579914640707,
       0.11545178047071233,
-      0.08622984829115032,
+      0.08622984829115031,
       0.061430834058407394,
       0.0414783202603966,
-      0.026613647847004047,
+      0.026613647847004044,
       0.01612206210785767,
       0.009167459234650009,
-      0.004722903807205595,
+      0.0047229038072055946,
       0.002214599540841417,
       8.96285507325836E-4,
       3.067999345972684E-4,
       8.267322513113308E-5,
       1.5932119719803484E-5,
-      1.7946631532952554E-6,
+      1.7946631532952552E-6,
       1.06895828117477E-7,
       6.68125464781831E-10
     ]
@@ -161,23 +161,23 @@
       1.998773638612381
     ],
     "ys": [
-      0.2721574775594709,
+      0.27215747755947084,
       0.24281747775616974,
       0.2111408438896052,
       0.17854755392401112,
       0.14527845926431035,
-      0.11415150096883399,
+      0.114151500968834,
       0.08587864028339966,
-      0.06154846143016319,
-      0.04205905132892356,
+      0.06154846143016321,
+      0.04205905132892357,
       0.027299698171629392,
-      0.016780630826315708,
+      0.01678063082631571,
       0.009668716589318763,
       0.005145168066638075,
       0.002484010178699564,
-      0.0010642217286274949,
+      0.0010642217286274947,
       3.910335843512345E-4,
-      1.18838326388187E-4,
+      1.1883832638818702E-4,
       2.8076658021732084E-5,
       4.561137287903132E-6,
       4.7281340794708457E-7
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-BOSTON_MA.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-BOSTON_MA.json
index b4f233f9c1fc33d11f2f78ec296f06871a40e009..138f30db2429533acfe07d66ad215fbd456f1e56 100644
--- a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-BOSTON_MA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-BOSTON_MA.json
@@ -23,26 +23,26 @@
       1.7119945007591924
     ],
     "ys": [
-      0.03346755416366612,
-      0.022557200491052698,
-      0.014763986503134641,
-      0.009327317993438729,
-      0.005685492691994158,
-      0.0032697776661491595,
-      0.001808174730337916,
-      9.397169148929885E-4,
-      4.6650025858243184E-4,
-      2.2130003530643352E-4,
-      1.0133597473814798E-4,
-      4.502539099196584E-5,
-      1.9345922229214045E-5,
-      7.918132827671318E-6,
-      3.0090815448135E-6,
-      1.0398494533975857E-6,
-      3.077407395726649E-7,
-      7.674121124774866E-8,
-      1.508653194987534E-8,
-      2.097648839891557E-9
+      0.033467645100364915,
+      0.02255731474903664,
+      0.014764102885642854,
+      0.00932742536862986,
+      0.005685585081840404,
+      0.0032698510455971635,
+      0.0018082283691248805,
+      9.397523751119597E-4,
+      4.665216653497552E-4,
+      2.21311876130225E-4,
+      1.013420665395574E-4,
+      4.502836662189109E-5,
+      1.934731997822941E-5,
+      7.918765642714748E-6,
+      3.0093520060664596E-6,
+      1.0399554965154735E-6,
+      3.077763262822755E-7,
+      7.675113969568764E-8,
+      1.5088640004525927E-8,
+      2.0979463548973946E-9
     ]
   },
   "5.00 Second Spectral Acceleration": {
@@ -69,26 +69,26 @@
       0.7929925155296614
     ],
     "ys": [
-      0.007758810170697582,
-      0.0051491196078185504,
-      0.0033019695894804997,
-      0.0020285313254987847,
-      0.0011783083571703633,
-      6.477290967789177E-4,
-      3.329075584218624E-4,
-      1.6173047449197553E-4,
-      7.448908313130598E-5,
-      3.246316310950858E-5,
-      1.351820787920251E-5,
-      5.391565998655191E-6,
-      2.0343143293788164E-6,
-      7.354301088621942E-7,
-      2.3823143660187517E-7,
-      6.949750314481478E-8,
-      1.7124708361215555E-8,
-      3.4265539829553458E-9,
-      5.081915968723924E-10,
-      5.066275936979035E-11
+      0.007758842908797929,
+      0.005149163820278125,
+      0.003302014238353026,
+      0.0020285696349212692,
+      0.0011783369527133014,
+      6.47747904988567E-4,
+      3.3291850411255506E-4,
+      1.617362438442745E-4,
+      7.449189898315069E-5,
+      3.246446216296383E-5,
+      1.3518785608064903E-5,
+      5.39181511144338E-6,
+      2.0344156214059335E-6,
+      7.354690350729374E-7,
+      2.3824440103395323E-7,
+      6.950123036934147E-8,
+      1.712556382235624E-8,
+      3.426698721381284E-9,
+      5.082066799507751E-10,
+      5.066343706695574E-11
     ]
   },
   "Peak Ground Acceleration": {
@@ -115,26 +115,26 @@
       1.6428726885203377
     ],
     "ys": [
-      0.06159245682992302,
-      0.046399822837671925,
-      0.03432471215930829,
-      0.024733795281146213,
-      0.01728092312328412,
-      0.011677801710623378,
-      0.00763260111481106,
-      0.004804581911640537,
-      0.002934265415118956,
-      0.0017390027457468654,
-      0.0010066652347245227,
-      5.594440629574837E-4,
-      3.0429749121860895E-4,
-      1.5735128050630912E-4,
-      7.734012241669328E-5,
-      3.5050657350290064E-5,
-      1.4267024886511789E-5,
-      5.007225224153831E-6,
-      1.4816102635414506E-6,
-      3.393605508868349E-7
+      0.061592447786729475,
+      0.04639974229258597,
+      0.03432459497873905,
+      0.02473366727709542,
+      0.017280801450424373,
+      0.011677696356528568,
+      0.00763251672254187,
+      0.004804519556899061,
+      0.0029342230403746907,
+      0.0017389764981837867,
+      0.0010066503796589347,
+      5.594364156532158E-4,
+      3.042936479444236E-4,
+      1.573493201386991E-4,
+      7.73390729644225E-5,
+      3.5050103418906365E-5,
+      1.4266757376659537E-5,
+      5.007113179397132E-6,
+      1.4815699147526697E-6,
+      3.3934865452667515E-7
     ]
   },
   "0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
       1.998773638612381
     ],
     "ys": [
-      0.08650879074287893,
-      0.06528040068008836,
-      0.0477190800116831,
-      0.03386765302691039,
-      0.022983934369750755,
-      0.015099449346149926,
-      0.009510214760030772,
-      0.00573129686161342,
-      0.0033251500956733137,
-      0.0018552838676130113,
-      9.99128090120318E-4,
-      5.19181990064956E-4,
-      2.5976133083070567E-4,
-      1.2441138639995424E-4,
-      5.6392335873515366E-5,
-      2.3684653562081443E-5,
-      9.034444359708004E-6,
-      3.033378115816712E-6,
-      8.54924183060783E-7,
-      1.9276398391583697E-7
+      0.08650888397838606,
+      0.06528043106679644,
+      0.04771906302557905,
+      0.03386761240022137,
+      0.022983890944325232,
+      0.015099415540518699,
+      0.009510193999359514,
+      0.005731287460882947,
+      0.0033251487143996224,
+      0.001855287307071394,
+      9.99133518490477E-4,
+      5.191872616640555E-4,
+      2.5976530177954305E-4,
+      1.244138651804819E-4,
+      5.6393675077766515E-5,
+      2.3685300743977286E-5,
+      9.034732099489303E-6,
+      3.033496151492734E-6,
+      8.549667856323727E-7,
+      1.927768075329351E-7
     ]
   }
 }
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-CHICAGO_IL.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-CHICAGO_IL.json
index 578f514ee94781f3dc9515941f82b2f7a79714cb..48e180da1f97c59beb41a9091095276ffd2ea389 100644
--- a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-CHICAGO_IL.json
+++ b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-CHICAGO_IL.json
@@ -23,24 +23,24 @@
       1.7119945007591924
     ],
     "ys": [
-      0.029964815120764633,
-      0.01967855810228778,
+      0.02996481512076463,
+      0.019678558102287778,
       0.012726786180465239,
-      0.008124705217254329,
-      0.005148224420806256,
-      0.003154960801071228,
+      0.00812470521725433,
+      0.005148224420806258,
+      0.0031549608010712285,
       0.001863424624369617,
-      0.0010087280007981768,
-      4.907936765817721E-4,
-      2.0713280362524944E-4,
-      7.418827864821866E-5,
+      0.001008728000798177,
+      4.907936765817723E-4,
+      2.0713280362524947E-4,
+      7.418827864821864E-5,
       2.221379851940245E-5,
-      5.614550796498905E-6,
+      5.614550796498904E-6,
       1.337724334235127E-6,
-      3.424972836628831E-7,
-      1.0703188884019856E-7,
+      3.4249728366288295E-7,
+      1.0703188884019855E-7,
       2.9796982314831965E-8,
-      7.002571211474243E-9,
+      7.002571211474242E-9,
       1.2894093601737816E-9,
       1.67102661159449E-10
     ]
@@ -69,24 +69,24 @@
       0.7929925155296614
     ],
     "ys": [
-      0.008882681904568679,
-      0.0062495768584536785,
+      0.008882681904568684,
+      0.00624957685845368,
       0.00443889967000697,
       0.0031656471283540767,
       0.0022130793325516786,
-      0.0014778214944429163,
-      9.063847925138166E-4,
+      0.001477821494442916,
+      9.063847925138167E-4,
       4.9794696686327E-4,
-      2.3779088066829156E-4,
-      9.545556219116024E-5,
-      3.1537673566688183E-5,
-      8.307714692274409E-6,
+      2.377908806682916E-4,
+      9.545556219116022E-5,
+      3.1537673566688204E-5,
+      8.307714692274412E-6,
       1.6619784820297114E-6,
       2.6415653631573427E-7,
-      3.336255563701558E-8,
+      3.336255563701559E-8,
       6.093850327400648E-9,
       1.4576367616076917E-9,
-      3.0020021783184475E-10,
+      3.002002178318448E-10,
       4.834643182724521E-11,
       5.6117455631448516E-12
     ]
@@ -115,26 +115,26 @@
       1.6428726885203377
     ],
     "ys": [
-      0.03693486053663319,
-      0.024470346890902217,
-      0.016059472515897188,
-      0.010409172279029755,
-      0.006628239067413801,
+      0.03693486053663318,
+      0.02447034689090222,
+      0.01605947251589719,
+      0.010409172279029759,
+      0.0066282390674138,
       0.004091032821266369,
-      0.002404899126937393,
-      0.0013222712295030364,
-      6.884339150903424E-4,
-      3.4553420275528363E-4,
-      1.730168139631001E-4,
-      8.64752274748757E-5,
-      4.4251999266388867E-5,
-      2.218476743124492E-5,
-      1.0741759072955687E-5,
-      4.821596829764712E-6,
-      1.945738890221924E-6,
-      6.765558778655968E-7,
-      1.9817335166715122E-7,
-      4.486720126368366E-8
+      0.0024048991269373923,
+      0.0013222712295030362,
+      6.884339150903425E-4,
+      3.4553420275528385E-4,
+      1.7301681396310017E-4,
+      8.647522747487573E-5,
+      4.425199926638887E-5,
+      2.218476743124493E-5,
+      1.0741759072955684E-5,
+      4.8215968297647115E-6,
+      1.9457388902219244E-6,
+      6.765558778655967E-7,
+      1.981733516671513E-7,
+      4.4867201263683655E-8
     ]
   },
   "0.20 Second Spectral Acceleration": {
@@ -161,25 +161,25 @@
       1.998773638612381
     ],
     "ys": [
-      0.06346135855391186,
+      0.06346135855391184,
       0.042670772619062616,
-      0.02780021839268763,
-      0.017762328063338887,
-      0.011002049677500146,
-      0.0067038068317408,
-      0.00392198731996464,
-      0.002158201872485949,
+      0.027800218392687634,
+      0.017762328063338894,
+      0.011002049677500144,
+      0.006703806831740803,
+      0.003921987319964639,
+      0.0021582018724859487,
       0.0011076626918678251,
       5.263317603868954E-4,
-      2.347746534731069E-4,
-      1.0080931653186257E-4,
-      4.292895005595372E-5,
+      2.3477465347310677E-4,
+      1.0080931653186259E-4,
+      4.2928950055953734E-5,
       1.834568538422175E-5,
-      7.749565860435879E-6,
-      3.1122981869459675E-6,
-      1.147410215393599E-6,
+      7.749565860435877E-6,
+      3.112298186945968E-6,
+      1.1474102153935985E-6,
       3.7324435098356717E-7,
-      1.0153003800904252E-7,
+      1.0153003800904256E-7,
       2.1876963839126116E-8
     ]
   }
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-LOS_ANGELES_CA.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-LOS_ANGELES_CA.json
index 7130c2a0eeb109e03d2d8e1001cb3ae7d8b3ad0a..b2b04b215373444f7b9a7c0f249727096557d41a 100644
--- a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-LOS_ANGELES_CA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-LOS_ANGELES_CA.json
@@ -23,26 +23,26 @@
       1.7119945007591924
     ],
     "ys": [
-      0.8539288380993981,
-      0.6416002980406391,
-      0.4658273233458635,
-      0.3261747004451474,
-      0.22063496299815982,
-      0.14178240850617324,
-      0.08794800699255846,
-      0.0517279511471907,
-      0.029189650700517718,
-      0.01572130570061983,
-      0.008085435031818121,
-      0.003971976772213098,
-      0.0018574531046485264,
-      8.117697251830593E-4,
-      3.2073499529379186E-4,
-      1.1035968318710794E-4,
-      3.0248466672085807E-5,
-      6.077344258608142E-6,
-      6.703226030373499E-7,
-      1.630129659714372E-8
+      0.8930449519019783,
+      0.6749969659753676,
+      0.49303885051075713,
+      0.3475054264030445,
+      0.23683138092363426,
+      0.15354016120592875,
+      0.09615046387268711,
+      0.05711825926134556,
+      0.03254983412381369,
+      0.017706551998919143,
+      0.009199256321560047,
+      0.004564415356652822,
+      0.0021562936253538795,
+      9.547518736988405E-4,
+      3.843661108834438E-4,
+      1.3593109798767843E-4,
+      3.889249998627689E-5,
+      8.457986321819216E-6,
+      1.1051308985395114E-6,
+      5.259011100968705E-8
     ]
   },
   "5.00 Second Spectral Acceleration": {
@@ -69,26 +69,26 @@
       0.7929925155296614
     ],
     "ys": [
-      0.2456521612012551,
-      0.17573623584591097,
-      0.12131370951317134,
-      0.08048719341049493,
-      0.051153293667187835,
-      0.03144706530529664,
-      0.018567038856956986,
-      0.01050772704824782,
-      0.005588467871572755,
-      0.0027157129456517578,
-      0.0011889869403929093,
-      4.6340889495785745E-4,
-      1.5739703764302144E-4,
-      4.754432937542207E-5,
-      1.1900792406755397E-5,
-      2.4008873458398737E-6,
-      3.1297587092678193E-7,
-      1.8289859742357054E-8,
-      8.276019986286944E-12,
-      0.0
+      0.27349090881301874,
+      0.1978420981749357,
+      0.13848906814382847,
+      0.09329324674608401,
+      0.06015937982113755,
+      0.037455218019174744,
+      0.022411312341210694,
+      0.012923513590814936,
+      0.007068623105797562,
+      0.003570755888867055,
+      0.0016390605242597017,
+      6.752487606634823E-4,
+      2.4533284562506884E-4,
+      8.032285440828849E-5,
+      2.247175730385522E-5,
+      5.411418886960912E-6,
+      9.928107472863706E-7,
+      1.1743055609458905E-7,
+      5.982617399200269E-9,
+      3.071987966436827E-14
     ]
   },
   "Peak Ground Acceleration": {
@@ -115,26 +115,26 @@
       1.6428726885203377
     ],
     "ys": [
-      1.046974867877238,
-      0.8281882840626271,
-      0.6398091064467929,
-      0.48212837140572806,
-      0.35391799413244635,
-      0.25188707638731156,
-      0.1725434309067007,
-      0.11222371464518296,
-      0.0690782911383039,
-      0.0398616273082193,
-      0.021539393689374547,
-      0.010659556233289662,
-      0.004985683427945911,
-      0.0021450022068776873,
-      8.417944262012341E-4,
-      2.827295888439779E-4,
-      7.554917725553729E-5,
-      1.4468993314942007E-5,
-      1.730720262618843E-6,
-      7.461843860267401E-8
+      1.0408793391971658,
+      0.8228826460484955,
+      0.6353831504644993,
+      0.47852783291878337,
+      0.3510224552701482,
+      0.2495855477480165,
+      0.1707599949868633,
+      0.11090265514843083,
+      0.06815040581058016,
+      0.03924877869438323,
+      0.02116071390003618,
+      0.010447140759295407,
+      0.0048755764198802195,
+      0.002092817691903345,
+      8.186454543042516E-4,
+      2.734436254989102E-4,
+      7.233828570932013E-5,
+      1.3617045711482666E-5,
+      1.5643150627006195E-6,
+      5.836979641093877E-8
     ]
   },
   "0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
       1.998773638612381
     ],
     "ys": [
-      1.232870540531721,
-      1.006611233950237,
-      0.798975425502203,
-      0.6204240257090055,
-      0.4678763021468664,
-      0.345897054990577,
-      0.2479182659590058,
-      0.17072640888673438,
-      0.11240161598549511,
-      0.0700352795074653,
-      0.04109285188589309,
-      0.022596767391862383,
-      0.011639934463939823,
-      0.0056359439141291535,
-      0.0025619162330054518,
-      0.0010694913624221224,
-      3.9642573573017784E-4,
-      1.2392693989169174E-4,
-      3.0162262438589076E-5,
-      5.1681257361880835E-6
+      1.2322845948043493,
+      1.0061598465683435,
+      0.7986159298404086,
+      0.6201221957030617,
+      0.4676124373980192,
+      0.3456609702956266,
+      0.247711664304258,
+      0.1705552243103603,
+      0.11226595990131216,
+      0.06992833061816081,
+      0.04100714363585288,
+      0.022529752631688313,
+      0.011592421694006833,
+      0.005606862118102381,
+      0.002546612025525221,
+      0.0010623256549632133,
+      3.933660299968117E-4,
+      1.2270161178495203E-4,
+      2.972703740529991E-5,
+      5.047438500391396E-6
     ]
   }
 }
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-NEW_MADRID_MO.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-NEW_MADRID_MO.json
index 5f4f06db061873ecd797a97e042665b15bbc20e0..4c50ba26a9cb685514adc3e9ad72eb1641a059a4 100644
--- a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-NEW_MADRID_MO.json
+++ b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-NEW_MADRID_MO.json
@@ -23,26 +23,26 @@
       1.7119945007591924
     ],
     "ys": [
-      0.10358062323219151,
-      0.07745748150931668,
-      0.05660747636417113,
-      0.04042342638987806,
-      0.028350087574235867,
-      0.019353430401262615,
-      0.013145180739244117,
-      0.008861149329727978,
-      0.006090671608001828,
-      0.004342930841015495,
-      0.0032478344456820887,
-      0.002505245167796655,
-      0.0019053397727992504,
-      0.0013485062939064916,
-      8.42494116876414E-4,
-      4.502678640755521E-4,
-      1.976351755819514E-4,
-      7.066434712559799E-5,
-      1.952705801857714E-5,
-      3.971520967606423E-6
+      0.10862105279541635,
+      0.08165947536542632,
+      0.059995229864402304,
+      0.04307097673528893,
+      0.030364358908987584,
+      0.02083125364837016,
+      0.014202191808198142,
+      0.009586307658653568,
+      0.006570076098277394,
+      0.004648984561824664,
+      0.0034431288049768844,
+      0.002641116137706031,
+      0.00201819306477022,
+      0.0014549433630508962,
+      9.393340073177629E-4,
+      5.254079048744595E-4,
+      2.4450302713741913E-4,
+      9.407692714172437E-5,
+      2.8782866454993592E-5,
+      6.69942572700161E-6
     ]
   },
   "5.00 Second Spectral Acceleration": {
@@ -69,26 +69,26 @@
       0.7929925155296614
     ],
     "ys": [
-      0.025761063859195195,
-      0.01848540463889163,
-      0.013179070929806315,
-      0.009405423704741213,
-      0.006769044364628957,
-      0.005001180311882074,
-      0.003830448773186797,
-      0.0030762156338220536,
-      0.0025622742318264055,
-      0.0021435146560875883,
-      0.0017294646999068987,
-      0.0012972645441496876,
-      8.779976160939438E-4,
-      5.309247259220456E-4,
-      2.7397440956517346E-4,
-      1.2038085807790532E-4,
-      4.3264072184664595E-5,
-      1.2365690635682477E-5,
-      2.6088440505908087E-6,
-      3.8516213378325295E-7
+      0.024530314046554685,
+      0.01757990831464154,
+      0.012528851607268094,
+      0.00894988613165413,
+      0.006459133844032859,
+      0.004795503373771293,
+      0.003696858469788254,
+      0.002986781285756636,
+      0.0024926315737724453,
+      0.002073930037039539,
+      0.0016513477008498298,
+      0.001215785598606242,
+      8.042554806213793E-4,
+      4.73525219280476E-4,
+      2.368926845395888E-4,
+      1.0078048232087253E-4,
+      3.5000665277206334E-5,
+      9.64188381511637E-6,
+      1.968999957682065E-6,
+      2.796133615562724E-7
     ]
   },
   "Peak Ground Acceleration": {
@@ -115,26 +115,26 @@
       1.6428726885203377
     ],
     "ys": [
-      0.19458166187530543,
-      0.1693134147852753,
-      0.14453646391446162,
-      0.12032560619570798,
-      0.09744597032804848,
-      0.07677957639230393,
-      0.05897599348068434,
-      0.044109531498977936,
-      0.03228529766469283,
-      0.023122460358111326,
-      0.016278528162292912,
-      0.011181460380163282,
-      0.007655829963156034,
-      0.0052051035526138175,
-      0.0035480090251175287,
-      0.0023532351485886383,
-      0.001436983224845903,
-      7.502218790975708E-4,
-      3.188700677941117E-4,
-      1.0242212698469025E-4
+      0.19003250910809658,
+      0.16344178879479004,
+      0.1377374347925007,
+      0.1131551148682328,
+      0.09048517197002545,
+      0.07047280040074728,
+      0.053558629253129014,
+      0.03965363176678579,
+      0.0287504507082319,
+      0.020426306734937883,
+      0.01430649496717778,
+      0.009813343152014063,
+      0.006726570411124061,
+      0.004565211367583447,
+      0.0030787805906867757,
+      0.0020054195939523843,
+      0.0012056016468158333,
+      6.26244211704487E-4,
+      2.680339783108176E-4,
+      8.761713500064396E-5
     ]
   },
   "0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
       1.998773638612381
     ],
     "ys": [
-      0.2227713332347917,
-      0.19267780095154366,
-      0.16253763007184846,
-      0.13340265390238687,
-      0.10545781737787334,
-      0.08102462689393318,
-      0.060324218380989565,
-      0.043572093087417635,
-      0.03068255558347451,
-      0.02105305491369003,
-      0.014140076348477266,
-      0.009371914326449932,
-      0.00622319794736788,
-      0.004207432284307582,
-      0.002902010343163818,
-      0.0019822990086727243,
-      0.0012624641579655207,
-      6.948349426867885E-4,
-      3.090903591593159E-4,
-      1.0662815471703242E-4
+      0.22073290404435011,
+      0.19040599799093288,
+      0.1601767937821178,
+      0.13114397091422006,
+      0.10347487060688548,
+      0.07940173459453344,
+      0.059067247685937005,
+      0.0426383760251058,
+      0.030013182373905878,
+      0.02059436368173501,
+      0.013842097182240819,
+      0.009187938750875648,
+      0.00611057175911593,
+      0.004132107908236167,
+      0.0028421270909669265,
+      0.0019304112418350651,
+      0.0012250563819192475,
+      6.772278920636926E-4,
+      3.053219499076044E-4,
+      1.0753304827569297E-4
     ]
   }
 }
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-NEW_YORK_NY.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-NEW_YORK_NY.json
index 6cc74aab9e25bf50ba1fa2556cd0d136614b203f..490b99af544fcbdc2020c9efc3fe36616f520e66 100644
--- a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-NEW_YORK_NY.json
+++ b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-NEW_YORK_NY.json
@@ -23,26 +23,26 @@
       1.7119945007591924
     ],
     "ys": [
-      0.03407219120226066,
-      0.022982706050341695,
-      0.015008288541981751,
-      0.009432325302509391,
-      0.0057163806231266025,
-      0.003279655961506287,
-      0.0018241302441601988,
-      9.656529122202132E-4,
-      4.957163928328354E-4,
-      2.4670246701349863E-4,
-      1.1958355278580447E-4,
-      5.630136027647556E-5,
-      2.5453881166342697E-5,
-      1.0835319619539925E-5,
-      4.23755961812128E-6,
-      1.4942600814023722E-6,
-      4.4860810289748656E-7,
-      1.1292572461566596E-7,
-      2.2339205863982945E-8,
-      3.1216440050802394E-9
+      0.03407226942036369,
+      0.022982814921679987,
+      0.015008406111340931,
+      0.009432436423167994,
+      0.005716475258084713,
+      0.0032797288160610746,
+      0.0018241819862603308,
+      9.656867516021692E-4,
+      4.957371142667414E-4,
+      2.4671439533343475E-4,
+      1.1959008182377565E-4,
+      5.630478235127674E-5,
+      2.5455606777734668E-5,
+      1.0836149662170067E-5,
+      4.237930949595059E-6,
+      1.4944103204824412E-6,
+      4.486596040856405E-7,
+      1.1294028594918225E-7,
+      2.2342324308523975E-8,
+      3.1220867882903023E-9
     ]
   },
   "5.00 Second Spectral Acceleration": {
@@ -69,26 +69,26 @@
       0.7929925155296614
     ],
     "ys": [
-      0.008158764601881738,
-      0.005336098982173022,
-      0.003355434386741787,
-      0.002018415088703445,
-      0.001151204930988976,
-      6.260882603714228E-4,
-      3.221404700728416E-4,
-      1.5911765121176706E-4,
-      7.580422981466801E-5,
-      3.471911621569134E-5,
-      1.533962805016468E-5,
-      6.498239431623124E-6,
-      2.5866569881185795E-6,
-      9.742188391054496E-7,
-      3.2497158968255214E-7,
-      9.688642098821362E-8,
-      2.426444096753887E-8,
-      4.914394283222754E-9,
-      7.367825264656388E-10,
-      7.412692483524559E-11
+      0.008158803555679018,
+      0.005336148630595297,
+      0.0033554820990660417,
+      0.002018453740225622,
+      0.00115123218218696,
+      6.26105412850544E-4,
+      3.2215024226018093E-4,
+      1.5912285857150514E-4,
+      7.580689616285952E-5,
+      3.472043856901112E-5,
+      1.5340269126857917E-5,
+      6.4985377923203855E-6,
+      2.5867863686456793E-6,
+      9.742706359897133E-7,
+      3.2498938546034085E-7,
+      9.689165258246799E-8,
+      2.426566177806144E-8,
+      4.914603732486728E-9,
+      7.368045782603923E-10,
+      7.412792780617275E-11
     ]
   },
   "Peak Ground Acceleration": {
@@ -115,26 +115,26 @@
       1.6428726885203377
     ],
     "ys": [
-      0.058115108634060185,
-      0.04414317339335065,
-      0.03306822763427058,
-      0.024270467702909047,
-      0.017399210476799067,
-      0.012158237273081034,
-      0.00827199845320781,
-      0.005447250654556268,
-      0.003486201538023379,
-      0.0021634966558098908,
-      0.0013071498144035958,
-      7.55492611735776E-4,
-      4.2471911316137344E-4,
-      2.2568577269874686E-4,
-      1.1326203658003756E-4,
-      5.2137755591886936E-5,
-      2.1469988210675136E-5,
-      7.603769774841467E-6,
-      2.267035638010967E-6,
-      5.229552553389532E-7
+      0.05811518523318233,
+      0.04414316168675036,
+      0.0330681578670971,
+      0.024270364494600762,
+      0.017399096042500943,
+      0.01215812943488983,
+      0.008271908095306328,
+      0.005447182012383277,
+      0.0034861535737541476,
+      0.0021634657088707965,
+      0.0013071311993435974,
+      7.554821748123944E-4,
+      4.247133423862543E-4,
+      2.2568258926431527E-4,
+      1.1326027066437292E-4,
+      5.2136820652783796E-5,
+      2.1469539475466853E-5,
+      7.603582374434526E-6,
+      2.266968044465042E-6,
+      5.229352726822007E-7
     ]
   },
   "0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
       1.998773638612381
     ],
     "ys": [
-      0.08132960350332255,
-      0.061474475520503745,
-      0.04520364121678544,
-      0.03241473416303897,
-      0.022356177776264693,
-      0.015023209193336695,
-      0.00975090610415447,
-      0.006099125125056098,
-      0.0036919698914579433,
-      0.002155750987278556,
-      0.0012151524288948278,
-      6.595837921667191E-4,
-      3.4341879582749685E-4,
-      1.7029126492544897E-4,
-      7.944820201648232E-5,
-      3.413550306731693E-5,
-      1.3243240021396652E-5,
-      4.501437759790097E-6,
-      1.2799175256615276E-6,
-      2.9038353836170277E-7
+      0.08132980849390072,
+      0.0614745882572146,
+      0.04520368318287055,
+      0.032414729660971614,
+      0.02235614818913707,
+      0.015023173250012055,
+      0.009750875933444487,
+      0.006099106095366765,
+      0.003691961810029137,
+      0.0021557507980630945,
+      0.0012151562938347684,
+      6.595885962118877E-4,
+      3.434227776294976E-4,
+      1.7029391231894578E-4,
+      7.944972105094808E-5,
+      3.413628636282667E-5,
+      1.3243611397904753E-5,
+      4.501598257162602E-6,
+      1.2799775932982995E-6,
+      2.90402066799299E-7
     ]
   }
 }
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-RENO_NV.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-RENO_NV.json
index 02ad9fb54b012d28416980b6930b67e887b575bf..ec40a089969123f0d3c28a5b35eb6636777ab1a0 100644
--- a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-RENO_NV.json
+++ b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-RENO_NV.json
@@ -71,16 +71,16 @@
     "ys": [
       0.11148054518889577,
       0.07597909201139702,
-      0.05010979224215272,
+      0.05010979224215273,
       0.03200264848330886,
       0.019723905842089263,
-      0.011816223886996517,
+      0.011816223886996515,
       0.006807018937827313,
-      0.0037574549876310285,
+      0.003757454987631028,
       0.00194510546759472,
       9.138143942870923E-4,
       3.791980077818598E-4,
-      1.3436087629974054E-4,
+      1.3436087629974052E-4,
       3.8630935874022573E-5,
       8.866582442380385E-6,
       1.3237321176197512E-6,
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SALT_LAKE_CITY_UT.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SALT_LAKE_CITY_UT.json
index 3ab5bff178eaebb05797208ae20cb33312568dce..da76be9fbfc704f18d4dc77b49f6f856959a5fe5 100644
--- a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SALT_LAKE_CITY_UT.json
+++ b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SALT_LAKE_CITY_UT.json
@@ -23,26 +23,26 @@
       1.7119945007591924
     ],
     "ys": [
-      0.10892958289083586,
-      0.07917493743081624,
-      0.05613813688833319,
-      0.03885971178036729,
-      0.026375683085714106,
-      0.01732519471692571,
-      0.011249318560509928,
-      0.007200453760337268,
-      0.004684451445636145,
-      0.0031268185640553887,
-      0.002114894613030359,
-      0.0013876912302454227,
-      8.330124490208875E-4,
-      4.332502928458422E-4,
-      1.8694516964039637E-4,
-      6.488921718247296E-5,
-      1.6564868653650565E-5,
-      2.6798094234084907E-6,
-      1.9271584869412147E-7,
-      6.991620522702557E-10
+      0.11219418149955272,
+      0.08193809804890372,
+      0.058427224056747246,
+      0.04072996942810843,
+      0.02788747322775262,
+      0.01851282278224689,
+      0.012146584111612459,
+      0.007835754705143829,
+      0.005113698062574506,
+      0.0034167358909599215,
+      0.0023236889978207856,
+      0.0015492366206914317,
+      9.571342183052802E-4,
+      5.18388722942248E-4,
+      2.3538879216005956E-4,
+      8.703406774261094E-5,
+      2.42709025241149E-5,
+      4.63551520457338E-6,
+      4.445081399101097E-7,
+      1.3384862684136067E-8
     ]
   },
   "5.00 Second Spectral Acceleration": {
@@ -69,25 +69,25 @@
       0.7929925155296614
     ],
     "ys": [
-      0.03477150324016148,
-      0.025441426826273594,
-      0.01814287594514211,
-      0.01256939999932583,
-      0.008443140167071135,
-      0.005564363368241966,
-      0.003601657307153889,
-      0.0023045575116806445,
-      0.0014340725248300089,
-      8.362494931705504E-4,
-      4.3962400424790043E-4,
-      2.0075863885738837E-4,
-      7.66395912606181E-5,
-      2.4219101404052943E-5,
-      5.694317923623323E-6,
-      9.774961708300538E-7,
-      9.230910931888038E-8,
-      2.3357301825316704E-9,
-      0.0,
+      0.03752282829007021,
+      0.02790235818081157,
+      0.020291473335101944,
+      0.014347620127278641,
+      0.009811815760070251,
+      0.006551698266619544,
+      0.0042851040081763915,
+      0.002780263825877548,
+      0.0017748261534795582,
+      0.001081374446409297,
+      6.059682111978197E-4,
+      3.0037487645006406E-4,
+      1.2686530093694687E-4,
+      4.5638086646417654E-5,
+      1.2816776692410322E-5,
+      2.813751553242538E-6,
+      4.3798093187898446E-7,
+      3.78243276990977E-8,
+      9.645509292239546E-10,
       0.0
     ]
   },
@@ -167,7 +167,7 @@
       0.08609678194538066,
       0.06109712680718186,
       0.04236120642631215,
-      0.028624171292861357,
+      0.028624171292861354,
       0.018867527952970933,
       0.01223753966006653,
       0.007900717612203576,
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SAN_FRANCISCO_CA.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SAN_FRANCISCO_CA.json
index cb071123a29d60be6e1d8dbab23e6e40947dbf7d..9b9b29ae5ff120d782d4c7af3e82101a27605e76 100644
--- a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SAN_FRANCISCO_CA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SAN_FRANCISCO_CA.json
@@ -23,26 +23,26 @@
       1.7119945007591924
     ],
     "ys": [
-      0.7753809259461388,
-      0.5688642117663596,
-      0.40229877707868167,
-      0.2755696271709122,
-      0.18480887318641825,
-      0.12036443232229746,
-      0.07769363087664322,
-      0.04885277825669539,
-      0.030053143542154638,
-      0.017807818426596084,
-      0.009989080151362701,
-      0.005162445764219136,
-      0.0023709531137533946,
-      9.28452168446586E-4,
-      2.956333145283411E-4,
-      7.25078551802247E-5,
-      1.0823292963928737E-5,
-      6.169716948402916E-7,
-      4.236737492237635E-9,
-      4.167617006160197E-11
+      0.7746375558648337,
+      0.568608027319152,
+      0.40228086776428584,
+      0.27559721539753224,
+      0.1847827745007173,
+      0.1202674102611144,
+      0.07755735738676434,
+      0.0487178660298033,
+      0.029946300572326875,
+      0.017735321826355236,
+      0.009943636050519693,
+      0.00513399800045274,
+      0.002353254885729413,
+      9.186108472798267E-4,
+      2.91134922239425E-4,
+      7.081671567626723E-5,
+      1.0380093911107993E-5,
+      5.655988991794296E-7,
+      4.335520555056763E-9,
+      4.1099056908468094E-11
     ]
   },
   "5.00 Second Spectral Acceleration": {
@@ -69,24 +69,24 @@
       0.7929925155296614
     ],
     "ys": [
-      0.2031138435117093,
-      0.14718822066836193,
-      0.10498486997697412,
-      0.0731716124789945,
-      0.049319891870685355,
-      0.03221870521764021,
-      0.020325290663636603,
-      0.012552977202883344,
-      0.007583787534486655,
-      0.004374314664541517,
-      0.0023275761423944873,
-      0.0010947180573360488,
-      4.3301460826232957E-4,
-      1.4170937718561521E-4,
-      3.4391700506215395E-5,
-      5.646164267346193E-6,
-      4.609992232212494E-7,
-      1.1503602055832257E-8,
+      0.20264046469596886,
+      0.146785546746948,
+      0.10463148505795675,
+      0.07286464975049436,
+      0.04906793152679367,
+      0.03202953707619522,
+      0.020197661449521717,
+      0.012473510851131452,
+      0.007536752836142,
+      0.004348527883314365,
+      0.002316103872775049,
+      0.0010915405967481125,
+      4.3296555332394715E-4,
+      1.4215533451047177E-4,
+      3.464257319303906E-5,
+      5.721595674845194E-6,
+      4.629202269862235E-7,
+      1.0201961208946842E-8,
       0.0,
       0.0
     ]
@@ -115,26 +115,26 @@
       1.6428726885203377
     ],
     "ys": [
-      0.9930305758307143,
-      0.7803920575690866,
-      0.5915371292322642,
-      0.4315737363002371,
-      0.3042029751381691,
-      0.2085564491528876,
-      0.14009876682712286,
-      0.092114955993327,
-      0.05939625281043636,
-      0.037077163952280154,
-      0.022063231559444816,
-      0.011911457077461822,
-      0.005717329396198076,
-      0.0022577577086250688,
-      7.04329493910635E-4,
-      1.5906374611419758E-4,
-      2.243393273693925E-5,
-      1.2394699257219599E-6,
-      9.637887145718822E-9,
-      1.7995240252019196E-11
+      0.9950179058848737,
+      0.7822116902616046,
+      0.5931072843627333,
+      0.4328514313357769,
+      0.305188328750542,
+      0.20928402445847188,
+      0.14061888645114712,
+      0.09247830305455766,
+      0.05964811129813068,
+      0.0372505023766337,
+      0.022180991743776555,
+      0.01198763610743114,
+      0.005763069890657762,
+      0.002281406462237881,
+      7.143583176709967E-4,
+      1.6231834263474734E-4,
+      2.3172627377515066E-5,
+      1.3221435247206632E-6,
+      1.0390900005539278E-8,
+      2.4891617693814247E-11
     ]
   },
   "0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
       1.998773638612381
     ],
     "ys": [
-      1.1696304865623834,
-      0.9567283581019407,
-      0.7539923592581959,
-      0.5742786062573666,
-      0.4194187364669206,
-      0.2985076594971041,
-      0.20669531473453487,
-      0.13978485616680839,
-      0.09300920961465033,
-      0.06066402360973337,
-      0.03849064573352595,
-      0.02329419609811942,
-      0.013045024722011554,
-      0.0065104685477266905,
-      0.0027821805633365055,
-      9.711189314026395E-4,
-      2.6468302763602307E-4,
-      5.21202221569495E-5,
-      5.832741329274377E-6,
-      1.9700957745217945E-7
+      1.1725741716734674,
+      0.9595448806565294,
+      0.7565438991370887,
+      0.576472742231797,
+      0.4212006252611162,
+      0.2998904805496203,
+      0.20772257575475678,
+      0.14052059166903696,
+      0.0935254813599675,
+      0.06102243181561299,
+      0.0387387274822507,
+      0.023464483095253383,
+      0.013157433556152297,
+      0.006578117582739971,
+      0.0028173300502167117,
+      9.861066793382697E-4,
+      2.697271888406998E-4,
+      5.3391584263627216E-5,
+      6.048245836640893E-6,
+      2.123505790177978E-7
     ]
   }
 }
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SEATTLE_WA.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SEATTLE_WA.json
index fff741aa3927704d26b9636178f5265b7d8b5ac6..991e87fbf0c3897256bd866f5ef133910dd2d92d 100644
--- a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SEATTLE_WA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SEATTLE_WA.json
@@ -23,26 +23,26 @@
       1.7119945007591924
     ],
     "ys": [
-      0.19342618418808494,
-      0.15433409107154,
-      0.11864971304091687,
-      0.08776191999579713,
-      0.06271831893868579,
-      0.0428760772843867,
-      0.028535827655628485,
-      0.01822750939442317,
-      0.01124895952223372,
-      0.006621801964823932,
-      0.0036652864713601903,
-      0.0018691838215237502,
-      8.576838520384741E-4,
-      3.444392319561237E-4,
-      1.1702347990289773E-4,
-      3.243668708557596E-5,
-      6.544304516010413E-6,
-      8.156194116954711E-7,
-      3.8215158525196564E-8,
-      3.170983768926682E-11
+      0.22603899409570882,
+      0.18673287857100462,
+      0.14894826450333923,
+      0.11449459686752474,
+      0.0850627247739281,
+      0.06050753617727411,
+      0.04186494832203915,
+      0.02784640178887962,
+      0.017965013572680627,
+      0.01116739219449549,
+      0.0066388484141217926,
+      0.0037150173260031916,
+      0.0019124416127275232,
+      8.808346988467723E-4,
+      3.517917729362406E-4,
+      1.1860606208826518E-4,
+      3.113245832600558E-5,
+      5.934336491073473E-6,
+      6.490377038051989E-7,
+      2.1638094074644876E-8
     ]
   },
   "5.00 Second Spectral Acceleration": {
@@ -69,26 +69,26 @@
       0.7929925155296614
     ],
     "ys": [
-      0.057605127587663445,
-      0.04148762472953456,
-      0.02900924136327458,
-      0.01969053390521317,
-      0.012941230125870076,
-      0.0083045114935804,
-      0.005177620237012835,
-      0.0031419363480328817,
-      0.0018226431835752332,
-      9.780207234754911E-4,
-      4.7112880883274695E-4,
-      1.9706568567241542E-4,
-      6.833560483546368E-5,
-      1.939951640709565E-5,
-      3.988108467601901E-6,
-      4.836589393836603E-7,
-      8.151336682953432E-9,
-      6.035327318666574E-12,
-      0.0,
-      0.0
+      0.0848684854211798,
+      0.06356710902622462,
+      0.04641117501036812,
+      0.03297846975590124,
+      0.022699517574026544,
+      0.015213732656235435,
+      0.009902496814137251,
+      0.006335145928490495,
+      0.0039865864894636045,
+      0.0024309339594358248,
+      0.0014028975755141129,
+      7.387740265158948E-4,
+      3.393430532791158E-4,
+      1.3424893838340544E-4,
+      4.2162858860582E-5,
+      1.0279967292669856E-5,
+      1.6366373926494018E-6,
+      1.142921653056598E-7,
+      1.671555398835124E-10,
+      2.447116464287589E-12
     ]
   },
   "Peak Ground Acceleration": {
@@ -115,26 +115,26 @@
       1.6428726885203377
     ],
     "ys": [
-      0.24826167141396505,
-      0.21445509619282566,
-      0.1798641154103649,
-      0.1455451276975867,
-      0.11318258370351764,
-      0.0843402299492399,
-      0.060083350225735604,
-      0.0406283398655297,
-      0.026135208009227452,
-      0.015933440570975003,
-      0.00921267128692408,
-      0.004916154290139066,
-      0.00243673566067617,
-      0.0010638216399007586,
-      4.0039578557430505E-4,
-      1.2304373000605575E-4,
-      2.9491985534918986E-5,
-      5.118863445387323E-6,
-      6.495035751382292E-7,
-      5.0986725776481416E-8
+      0.24758645115268763,
+      0.213680508278707,
+      0.17903575455114873,
+      0.1447166722646258,
+      0.11240804045758426,
+      0.08366238121494166,
+      0.05952571077492732,
+      0.040196367575692185,
+      0.025818675997801164,
+      0.01571518445393729,
+      0.00907213783291749,
+      0.0048344042416248924,
+      0.0023938865208150435,
+      0.0010445259209416996,
+      3.930237514796485E-4,
+      1.2076919550002056E-4,
+      2.8969461152055297E-5,
+      5.0477322294193E-6,
+      6.459554826292055E-7,
+      5.0977545729106306E-8
     ]
   },
   "0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
       1.998773638612381
     ],
     "ys": [
-      0.27535976359826764,
-      0.24486572210923555,
-      0.21212239738464841,
-      0.17872339381166902,
-      0.14498835949191685,
-      0.11376749833092853,
-      0.08567251022614851,
-      0.06162822105958092,
-      0.04237702782037893,
-      0.027761664215480465,
-      0.017327715740798735,
-      0.010265166666904099,
-      0.005729357154616742,
-      0.0029731681856501463,
-      0.0014048080413995323,
-      5.861265190786211E-4,
-      2.1111283007268675E-4,
-      6.395414851141143E-5,
-      1.5637247287792978E-5,
-      3.060631132639491E-6
+      0.2746411101459637,
+      0.24397151645607723,
+      0.21108720518096571,
+      0.17760528084413568,
+      0.14385801332012899,
+      0.11269779324956575,
+      0.08472302218446734,
+      0.06083642715252092,
+      0.04175350824686377,
+      0.0272975988326612,
+      0.017001713053876735,
+      0.010050897612300014,
+      0.005599456824679152,
+      0.0029018624369537933,
+      0.001370110554625004,
+      5.715559501985186E-4,
+      2.059564046566074E-4,
+      6.24922964316318E-5,
+      1.534827774557806E-5,
+      3.0293876035503556E-6
     ]
   }
 }
\ No newline at end of file