diff --git a/src/test/resources/e2e/nshm-conus-2018/BOSTON_MA.json b/src/test/resources/e2e/nshm-conus-2018/BOSTON_MA.json
index b713b4730941f6c23f03b1cbb5d99893fc23c926..b255db04a47db524ba0b48a620c22716cb00e597 100644
--- a/src/test/resources/e2e/nshm-conus-2018/BOSTON_MA.json
+++ b/src/test/resources/e2e/nshm-conus-2018/BOSTON_MA.json
@@ -1,96 +1,4 @@
 {
-  "SA1P0": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.020784550979940135,
-      0.013752036153143977,
-      0.008853912425965714,
-      0.00550450273759354,
-      0.0032956032209899913,
-      0.0018514963923265217,
-      9.931435977960567E-4,
-      4.956595518220795E-4,
-      2.3401548992797765E-4,
-      1.0471944598011257E-4,
-      4.5084212737722834E-5,
-      1.8896301560235415E-5,
-      7.72587468160579E-6,
-      3.039143578552158E-6,
-      1.1170515811344102E-6,
-      3.7451324017266453E-7,
-      1.0752962397804165E-7,
-      2.596070736658151E-8,
-      4.917918081492094E-9,
-      6.503383766857791E-10
-    ]
-  },
-  "SA5P0": {
-    "xs": [
-      -6.908755779315721,
-      -6.502290170873972,
-      -6.0968250627658085,
-      -5.692842534617867,
-      -5.286388795682763,
-      -4.882242079327857,
-      -4.474141923581687,
-      -4.0686768154735224,
-      -3.6651629274966204,
-      -3.259697819388456,
-      -2.8542327112802917,
-      -2.448767603172127,
-      -2.0402208285265546,
-      -1.6398971199188088,
-      -1.2310014767138553,
-      -0.8278220838865469,
-      -0.42159449003804794,
-      -0.016129381929883644,
-      0.3920420877760237,
-      0.7929925155296614
-    ],
-    "ys": [
-      0.0038496686700113573,
-      0.0025078664183317773,
-      0.0015597948853785957,
-      9.157017059864714E-4,
-      5.001931310456337E-4,
-      2.547249918503188E-4,
-      1.194486623970574E-4,
-      5.2327359356867026E-5,
-      2.1561183371151274E-5,
-      8.4003477208669E-6,
-      3.1469958181727807E-6,
-      1.142023685405199E-6,
-      3.9303700685767176E-7,
-      1.2947742656347803E-7,
-      3.718668812692663E-8,
-      9.324871744942211E-9,
-      1.8778829487123563E-9,
-      2.846632932077524E-10,
-      2.69747315108036E-11,
-      1.0385526508492285E-12
-    ]
-  },
   "PGA": {
     "xs": [
       -6.061887011404528,
@@ -182,5 +90,97 @@
       4.142453599294729E-7,
       9.342364439170646E-8
     ]
+  },
+  "SA1P0": {
+    "xs": [
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
+    ],
+    "ys": [
+      0.020784550979940135,
+      0.013752036153143977,
+      0.008853912425965714,
+      0.00550450273759354,
+      0.0032956032209899913,
+      0.0018514963923265217,
+      9.931435977960567E-4,
+      4.956595518220795E-4,
+      2.3401548992797765E-4,
+      1.0471944598011257E-4,
+      4.5084212737722834E-5,
+      1.8896301560235415E-5,
+      7.72587468160579E-6,
+      3.039143578552158E-6,
+      1.1170515811344102E-6,
+      3.7451324017266453E-7,
+      1.0752962397804165E-7,
+      2.596070736658151E-8,
+      4.917918081492094E-9,
+      6.503383766857791E-10
+    ]
+  },
+  "SA5P0": {
+    "xs": [
+      -6.908755779315721,
+      -6.502290170873972,
+      -6.0968250627658085,
+      -5.692842534617867,
+      -5.286388795682763,
+      -4.882242079327857,
+      -4.474141923581687,
+      -4.0686768154735224,
+      -3.6651629274966204,
+      -3.259697819388456,
+      -2.8542327112802917,
+      -2.448767603172127,
+      -2.0402208285265546,
+      -1.6398971199188088,
+      -1.2310014767138553,
+      -0.8278220838865469,
+      -0.42159449003804794,
+      -0.016129381929883644,
+      0.3920420877760237,
+      0.7929925155296614
+    ],
+    "ys": [
+      0.0038496686700113573,
+      0.0025078664183317773,
+      0.0015597948853785957,
+      9.157017059864714E-4,
+      5.001931310456337E-4,
+      2.547249918503188E-4,
+      1.194486623970574E-4,
+      5.2327359356867026E-5,
+      2.1561183371151274E-5,
+      8.4003477208669E-6,
+      3.1469958181727807E-6,
+      1.142023685405199E-6,
+      3.9303700685767176E-7,
+      1.2947742656347803E-7,
+      3.718668812692663E-8,
+      9.324871744942211E-9,
+      1.8778829487123563E-9,
+      2.846632932077524E-10,
+      2.69747315108036E-11,
+      1.0385526508492285E-12
+    ]
   }
 }
diff --git a/src/test/resources/e2e/nshm-conus-2018/CHICAGO_IL.json b/src/test/resources/e2e/nshm-conus-2018/CHICAGO_IL.json
index 1c2f1aa91936faea87eb4af2eef6ae8549e3f991..9629f27ebfd4014535aa7002ae4f2a78bc3daaed 100644
--- a/src/test/resources/e2e/nshm-conus-2018/CHICAGO_IL.json
+++ b/src/test/resources/e2e/nshm-conus-2018/CHICAGO_IL.json
@@ -1,96 +1,4 @@
 {
-  "SA1P0": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.017675500237871122,
-      0.011804993270225163,
-      0.007916670756587606,
-      0.005349147248044569,
-      0.0036313904277084225,
-      0.002384405538478486,
-      0.0014870231028831253,
-      8.355484214788524E-4,
-      4.1460657776932683E-4,
-      1.7579111278565786E-4,
-      6.24093534270055E-5,
-      1.824083214413613E-5,
-      4.414927964063776E-6,
-      9.994457044956114E-7,
-      2.485513364750664E-7,
-      7.726459746150788E-8,
-      2.1210423184880143E-8,
-      4.860565864414978E-9,
-      8.64105244261508E-10,
-      1.0633132855584107E-10
-    ]
-  },
-  "SA5P0": {
-    "xs": [
-      -6.908755779315721,
-      -6.502290170873972,
-      -6.0968250627658085,
-      -5.692842534617867,
-      -5.286388795682763,
-      -4.882242079327857,
-      -4.474141923581687,
-      -4.0686768154735224,
-      -3.6651629274966204,
-      -3.259697819388456,
-      -2.8542327112802917,
-      -2.448767603172127,
-      -2.0402208285265546,
-      -1.6398971199188088,
-      -1.2310014767138553,
-      -0.8278220838865469,
-      -0.42159449003804794,
-      -0.016129381929883644,
-      0.3920420877760237,
-      0.7929925155296614
-    ],
-    "ys": [
-      0.004904504983066267,
-      0.003755611824541405,
-      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,
-      5.2511189664780556E-11,
-      5.968234937924545E-12,
-      3.1469632224157163E-13
-    ]
-  },
   "PGA": {
     "xs": [
       -6.061887011404528,
@@ -182,5 +90,97 @@
       1.0444941528551558E-7,
       2.265638077580196E-8
     ]
+  },
+  "SA1P0": {
+    "xs": [
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
+    ],
+    "ys": [
+      0.017675500237871122,
+      0.011804993270225163,
+      0.007916670756587606,
+      0.005349147248044569,
+      0.0036313904277084225,
+      0.002384405538478486,
+      0.0014870231028831253,
+      8.355484214788524E-4,
+      4.1460657776932683E-4,
+      1.7579111278565786E-4,
+      6.24093534270055E-5,
+      1.824083214413613E-5,
+      4.414927964063776E-6,
+      9.994457044956114E-7,
+      2.485513364750664E-7,
+      7.726459746150788E-8,
+      2.1210423184880143E-8,
+      4.860565864414978E-9,
+      8.64105244261508E-10,
+      1.0633132855584107E-10
+    ]
+  },
+  "SA5P0": {
+    "xs": [
+      -6.908755779315721,
+      -6.502290170873972,
+      -6.0968250627658085,
+      -5.692842534617867,
+      -5.286388795682763,
+      -4.882242079327857,
+      -4.474141923581687,
+      -4.0686768154735224,
+      -3.6651629274966204,
+      -3.259697819388456,
+      -2.8542327112802917,
+      -2.448767603172127,
+      -2.0402208285265546,
+      -1.6398971199188088,
+      -1.2310014767138553,
+      -0.8278220838865469,
+      -0.42159449003804794,
+      -0.016129381929883644,
+      0.3920420877760237,
+      0.7929925155296614
+    ],
+    "ys": [
+      0.004904504983066267,
+      0.003755611824541405,
+      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,
+      5.2511189664780556E-11,
+      5.968234937924545E-12,
+      3.1469632224157163E-13
+    ]
   }
 }
diff --git a/src/test/resources/e2e/nshm-conus-2018/LOS_ANGELES_CA.json b/src/test/resources/e2e/nshm-conus-2018/LOS_ANGELES_CA.json
index 0ca4ff14dbc66d5323b7f7656b60fc77d00d9acd..92d33d960cbbc0db14540ca5206cd7e8b1e3d337 100644
--- a/src/test/resources/e2e/nshm-conus-2018/LOS_ANGELES_CA.json
+++ b/src/test/resources/e2e/nshm-conus-2018/LOS_ANGELES_CA.json
@@ -1,96 +1,4 @@
 {
-  "SA1P0": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      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
-    ]
-  },
-  "SA5P0": {
-    "xs": [
-      -6.908755779315721,
-      -6.502290170873972,
-      -6.0968250627658085,
-      -5.692842534617867,
-      -5.286388795682763,
-      -4.882242079327857,
-      -4.474141923581687,
-      -4.0686768154735224,
-      -3.6651629274966204,
-      -3.259697819388456,
-      -2.8542327112802917,
-      -2.448767603172127,
-      -2.0402208285265546,
-      -1.6398971199188088,
-      -1.2310014767138553,
-      -0.8278220838865469,
-      -0.42159449003804794,
-      -0.016129381929883644,
-      0.3920420877760237,
-      0.7929925155296614
-    ],
-    "ys": [
-      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
-    ]
-  },
   "PGA": {
     "xs": [
       -6.061887011404528,
@@ -182,5 +90,97 @@
       1.9713363600257578E-5,
       2.3576513888748992E-6
     ]
+  },
+  "SA1P0": {
+    "xs": [
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
+    ],
+    "ys": [
+      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
+    ]
+  },
+  "SA5P0": {
+    "xs": [
+      -6.908755779315721,
+      -6.502290170873972,
+      -6.0968250627658085,
+      -5.692842534617867,
+      -5.286388795682763,
+      -4.882242079327857,
+      -4.474141923581687,
+      -4.0686768154735224,
+      -3.6651629274966204,
+      -3.259697819388456,
+      -2.8542327112802917,
+      -2.448767603172127,
+      -2.0402208285265546,
+      -1.6398971199188088,
+      -1.2310014767138553,
+      -0.8278220838865469,
+      -0.42159449003804794,
+      -0.016129381929883644,
+      0.3920420877760237,
+      0.7929925155296614
+    ],
+    "ys": [
+      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
+    ]
   }
 }
diff --git a/src/test/resources/e2e/nshm-conus-2018/NEW_MADRID_MO.json b/src/test/resources/e2e/nshm-conus-2018/NEW_MADRID_MO.json
index 638bda0f3c92e6135ac4e64a495233c9f2f46ee9..0ad50c4fdbed560b05753056d747f92b24b3beb8 100644
--- a/src/test/resources/e2e/nshm-conus-2018/NEW_MADRID_MO.json
+++ b/src/test/resources/e2e/nshm-conus-2018/NEW_MADRID_MO.json
@@ -1,96 +1,4 @@
 {
-  "SA1P0": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.05460474620644812,
-      0.039322200263679656,
-      0.027742521888583595,
-      0.01925648792066325,
-      0.013309032474447957,
-      0.009158100387208452,
-      0.006469954492673557,
-      0.004711825464791655,
-      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
-    ]
-  },
-  "SA5P0": {
-    "xs": [
-      -6.908755779315721,
-      -6.502290170873972,
-      -6.0968250627658085,
-      -5.692842534617867,
-      -5.286388795682763,
-      -4.882242079327857,
-      -4.474141923581687,
-      -4.0686768154735224,
-      -3.6651629274966204,
-      -3.259697819388456,
-      -2.8542327112802917,
-      -2.448767603172127,
-      -2.0402208285265546,
-      -1.6398971199188088,
-      -1.2310014767138553,
-      -0.8278220838865469,
-      -0.42159449003804794,
-      -0.016129381929883644,
-      0.3920420877760237,
-      0.7929925155296614
-    ],
-    "ys": [
-      0.01118335095019382,
-      0.00820850133786319,
-      0.00612599437865595,
-      0.004704029030923133,
-      0.003744509775095578,
-      0.003113425325927083,
-      0.0026896900327019677,
-      0.0023879637030226144,
-      0.0021175441107187517,
-      0.0018011501748482464,
-      0.0014173471729516547,
-      0.001006813017595508,
-      6.301951022408453E-4,
-      3.444781699140508E-4,
-      1.5613960834869736E-4,
-      5.887416288449928E-5,
-      1.748301261392188E-5,
-      3.8576776780498505E-6,
-      5.776336202494064E-7,
-      3.603564897905062E-8
-    ]
-  },
   "PGA": {
     "xs": [
       -6.061887011404528,
@@ -182,5 +90,97 @@
       3.211131756404801E-4,
       1.1269789534198826E-4
     ]
+  },
+  "SA1P0": {
+    "xs": [
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
+    ],
+    "ys": [
+      0.05460474620644812,
+      0.039322200263679656,
+      0.027742521888583595,
+      0.01925648792066325,
+      0.013309032474447957,
+      0.009158100387208452,
+      0.006469954492673557,
+      0.004711825464791655,
+      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
+    ]
+  },
+  "SA5P0": {
+    "xs": [
+      -6.908755779315721,
+      -6.502290170873972,
+      -6.0968250627658085,
+      -5.692842534617867,
+      -5.286388795682763,
+      -4.882242079327857,
+      -4.474141923581687,
+      -4.0686768154735224,
+      -3.6651629274966204,
+      -3.259697819388456,
+      -2.8542327112802917,
+      -2.448767603172127,
+      -2.0402208285265546,
+      -1.6398971199188088,
+      -1.2310014767138553,
+      -0.8278220838865469,
+      -0.42159449003804794,
+      -0.016129381929883644,
+      0.3920420877760237,
+      0.7929925155296614
+    ],
+    "ys": [
+      0.01118335095019382,
+      0.00820850133786319,
+      0.00612599437865595,
+      0.004704029030923133,
+      0.003744509775095578,
+      0.003113425325927083,
+      0.0026896900327019677,
+      0.0023879637030226144,
+      0.0021175441107187517,
+      0.0018011501748482464,
+      0.0014173471729516547,
+      0.001006813017595508,
+      6.301951022408453E-4,
+      3.444781699140508E-4,
+      1.5613960834869736E-4,
+      5.887416288449928E-5,
+      1.748301261392188E-5,
+      3.8576776780498505E-6,
+      5.776336202494064E-7,
+      3.603564897905062E-8
+    ]
   }
 }
diff --git a/src/test/resources/e2e/nshm-conus-2018/NEW_YORK_NY.json b/src/test/resources/e2e/nshm-conus-2018/NEW_YORK_NY.json
index aa3feff22cf9b84612521c8144bb93e5dda4319b..ecce5d5202c4221f0efa7f234a1bc82b894bdfcc 100644
--- a/src/test/resources/e2e/nshm-conus-2018/NEW_YORK_NY.json
+++ b/src/test/resources/e2e/nshm-conus-2018/NEW_YORK_NY.json
@@ -1,96 +1,4 @@
 {
-  "SA1P0": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.018666421015364296,
-      0.0122777143821705,
-      0.007819753747405416,
-      0.004783588386662287,
-      0.0028112191687725903,
-      0.0015540453407317345,
-      8.285075887238439E-4,
-      4.1827330817572424E-4,
-      2.0477961806545264E-4,
-      9.76841382864806E-5,
-      4.582979651500823E-5,
-      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.713305930824852E-10
-    ]
-  },
-  "SA5P0": {
-    "xs": [
-      -6.908755779315721,
-      -6.502290170873972,
-      -6.0968250627658085,
-      -5.692842534617867,
-      -5.286388795682763,
-      -4.882242079327857,
-      -4.474141923581687,
-      -4.0686768154735224,
-      -3.6651629274966204,
-      -3.259697819388456,
-      -2.8542327112802917,
-      -2.448767603172127,
-      -2.0402208285265546,
-      -1.6398971199188088,
-      -1.2310014767138553,
-      -0.8278220838865469,
-      -0.42159449003804794,
-      -0.016129381929883644,
-      0.3920420877760237,
-      0.7929925155296614
-    ],
-    "ys": [
-      0.0036839290291613563,
-      0.002335050751486981,
-      0.0014025796207374252,
-      7.930112908299477E-4,
-      4.1808903382999866E-4,
-      2.0733134457052304E-4,
-      9.623213274255235E-5,
-      4.279209350393816E-5,
-      1.848842803384079E-5,
-      7.785121676935123E-6,
-      3.20942446688357E-6,
-      1.2788721198896172E-6,
-      4.7640365740538307E-7,
-      1.6510378239619132E-7,
-      4.934185476859843E-8,
-      1.273898355111994E-8,
-      2.620252585057269E-9,
-      4.048583749596045E-10,
-      3.904486628199482E-11,
-      1.5324451927867105E-12
-    ]
-  },
   "PGA": {
     "xs": [
       -6.061887011404528,
@@ -182,5 +90,97 @@
       6.249719391706649E-7,
       1.4238886738032342E-7
     ]
+  },
+  "SA1P0": {
+    "xs": [
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
+    ],
+    "ys": [
+      0.018666421015364296,
+      0.0122777143821705,
+      0.007819753747405416,
+      0.004783588386662287,
+      0.0028112191687725903,
+      0.0015540453407317345,
+      8.285075887238439E-4,
+      4.1827330817572424E-4,
+      2.0477961806545264E-4,
+      9.76841382864806E-5,
+      4.582979651500823E-5,
+      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.713305930824852E-10
+    ]
+  },
+  "SA5P0": {
+    "xs": [
+      -6.908755779315721,
+      -6.502290170873972,
+      -6.0968250627658085,
+      -5.692842534617867,
+      -5.286388795682763,
+      -4.882242079327857,
+      -4.474141923581687,
+      -4.0686768154735224,
+      -3.6651629274966204,
+      -3.259697819388456,
+      -2.8542327112802917,
+      -2.448767603172127,
+      -2.0402208285265546,
+      -1.6398971199188088,
+      -1.2310014767138553,
+      -0.8278220838865469,
+      -0.42159449003804794,
+      -0.016129381929883644,
+      0.3920420877760237,
+      0.7929925155296614
+    ],
+    "ys": [
+      0.0036839290291613563,
+      0.002335050751486981,
+      0.0014025796207374252,
+      7.930112908299477E-4,
+      4.1808903382999866E-4,
+      2.0733134457052304E-4,
+      9.623213274255235E-5,
+      4.279209350393816E-5,
+      1.848842803384079E-5,
+      7.785121676935123E-6,
+      3.20942446688357E-6,
+      1.2788721198896172E-6,
+      4.7640365740538307E-7,
+      1.6510378239619132E-7,
+      4.934185476859843E-8,
+      1.273898355111994E-8,
+      2.620252585057269E-9,
+      4.048583749596045E-10,
+      3.904486628199482E-11,
+      1.5324451927867105E-12
+    ]
   }
 }
diff --git a/src/test/resources/e2e/nshm-conus-2018/RENO_NV.json b/src/test/resources/e2e/nshm-conus-2018/RENO_NV.json
index 9dfb5d5ea6a15308a9b9a535a856b88a8a1ef0c0..5c105110ef96b7d9b01a3922b5cd7075b90acdc2 100644
--- a/src/test/resources/e2e/nshm-conus-2018/RENO_NV.json
+++ b/src/test/resources/e2e/nshm-conus-2018/RENO_NV.json
@@ -1,96 +1,4 @@
 {
-  "SA1P0": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.5639424382793682,
-      0.41970430872704,
-      0.2996355631700337,
-      0.20436506496344023,
-      0.13386011296908937,
-      0.08340469061324253,
-      0.05072763584783538,
-      0.02970332088645175,
-      0.016962428614047866,
-      0.009368748098138393,
-      0.004942501068704084,
-      0.002420101079214425,
-      0.0010564988095787106,
-      3.945561117465654E-4,
-      1.2048922319737725E-4,
-      2.8266770250121335E-5,
-      4.252380705836178E-6,
-      4.4029329263288646E-7,
-      2.573585831849357E-8,
-      8.240992980384035E-11
-    ]
-  },
-  "SA5P0": {
-    "xs": [
-      -6.908755779315721,
-      -6.502290170873972,
-      -6.0968250627658085,
-      -5.692842534617867,
-      -5.286388795682763,
-      -4.882242079327857,
-      -4.474141923581687,
-      -4.0686768154735224,
-      -3.6651629274966204,
-      -3.259697819388456,
-      -2.8542327112802917,
-      -2.448767603172127,
-      -2.0402208285265546,
-      -1.6398971199188088,
-      -1.2310014767138553,
-      -0.8278220838865469,
-      -0.42159449003804794,
-      -0.016129381929883644,
-      0.3920420877760237,
-      0.7929925155296614
-    ],
-    "ys": [
-      0.1619520024002511,
-      0.11197070315750862,
-      0.0746164480867025,
-      0.04806931482649302,
-      0.029904421907731286,
-      0.01809720511043038,
-      0.010526649862628145,
-      0.005849703609065978,
-      0.003024869157973338,
-      0.0013988990917255157,
-      5.607903420664931E-4,
-      1.884917390363045E-4,
-      5.034839107343867E-5,
-      1.0331505761726529E-5,
-      1.5403732253339458E-6,
-      1.766940560506774E-7,
-      9.230578884022922E-9,
-      0.0,
-      0.0,
-      0.0
-    ]
-  },
   "PGA": {
     "xs": [
       -6.061887011404528,
@@ -182,5 +90,97 @@
       4.5541957008082325E-6,
       3.3625843088903307E-7
     ]
+  },
+  "SA1P0": {
+    "xs": [
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
+    ],
+    "ys": [
+      0.5639424382793682,
+      0.41970430872704,
+      0.2996355631700337,
+      0.20436506496344023,
+      0.13386011296908937,
+      0.08340469061324253,
+      0.05072763584783538,
+      0.02970332088645175,
+      0.016962428614047866,
+      0.009368748098138393,
+      0.004942501068704084,
+      0.002420101079214425,
+      0.0010564988095787106,
+      3.945561117465654E-4,
+      1.2048922319737725E-4,
+      2.8266770250121335E-5,
+      4.252380705836178E-6,
+      4.4029329263288646E-7,
+      2.573585831849357E-8,
+      8.240992980384035E-11
+    ]
+  },
+  "SA5P0": {
+    "xs": [
+      -6.908755779315721,
+      -6.502290170873972,
+      -6.0968250627658085,
+      -5.692842534617867,
+      -5.286388795682763,
+      -4.882242079327857,
+      -4.474141923581687,
+      -4.0686768154735224,
+      -3.6651629274966204,
+      -3.259697819388456,
+      -2.8542327112802917,
+      -2.448767603172127,
+      -2.0402208285265546,
+      -1.6398971199188088,
+      -1.2310014767138553,
+      -0.8278220838865469,
+      -0.42159449003804794,
+      -0.016129381929883644,
+      0.3920420877760237,
+      0.7929925155296614
+    ],
+    "ys": [
+      0.1619520024002511,
+      0.11197070315750862,
+      0.0746164480867025,
+      0.04806931482649302,
+      0.029904421907731286,
+      0.01809720511043038,
+      0.010526649862628145,
+      0.005849703609065978,
+      0.003024869157973338,
+      0.0013988990917255157,
+      5.607903420664931E-4,
+      1.884917390363045E-4,
+      5.034839107343867E-5,
+      1.0331505761726529E-5,
+      1.5403732253339458E-6,
+      1.766940560506774E-7,
+      9.230578884022922E-9,
+      0.0,
+      0.0,
+      0.0
+    ]
   }
 }
diff --git a/src/test/resources/e2e/nshm-conus-2018/SALT_LAKE_CITY_UT.json b/src/test/resources/e2e/nshm-conus-2018/SALT_LAKE_CITY_UT.json
index 99e7a3ea8f76c5e293cb0411f772790d28c0946a..2fd8958b15de0116baed9abbe8e661c8ed8352cb 100644
--- a/src/test/resources/e2e/nshm-conus-2018/SALT_LAKE_CITY_UT.json
+++ b/src/test/resources/e2e/nshm-conus-2018/SALT_LAKE_CITY_UT.json
@@ -1,96 +1,4 @@
 {
-  "SA1P0": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      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
-    ]
-  },
-  "SA5P0": {
-    "xs": [
-      -6.908755779315721,
-      -6.502290170873972,
-      -6.0968250627658085,
-      -5.692842534617867,
-      -5.286388795682763,
-      -4.882242079327857,
-      -4.474141923581687,
-      -4.0686768154735224,
-      -3.6651629274966204,
-      -3.259697819388456,
-      -2.8542327112802917,
-      -2.448767603172127,
-      -2.0402208285265546,
-      -1.6398971199188088,
-      -1.2310014767138553,
-      -0.8278220838865469,
-      -0.42159449003804794,
-      -0.016129381929883644,
-      0.3920420877760237,
-      0.7929925155296614
-    ],
-    "ys": [
-      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
-    ]
-  },
   "PGA": {
     "xs": [
       -6.061887011404528,
@@ -182,5 +90,97 @@
       1.8675841989591896E-5,
       2.7011160805776843E-6
     ]
+  },
+  "SA1P0": {
+    "xs": [
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
+    ],
+    "ys": [
+      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
+    ]
+  },
+  "SA5P0": {
+    "xs": [
+      -6.908755779315721,
+      -6.502290170873972,
+      -6.0968250627658085,
+      -5.692842534617867,
+      -5.286388795682763,
+      -4.882242079327857,
+      -4.474141923581687,
+      -4.0686768154735224,
+      -3.6651629274966204,
+      -3.259697819388456,
+      -2.8542327112802917,
+      -2.448767603172127,
+      -2.0402208285265546,
+      -1.6398971199188088,
+      -1.2310014767138553,
+      -0.8278220838865469,
+      -0.42159449003804794,
+      -0.016129381929883644,
+      0.3920420877760237,
+      0.7929925155296614
+    ],
+    "ys": [
+      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
+    ]
   }
 }
diff --git a/src/test/resources/e2e/nshm-conus-2018/SAN_FRANCISCO_CA.json b/src/test/resources/e2e/nshm-conus-2018/SAN_FRANCISCO_CA.json
index 9e4d5bdc8dd9b7fd9e3ad312cc85f8fb264ba9fa..7656323b48e801e3b11ebede866c5871ee04c92f 100644
--- a/src/test/resources/e2e/nshm-conus-2018/SAN_FRANCISCO_CA.json
+++ b/src/test/resources/e2e/nshm-conus-2018/SAN_FRANCISCO_CA.json
@@ -1,96 +1,4 @@
 {
-  "SA1P0": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      0.5831008919911462,
-      0.4284199090706749,
-      0.3043299517318651,
-      0.20991504534178368,
-      0.14211631298661964,
-      0.09374868521078619,
-      0.06138384495043732,
-      0.039071093308164724,
-      0.024201671562405724,
-      0.014386438506911667,
-      0.008094350202773508,
-      0.004200420158829751,
-      0.0019393747258170354,
-      7.632975555052491E-4,
-      2.4394047425904366E-4,
-      5.965347779311546E-5,
-      8.782843961552907E-6,
-      4.938620973776963E-7,
-      8.239057057597381E-10,
-      5.0449196459382226E-12
-    ]
-  },
-  "SA5P0": {
-    "xs": [
-      -6.908755779315721,
-      -6.502290170873972,
-      -6.0968250627658085,
-      -5.692842534617867,
-      -5.286388795682763,
-      -4.882242079327857,
-      -4.474141923581687,
-      -4.0686768154735224,
-      -3.6651629274966204,
-      -3.259697819388456,
-      -2.8542327112802917,
-      -2.448767603172127,
-      -2.0402208285265546,
-      -1.6398971199188088,
-      -1.2310014767138553,
-      -0.8278220838865469,
-      -0.42159449003804794,
-      -0.016129381929883644,
-      0.3920420877760237,
-      0.7929925155296614
-    ],
-    "ys": [
-      0.15758937503731726,
-      0.11247692685397596,
-      0.07946884297427431,
-      0.05560574371886311,
-      0.03824085383493095,
-      0.02585465059626231,
-      0.017050534628279736,
-      0.011010094459237604,
-      0.006875269673181763,
-      0.004031893488663087,
-      0.002153405881721278,
-      0.0010132607735766973,
-      4.0392561747766895E-4,
-      1.3573151659263734E-4,
-      3.5070265791185964E-5,
-      6.763084787261478E-6,
-      8.40775820950977E-7,
-      4.9940703621115084E-8,
-      0.0,
-      0.0
-    ]
-  },
   "PGA": {
     "xs": [
       -6.061887011404528,
@@ -182,5 +90,97 @@
       4.114149996331726E-6,
       1.1332666265240459E-7
     ]
+  },
+  "SA1P0": {
+    "xs": [
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
+    ],
+    "ys": [
+      0.5831008919911462,
+      0.4284199090706749,
+      0.3043299517318651,
+      0.20991504534178368,
+      0.14211631298661964,
+      0.09374868521078619,
+      0.06138384495043732,
+      0.039071093308164724,
+      0.024201671562405724,
+      0.014386438506911667,
+      0.008094350202773508,
+      0.004200420158829751,
+      0.0019393747258170354,
+      7.632975555052491E-4,
+      2.4394047425904366E-4,
+      5.965347779311546E-5,
+      8.782843961552907E-6,
+      4.938620973776963E-7,
+      8.239057057597381E-10,
+      5.0449196459382226E-12
+    ]
+  },
+  "SA5P0": {
+    "xs": [
+      -6.908755779315721,
+      -6.502290170873972,
+      -6.0968250627658085,
+      -5.692842534617867,
+      -5.286388795682763,
+      -4.882242079327857,
+      -4.474141923581687,
+      -4.0686768154735224,
+      -3.6651629274966204,
+      -3.259697819388456,
+      -2.8542327112802917,
+      -2.448767603172127,
+      -2.0402208285265546,
+      -1.6398971199188088,
+      -1.2310014767138553,
+      -0.8278220838865469,
+      -0.42159449003804794,
+      -0.016129381929883644,
+      0.3920420877760237,
+      0.7929925155296614
+    ],
+    "ys": [
+      0.15758937503731726,
+      0.11247692685397596,
+      0.07946884297427431,
+      0.05560574371886311,
+      0.03824085383493095,
+      0.02585465059626231,
+      0.017050534628279736,
+      0.011010094459237604,
+      0.006875269673181763,
+      0.004031893488663087,
+      0.002153405881721278,
+      0.0010132607735766973,
+      4.0392561747766895E-4,
+      1.3573151659263734E-4,
+      3.5070265791185964E-5,
+      6.763084787261478E-6,
+      8.40775820950977E-7,
+      4.9940703621115084E-8,
+      0.0,
+      0.0
+    ]
   }
 }
diff --git a/src/test/resources/e2e/nshm-conus-2018/SEATTLE_WA.json b/src/test/resources/e2e/nshm-conus-2018/SEATTLE_WA.json
index 5fdef9a913b5d44d70cfb0989689b32429f3467a..d0b5e6510821b788eb717cc886132380e7dfa051 100644
--- a/src/test/resources/e2e/nshm-conus-2018/SEATTLE_WA.json
+++ b/src/test/resources/e2e/nshm-conus-2018/SEATTLE_WA.json
@@ -1,96 +1,4 @@
 {
-  "SA1P0": {
-    "xs": [
-      -5.991464547107982,
-      -5.585999438999818,
-      -5.181423615076537,
-      -4.775958506968373,
-      -4.374058465024705,
-      -3.9633162998156966,
-      -3.5613661338149765,
-      -3.1535563587475584,
-      -2.7488721956224653,
-      -2.3434070875143007,
-      -1.9379419794061366,
-      -1.5324768712979722,
-      -1.1270117631898076,
-      -0.7215466550816433,
-      -0.31608154697347896,
-      0.08617769624105241,
-      0.494696241836107,
-      0.9001613499442714,
-      1.3056264580524357,
-      1.7119945007591924
-    ],
-    "ys": [
-      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
-    ]
-  },
-  "SA5P0": {
-    "xs": [
-      -6.908755779315721,
-      -6.502290170873972,
-      -6.0968250627658085,
-      -5.692842534617867,
-      -5.286388795682763,
-      -4.882242079327857,
-      -4.474141923581687,
-      -4.0686768154735224,
-      -3.6651629274966204,
-      -3.259697819388456,
-      -2.8542327112802917,
-      -2.448767603172127,
-      -2.0402208285265546,
-      -1.6398971199188088,
-      -1.2310014767138553,
-      -0.8278220838865469,
-      -0.42159449003804794,
-      -0.016129381929883644,
-      0.3920420877760237,
-      0.7929925155296614
-    ],
-    "ys": [
-      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
-    ]
-  },
   "PGA": {
     "xs": [
       -6.061887011404528,
@@ -182,5 +90,97 @@
       4.561137287903132E-6,
       4.7281340794708457E-7
     ]
+  },
+  "SA1P0": {
+    "xs": [
+      -5.991464547107982,
+      -5.585999438999818,
+      -5.181423615076537,
+      -4.775958506968373,
+      -4.374058465024705,
+      -3.9633162998156966,
+      -3.5613661338149765,
+      -3.1535563587475584,
+      -2.7488721956224653,
+      -2.3434070875143007,
+      -1.9379419794061366,
+      -1.5324768712979722,
+      -1.1270117631898076,
+      -0.7215466550816433,
+      -0.31608154697347896,
+      0.08617769624105241,
+      0.494696241836107,
+      0.9001613499442714,
+      1.3056264580524357,
+      1.7119945007591924
+    ],
+    "ys": [
+      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
+    ]
+  },
+  "SA5P0": {
+    "xs": [
+      -6.908755779315721,
+      -6.502290170873972,
+      -6.0968250627658085,
+      -5.692842534617867,
+      -5.286388795682763,
+      -4.882242079327857,
+      -4.474141923581687,
+      -4.0686768154735224,
+      -3.6651629274966204,
+      -3.259697819388456,
+      -2.8542327112802917,
+      -2.448767603172127,
+      -2.0402208285265546,
+      -1.6398971199188088,
+      -1.2310014767138553,
+      -0.8278220838865469,
+      -0.42159449003804794,
+      -0.016129381929883644,
+      0.3920420877760237,
+      0.7929925155296614
+    ],
+    "ys": [
+      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
+    ]
   }
 }