diff --git a/active-crust/gmm-tree.json b/active-crust/gmm-tree.json
index 1129f14ee2f7b67ba682a044d819b1887a361dfc..371d5e09e8f3d5723566190bb84ecd1b416e5a3f 100644
--- a/active-crust/gmm-tree.json
+++ b/active-crust/gmm-tree.json
@@ -1,7 +1,10 @@
 [
-  { "id": "ASK_14_BASIN", "weight": 0.25 },
+  { "id": "ASK_14_BASIN", "weight": 0.1875 },
+  { "id": "ASK_14_CYBERSHAKE", "weight": 0.0625 },
   { "id": "BSSA_14_BASIN", "weight": 0.1875 },
-  { "id": "BSSA_14_CYBERSHAKE_CENTERED", "weight": 0.0625 },
-  { "id": "CB_14_BASIN", "weight": 0.25 },
-  { "id": "CY_14_BASIN", "weight": 0.25 }
+  { "id": "BSSA_14_CYBERSHAKE", "weight": 0.0625 },
+  { "id": "CB_14_BASIN", "weight": 0.1875 },
+  { "id": "CB_14_CYBERSHAKE", "weight": 0.0625 },
+  { "id": "CY_14_BASIN", "weight": 0.1875 },
+  { "id": "CY_14_CYBERSHAKE", "weight": 0.0625 }
 ]
diff --git a/site-data/basin/bay-area.geojson b/site-data/basin/bay-area.geojson
index 76ac4f9952a477d8a4786b0bf03e8b4c0a7aa59f..7b94de50cc03c1a40f702f0f717387563ce88859 100644
--- a/site-data/basin/bay-area.geojson
+++ b/site-data/basin/bay-area.geojson
@@ -3,17 +3,17 @@
   "geometry": {
     "type": "Polygon",
     "coordinates": [[
-          [-122.26237, 38.62676],
-          [-122.81110, 38.80000],
-          [-123.50000, 38.60000],
-          [-123.17000, 38.05000],
-          [-122.72000, 37.54000],
-          [-122.23000, 36.85000],
-          [-121.48242, 36.98324],
-          [-121.34125, 37.15129],
-          [-121.53000, 37.39000],
-          [-122.00400, 38.14800],
-          [-122.26237, 38.62676]
+      [-122.25, 38.63],
+      [-122.81, 38.80],
+      [-123.50, 38.60],
+      [-123.17, 38.05],
+      [-122.72, 37.54],
+      [-122.23, 36.85],
+      [-121.48, 36.98],
+      [-121.34, 37.15],
+      [-121.53, 37.39],
+      [-122.00, 38.19],
+      [-122.25, 38.63]
     ]]
   },
   "properties": {
@@ -22,4 +22,4 @@
     "model": "sfbay-area",
     "spacing": 0.01
   }
-}
\ No newline at end of file
+}
diff --git a/site-data/basin/central-valley.geojson b/site-data/basin/central-valley.geojson
index 940a2bdaa9e9703d57238c757c1b3201e98d7526..741061f979d0841b70fdb403e8dd845459a3f192 100644
--- a/site-data/basin/central-valley.geojson
+++ b/site-data/basin/central-valley.geojson
@@ -3,27 +3,29 @@
   "geometry": {
     "type": "Polygon",
     "coordinates": [[
-          [-122.58200, 40.67500],
-          [-122.96000, 40.35500],
-          [-122.52100, 39.10600],
-          [-122.00400, 38.14800],
-          [-121.53000, 37.39000],
-          [-120.72900, 36.37700],
-          [-119.52400, 34.84100],
-          [-118.72000, 34.82200],
-          [-118.33200, 35.22700],
-          [-118.95000, 36.58900],
-          [-120.39400, 37.90500],
-          [-121.34000, 39.54700],
-          [-121.53700, 40.38500],
-          [-122.00000, 40.79000],
-          [-122.58200, 40.67500]
+      [-122.58, 40.68],
+      [-122.96, 40.36],
+      [-122.52, 39.11],
+      [-122.25, 38.63],
+      [-122.00, 38.19],
+      [-121.53, 37.39],
+      [-121.34, 37.15],
+      [-120.73, 36.38],
+      [-119.52, 34.84],
+      [-118.72, 34.82],
+      [-118.33, 35.23],
+      [-118.95, 36.59],
+      [-120.39, 37.91],
+      [-121.34, 39.55],
+      [-121.54, 40.36],
+      [-122.00, 40.79],
+      [-122.58, 40.68]
     ]]
   },
   "properties": {
     "name": "Central Valley",
     "id": "central-valley",
     "model": "Aagaard",
-    "spacing": 0.01
+    "spacing": 0.05
   }
 }
diff --git a/site-data/basin/los-angeles.geojson b/site-data/basin/los-angeles.geojson
index 5e9125ef319c8c9509ded0831546fc8720e0f72a..0f3ac30242409ad3a3f556d6e5b88efe8ec86a31 100644
--- a/site-data/basin/los-angeles.geojson
+++ b/site-data/basin/los-angeles.geojson
@@ -3,31 +3,31 @@
   "geometry": {
     "type": "Polygon",
     "coordinates": [[
-	[-119.4659,34.5259],
-	[-119.4632,34.3650],
-	[-119.2800,34.1665],
-	[-119.1812,34.1187],
-	[-118.9876,34.0357],
-	[-118.8558,34.0379],
-	[-118.7919,34.1029],
-	[-118.5814,34.0844],
-	[-118.5690,33.9178],
-	[-118.2901,33.7396],
-	[-118.2505,33.6073],
-	[-117.8974,33.6030],
-	[-117.7790,33.7213],
-	[-117.7803,33.7593],
-	[-117.7988,33.7830],
-	[-117.7993,33.8811],
-	[-117.7986,34.1308],
-	[-117.7975,34.2167],
-	[-118.1528,34.2148],
-	[-118.1748,34.3465],
-	[-118.2156,34.4364],
-	[-118.3010,34.4371],
-	[-118.4185,34.5754],
-	[-118.6546,34.6521],
-	[-119.4659,34.5259]
+      [-119.47, 34.53],
+      [-119.47, 34.37],
+      [-119.28, 34.17],
+      [-119.18, 34.12],
+      [-118.99, 34.04],
+      [-118.86, 34.04],
+      [-118.79, 34.10],
+      [-118.58, 34.08],
+      [-118.57, 33.92],
+      [-118.29, 33.74],
+      [-118.25, 33.61],
+      [-117.90, 33.60],
+      [-117.78, 33.72],
+      [-117.78, 33.76],
+      [-117.80, 33.78],
+      [-117.80, 33.88],
+      [-117.80, 34.13],
+      [-117.80, 34.22],
+      [-118.15, 34.21],
+      [-118.17, 34.35],
+      [-118.22, 34.44],
+      [-118.30, 34.44],
+      [-118.42, 34.58],
+      [-118.65, 34.65],
+      [-119.47, 34.53]
     ]]
   },
   "properties": {
diff --git a/site-data/basin/portland.geojson b/site-data/basin/portland.geojson
index 0545cee077f42c58e2c905e2763f9da8326ed2e1..c2373e242f4d55a1ba4df2d468ffbab419d674f3 100644
--- a/site-data/basin/portland.geojson
+++ b/site-data/basin/portland.geojson
@@ -3,23 +3,23 @@
   "geometry": {
     "type": "Polygon",
     "coordinates": [[
-          [-122.53,45.42],
-          [-122.50,45.42],
-          [-122.41,45.51],
-          [-122.41,45.53],
-          [-122.44,45.55],
-          [-122.50,45.58],
-          [-122.52,45.59],
-          [-122.57,45.61],
-          [-122.65,45.62],
-          [-122.69,45.62],
-          [-122.69,45.60],
-          [-122.65,45.58],
-          [-122.63,45.53],
-          [-122.61,45.49],
-          [-122.57,45.44],
-          [-122.56,45.43],
-          [-122.53,45.42]
+      [-122.53, 45.42],
+      [-122.50, 45.42],
+      [-122.41, 45.51],
+      [-122.41, 45.53],
+      [-122.44, 45.55],
+      [-122.50, 45.58],
+      [-122.52, 45.59],
+      [-122.57, 45.61],
+      [-122.65, 45.62],
+      [-122.69, 45.62],
+      [-122.69, 45.60],
+      [-122.65, 45.58],
+      [-122.63, 45.53],
+      [-122.61, 45.49],
+      [-122.57, 45.44],
+      [-122.56, 45.43],
+      [-122.53, 45.42]
     ]]
   },
   "properties": {
diff --git a/site-data/basin/puget-lowland.geojson b/site-data/basin/puget-lowland.geojson
index 51da7f8b2e74dfb9e1f5f8b591abe58f02fe714a..9a31e40a4db96b19a95cb59a0177486ced3b70b9 100644
--- a/site-data/basin/puget-lowland.geojson
+++ b/site-data/basin/puget-lowland.geojson
@@ -3,25 +3,25 @@
   "geometry": {
     "type": "Polygon",
     "coordinates": [[
-      [ -123.50, 48.20 ],
-      [ -123.50, 48.00 ],
-      [ -123.30, 47.95 ],
-      [ -123.05, 47.95 ],
-      [ -122.95, 47.85 ],
-      [ -122.95, 47.70 ],
-      [ -123.25, 47.40 ],
-      [ -123.25, 47.20 ],
-      [ -122.90, 46.95 ],
-      [ -122.60, 46.95 ],
-      [ -122.40, 47.05 ],
-      [ -122.30, 47.05 ],
-      [ -122.20, 47.00 ],
-      [ -121.90, 47.00 ],
-      [ -121.75, 47.20 ],
-      [ -121.75, 47.40 ],
-      [ -122.05, 48.20 ],
-      [ -122.60, 48.40 ],
-      [ -123.50, 48.20 ]
+      [-123.50, 48.20],
+      [-123.50, 48.00],
+      [-123.30, 47.95],
+      [-123.05, 47.95],
+      [-122.95, 47.85],
+      [-122.95, 47.70],
+      [-123.25, 47.40],
+      [-123.25, 47.20],
+      [-122.90, 46.95],
+      [-122.60, 46.95],
+      [-122.40, 47.05],
+      [-122.30, 47.05],
+      [-122.20, 47.00],
+      [-121.90, 47.00],
+      [-121.75, 47.20],
+      [-121.75, 47.40],
+      [-122.05, 48.20],
+      [-122.60, 48.40],
+      [-123.50, 48.20]
     ]]
   },
   "properties": {
diff --git a/site-data/basin/tualatin.geojson b/site-data/basin/tualatin.geojson
index 32efddd4aa26bec089be119309dbdaf2b897fe2b..2a50d6e8d4b1060df0082c35a899ae3b20c9d831 100644
--- a/site-data/basin/tualatin.geojson
+++ b/site-data/basin/tualatin.geojson
@@ -3,33 +3,33 @@
   "geometry": {
     "type": "Polygon",
     "coordinates": [[
-          [-122.98,45.28],
-          [-122.94,45.28],
-          [-122.90,45.32],
-          [-122.85,45.39],
-          [-122.79,45.43],
-          [-122.77,45.46],
-          [-122.77,45.50],
-          [-122.86,45.61],
-          [-122.87,45.66],
-          [-122.88,45.70],
-          [-122.89,45.72],
-          [-122.86,45.76],
-          [-122.86,45.79],
-          [-122.87,45.80],
-          [-122.96,45.82],
-          [-123.02,45.84],
-          [-123.10,45.85],
-          [-123.16,45.85],
-          [-123.19,45.77],
-          [-123.27,45.69],
-          [-123.27,45.66],
-          [-123.22,45.58],
-          [-123.13,45.44],
-          [-123.08,45.37],
-          [-123.05,45.35],
-          [-123.01,45.29],
-          [-122.98,45.28]
+      [-122.98, 45.28],
+      [-122.94, 45.28],
+      [-122.90, 45.32],
+      [-122.85, 45.39],
+      [-122.79, 45.43],
+      [-122.77, 45.46],
+      [-122.77, 45.50],
+      [-122.86, 45.61],
+      [-122.87, 45.66],
+      [-122.88, 45.70],
+      [-122.89, 45.72],
+      [-122.86, 45.76],
+      [-122.86, 45.79],
+      [-122.87, 45.80],
+      [-122.96, 45.82],
+      [-123.02, 45.84],
+      [-123.10, 45.85],
+      [-123.16, 45.85],
+      [-123.19, 45.77],
+      [-123.27, 45.69],
+      [-123.27, 45.66],
+      [-123.22, 45.58],
+      [-123.13, 45.44],
+      [-123.08, 45.37],
+      [-123.05, 45.35],
+      [-123.01, 45.29],
+      [-122.98, 45.28]
     ]]
   },
   "properties": {
diff --git a/site-data/basin/wasatch-front.geojson b/site-data/basin/wasatch-front.geojson
index ec82b64c8be387db072f33460152c0d72bb249fb..28e298e04428b986c82c24af5e3f34ac4966f8de 100644
--- a/site-data/basin/wasatch-front.geojson
+++ b/site-data/basin/wasatch-front.geojson
@@ -3,14 +3,14 @@
   "geometry": {
     "type": "Polygon",
     "coordinates": [[
-      [ -112.15, 42.00 ],
-      [ -112.40, 42.00 ],
-      [ -112.60, 41.50 ],
-      [ -111.80, 39.95 ],
-      [ -111.60, 39.95 ],
-      [ -111.50, 40.00 ],
-      [ -111.50, 40.20 ],
-      [ -112.15, 42.00 ]
+      [-112.15, 42.00],
+      [-112.40, 42.00],
+      [-112.60, 41.50],
+      [-111.80, 39.95],
+      [-111.60, 39.95],
+      [-111.50, 40.00],
+      [-111.50, 40.20],
+      [-112.15, 42.00]
     ]]
   },
   "properties": {
diff --git a/stable-crust/gmm-tree.json b/stable-crust/gmm-tree.json
index b59b75882148ff143db9e4344ea6b190114c96c8..397880f45c931cc1b5d70816c598306a98e60ac4 100644
--- a/stable-crust/gmm-tree.json
+++ b/stable-crust/gmm-tree.json
@@ -1,4 +1,6 @@
 [
-  { "id": "NGA_EAST_2023", "weight": 0.667 },
-  { "id": "NGA_EAST_SEEDS_2023", "weight": 0.333 }
+  { "id": "NGA_EAST_2023", "weight": 0.5 },
+  { "id": "NGA_EAST_2023_CPA", "weight": 0.1667 },
+  { "id": "NGA_EAST_SEEDS_2023", "weight": 0.25 },
+  { "id": "NGA_EAST_SEEDS_2023_CPA", "weight": 0.0833 }
 ]
diff --git a/stable-crust/grid/README.md b/stable-crust/grid/README.md
index 81df469a146644ec220ef3e84ec460a1baa5bc5d..05c978bd88e4fcf1d00a96438812cf835509305b 100644
--- a/stable-crust/grid/README.md
+++ b/stable-crust/grid/README.md
@@ -61,3 +61,10 @@ should be the same as for 2014.
 | SSCn  | Paleozoic [7]         | adapt | 8037 |
 | SSCn  | Paleozoic [8]         | adapt | 8038 |
 | SSCn  | default               | adapt | 8039 |
+
+## 2023 Updates
+
+ - Multiple declustering methods considered (gk, nn, r85)
+ - Adaptive/fixed smoothing weights changed from 40/60 to 50/50, consistent with `active-crust`
+ - rates being used in model are total catalog rates, not declustered rates.
+ - TODO update 2023 ID's
diff --git a/subduction/interface/Cascadia/README.md b/subduction/interface/Cascadia/README.md
index 53ca998e6894ff3eb45e0069b353f7f10289c360..647638ebc734104e8c5355f2b855803a156c7e83 100644
--- a/subduction/interface/Cascadia/README.md
+++ b/subduction/interface/Cascadia/README.md
@@ -60,6 +60,7 @@ also been split into 50-km subsections (e.g., 2014/2018 Section 1 is now 7 50-km
 [3-1:3-3], and Section 4 is now 9 50-km sections [4-1:4-9]). All section IDs have been 
 updated, and new rupture IDs have been assigned.
 
+
 | Sections                            | 1-1:1-7    | 2-1:2-3    | 3-1:3-3    | 4-1:4-9    |                            |
 |:----------------------------------- |:----------:|:----------:|:----------:|:----------:|:--------------------------:|
 | Bottom                              | 3200..3206 | 3207..3209 | 3210..3212 | 3213..3221 |                            |
@@ -80,6 +81,21 @@ updated, and new rupture IDs have been assigned.
 | Unsegmented, GEA12-B, 1-1:3-3       | ◆◆◆◆◆◆◆    | ◆◆◆        | ◆◆◆        |            | [ 100102, 100101, 100100 ] |
 | Unsegmented, GEA12-A, 1-1:4-9       | ◆◆◆◆◆◆◆    | ◆◆◆        | ◆◆◆        | ◆◆◆◆◆◆◆◆◆  | [ 100002, 100001, 100000 ] |
 
+| Sections             | 1    | 2    | 3    | 4    |                         |
+|:-------------------- |:----:|:----:|:----:|:----:|:-----------------------:|
+| Bottom               | 3200..3206 | 3207..3209 | 3210..3212 | 3213..3221 | |
+| Middle               | 3230..3236 | 3237..3239 | 3240..3242 | 3243..3251 | |
+| Top                  | 3260..3266 | 3267..3269 | 3270..3272 | 3273..3281 | |
+| __Ruptures__         |      |      |      |      | [ Bottom, Middle, Top ] |
+| Full, 1-2-3-4        | â—†    | â—†    | â—†    | â—†    | [ 3170, 3171, 3172 ]    |
+| Segmented, 1         | â—†    |      |      |      | [ 3110, 3111, 3112 ]    |
+| Segmented, 1-2       | â—†    | â—†    |      |      | [ 3150, 3151, 3152 ]    |
+| Segmented, 1-2-3     | â—†    | â—†    | â—†    |      | [ 3160, 3161, 3162 ]    |
+| Segmented, 4         |      |      |      | â—†    | [ 3140, 3141, 3142 ]    |
+| Unsegmented, 1-2-3   | â—†    | â—†    | â—†    |      | [ 3160, 3161, 3162 ]    |
+| Unsegmented, 1-2-3-4 | â—†    | â—†    | â—†    | â—†    | [ 3170, 3171, 3172 ]    |
+
+
 TODO: Most likely will change the rupture ID's for 2023. Replace in table.
 
 ## Cluster Model (2023)
diff --git a/subduction/interface/gmm-tree.json b/subduction/interface/gmm-tree.json
index 900748caa9e229df69a11441136d1f9351a8db46..4e9dc8d34afe0e30d92bfcee5ebd84a7efdf5618 100644
--- a/subduction/interface/gmm-tree.json
+++ b/subduction/interface/gmm-tree.json
@@ -1,9 +1,9 @@
 [
-  { "id": "AM_09_INTERFACE_BASIN", "weight": 0.125 },
-  { "id": "ZHAO_06_INTERFACE_BASIN", "weight": 0.125 },
-  { "id": "AG_20_CASCADIA_ADJ_INTERFACE", "weight": 0.25 },
+  { "id": "AM_09_INTERFACE_BASIN", "weight": 0.08 },
+  { "id": "ZHAO_06_INTERFACE_BASIN", "weight": 0.17 },
+  { "id": "AG_20_CASCADIA_INTERFACE_ADJUSTED_BASIN", "weight": 0.25 },
   { "id": "KBCG_20_CASCADIA_INTERFACE_BASIN", "weight": 0.125 },
-  { "id": "KBCG_20_SEATTLE_M9_INTERFACE_BASIN", "weight": 0.125 },
+  { "id": "KBCG_20_CASCADIA_INTERFACE_SEATTLE_M9", "weight": 0.125 },
   { "id": "PSBAH_20_CASCADIA_INTERFACE_BASIN", "weight": 0.125 },
-  { "id": "PSBAH_20_SEATTLE_M9_INTERFACE_BASIN", "weight": 0.125 }
+  { "id": "PSBAH_20_CASCADIA_INTERFACE_M9", "weight": 0.125 }
 ]
diff --git a/subduction/slab/gmm-tree.json b/subduction/slab/gmm-tree.json
index b791c621ec7302228f9a7ad9da975277617e4113..445a5e9e9ed9563576463ac26d623806e6a1b418 100644
--- a/subduction/slab/gmm-tree.json
+++ b/subduction/slab/gmm-tree.json
@@ -1,7 +1,7 @@
 [
   { "id": "ZHAO_06_SLAB_BASIN", "weight": 0.25 },
   { "id": "AG_20_CASCADIA_SLAB_BASIN", "weight": 0.0825 },
-  { "id": "AG_20_CASCADIA_ADJ_SLAB_BASIN", "weight": 0.1675 },
-  { "id": "KBCG_20_CASCADIA_SLAB_BASIN", "weight": 0.25 },
+  { "id": "AG_20_CASCADIA_SLAB_ADJUSTED_BASIN", "weight": 0.1675 },
+  { "id": "KBCG_20_CASCADIA_SLAB_SEATTLE", "weight": 0.25 },
   { "id": "PSBAH_20_CASCADIA_SLAB_BASIN", "weight": 0.25 }
 ]