diff --git a/packages/cathrin/config/index.js b/packages/cathrin/config/index.js
index 408373d13ac..3f10729e0a6 100644
--- a/packages/cathrin/config/index.js
+++ b/packages/cathrin/config/index.js
@@ -15,10 +15,10 @@ export default {
   },
   measurements: [
     'underbust',
-    'naturalWaist',
+    'waistCircumference',
     'hipsCircumference',
-    'naturalWaistToUnderbust',
-    'naturalWaistToHip'
+    'waistToUnderbust',
+    'waistToHips'
   ],
   dependencies: {
     panel1: 'panels',
diff --git a/packages/cathrin/src/base.js b/packages/cathrin/src/base.js
index 5f06b31d69e..d0631ec51d5 100644
--- a/packages/cathrin/src/base.js
+++ b/packages/cathrin/src/base.js
@@ -6,7 +6,7 @@ export default function (part) {
   else store.set('gaps', [0.2, 0.35, 0.5, 0.65, 0.8])
 
   // Absolute values for some options
-  store.set('waistReduction', measurements.naturalWaist * options.waistReduction)
+  store.set('waistReduction', measurements.waistCircumference * options.waistReduction)
   debug({
     type: 'info',
     label: '✅ Waist reduction',
@@ -18,7 +18,7 @@ export default function (part) {
     label: '✅ Back opening',
     msg: utils.units(store.get('backOpening'))
   })
-  let len = measurements.naturalWaistToUnderbust + measurements.naturalWaistToHip
+  let len = measurements.waistToUnderbust + measurements.waistToHips
   for (let option of ['backRise', 'backDrop', 'frontRise', 'frontDrop', 'hipRise'])
     store.set(option, len * options[option])
   store.set('length', len)
@@ -33,7 +33,10 @@ export default function (part) {
   store.set('width', 0.5 * (measurements.hipsCircumference - store.get('backOpening')))
   store.set(
     'waistIntake',
-    0.5 * (measurements.hipsCircumference - measurements.naturalWaist + store.get('waistReduction'))
+    0.5 *
+      (measurements.hipsCircumference -
+        measurements.waistCircumference +
+        store.get('waistReduction'))
   )
   store.set('bustIntake', 0.5 * (measurements.hipsCircumference - measurements.underbust))
 
@@ -45,7 +48,7 @@ export default function (part) {
   points.underbustCB = new Point(wid, 0)
   points.topSide = points.underbustCF.shiftFractionTowards(points.underbustCB, 0.5)
   points.bottomSide = points.hipsCF.shiftFractionTowards(points.hipsCB, 0.5)
-  points.waistCF = points.underbustCF.shift(-90, measurements.naturalWaistToUnderbust)
+  points.waistCF = points.underbustCF.shift(-90, measurements.waistToUnderbust)
   points.waistCB = new Point(points.hipsCB.x, points.waistCF.y)
 
   // frontRise
diff --git a/packages/cathrin/src/panel1.js b/packages/cathrin/src/panel1.js
index a8ec89bdef4..46f92c05beb 100644
--- a/packages/cathrin/src/panel1.js
+++ b/packages/cathrin/src/panel1.js
@@ -3,6 +3,8 @@ import draftPanel1ab from './panel1ab'
 export default function (part) {
   let { macro, sa, paths, points, options, complete, paperless } = part.shorthand()
 
+  points.anchor = points.topCF.clone()
+
   delete paths.outline
   delete paths.panel2
   delete paths.panel3
diff --git a/packages/cathrin/src/panel1ab.js b/packages/cathrin/src/panel1ab.js
index 1a0cd533803..85004efad95 100644
--- a/packages/cathrin/src/panel1ab.js
+++ b/packages/cathrin/src/panel1ab.js
@@ -1,6 +1,8 @@
-export default function(part) {
+export default function (part) {
   let { macro, utils, sa, points, paths, Point, Path, complete, paperless } = part.shorthand()
 
+  points.anchor = points.topCF.clone()
+
   let top = new Path()
     .move(points.underbustGap1Left)
     .curve(points.frontRiseStartCp2, points.topCFCp1, points.topCF)
diff --git a/packages/cathrin/src/panel2.js b/packages/cathrin/src/panel2.js
index 0ea53cb91ce..0579411a7c7 100644
--- a/packages/cathrin/src/panel2.js
+++ b/packages/cathrin/src/panel2.js
@@ -1,6 +1,8 @@
-export default function(part) {
+export default function (part) {
   let { macro, sa, points, paths, Point, complete, paperless } = part.shorthand()
 
+  points.anchor = points.underbustGap1Right.clone()
+
   delete paths.outline
   delete paths.panel1
   delete paths.panel3
diff --git a/packages/cathrin/src/panel3.js b/packages/cathrin/src/panel3.js
index 96cab4dca95..2dbcc5c96f5 100644
--- a/packages/cathrin/src/panel3.js
+++ b/packages/cathrin/src/panel3.js
@@ -1,6 +1,8 @@
-export default function(part) {
+export default function (part) {
   let { macro, sa, points, paths, Point, complete, paperless } = part.shorthand()
 
+  points.anchor = points.underbustGap2Right.clone()
+
   delete paths.outline
   delete paths.panel1
   delete paths.panel2
diff --git a/packages/cathrin/src/panel4.js b/packages/cathrin/src/panel4.js
index 119d704c2ad..35c63141cc1 100644
--- a/packages/cathrin/src/panel4.js
+++ b/packages/cathrin/src/panel4.js
@@ -1,6 +1,8 @@
-export default function(part) {
+export default function (part) {
   let { macro, sa, snippets, Snippet, points, paths, Point, complete, paperless } = part.shorthand()
 
+  points.anchor = points.underbustGap3Right.clone()
+
   delete paths.outline
   delete paths.panel1
   delete paths.panel2
diff --git a/packages/cathrin/src/panel5.js b/packages/cathrin/src/panel5.js
index 89cbd51ccde..08e6b92928c 100644
--- a/packages/cathrin/src/panel5.js
+++ b/packages/cathrin/src/panel5.js
@@ -1,6 +1,8 @@
-export default function(part) {
+export default function (part) {
   let { macro, sa, points, paths, Point, complete, paperless } = part.shorthand()
 
+  points.anchor = points.underbustGap4Right.clone()
+
   delete paths.outline
   delete paths.panel1
   delete paths.panel2
diff --git a/packages/cathrin/src/panel6.js b/packages/cathrin/src/panel6.js
index 881a8464ec0..bb93aa418fc 100644
--- a/packages/cathrin/src/panel6.js
+++ b/packages/cathrin/src/panel6.js
@@ -1,6 +1,8 @@
-export default function(part) {
+export default function (part) {
   let { macro, sa, points, paths, Point, complete, paperless } = part.shorthand()
 
+  points.anchor = points.backRise.clone()
+
   delete paths.outline
   delete paths.panel1
   delete paths.panel2
diff --git a/packages/cathrin/src/panels.js b/packages/cathrin/src/panels.js
index e38c7833889..5c80eae48a5 100644
--- a/packages/cathrin/src/panels.js
+++ b/packages/cathrin/src/panels.js
@@ -19,11 +19,11 @@ export default function (part) {
     )
     points[`underbustGap${count}RightCp`] = points[`underbustGap${count}Right`].shift(
       -90,
-      measurements.naturalWaistToUnderbust * 0.15
+      measurements.waistToUnderbust * 0.15
     )
     points[`underbustGap${count}LeftCp`] = points[`underbustGap${count}Left`].shift(
       -90,
-      measurements.naturalWaistToUnderbust * 0.15
+      measurements.waistToUnderbust * 0.15
     )
 
     // Waist
@@ -38,19 +38,19 @@ export default function (part) {
     )
     points[`waistGap${count}RightCp1`] = points[`waistGap${count}Right`].shift(
       90,
-      measurements.naturalWaistToUnderbust * 0.2
+      measurements.waistToUnderbust * 0.2
     )
     points[`waistGap${count}LeftCp2`] = points[`waistGap${count}Left`].shift(
       90,
-      measurements.naturalWaistToUnderbust * 0.2
+      measurements.waistToUnderbust * 0.2
     )
     points[`waistGap${count}RightCp2`] = points[`waistGap${count}Right`].shift(
       -90,
-      measurements.naturalWaistToHip * 0.2
+      measurements.waistToHips * 0.2
     )
     points[`waistGap${count}LeftCp1`] = points[`waistGap${count}Left`].shift(
       -90,
-      measurements.naturalWaistToHip * 0.2
+      measurements.waistToHips * 0.2
     )
 
     // Hips