diff --git a/src/dactyl_keyboard/common.clj b/src/dactyl_keyboard/common.clj
index 155d994..cf5fcc9 100644
--- a/src/dactyl_keyboard/common.clj
+++ b/src/dactyl_keyboard/common.clj
@@ -263,7 +263,7 @@
                                    left-wall
                                    (if create-side-nub? (with-fn 100 side-nub) ()))
         ; the bottom of the hole.
-        swap-holder-z-offset (if use-choc? 0 -1.5)
+        swap-holder-z-offset (if use-choc? 1.5 -1.5)
         swap-holder         (->> (cube (+ keyswitch-width 3) (/ (+ keyswitch-height 3) 2) 3)
                                  (translate [0 (/ (+ keyswitch-height 3) 4) swap-holder-z-offset]))
         ; for the main axis
@@ -285,9 +285,9 @@
                                  (with-fn 8))
         friction-hole-right (translate [5 0 0] friction-hole)
         friction-hole-left  (translate [-5 0 0] friction-hole)
-        hotswap-base-z-offset (if use-choc? -2 -2.6)
+        hotswap-base-z-offset (if use-choc? -0.5 -2.6)
         hotswap-base-shape  (->> (cube 19 6.2 3.5)
-                                 (translate [0 4 hotswap-base-z-offset]))
+                                 (translate [0 3 hotswap-base-z-offset]))
         hotswap-holder      (difference swap-holder
                                         main-axis-hole
                                         plus-hole