diff --git a/2020-wheel/2020-wheel-c.stl b/2020-wheel/2020-wheel-c.stl
index 4b26863..4195930 100644
--- a/2020-wheel/2020-wheel-c.stl
+++ b/2020-wheel/2020-wheel-c.stl
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9b7b96d9df4d8b467f2aa9f126836d3545306d030d422fdae2af230ecc188c62
-size 2263467
+oid sha256:5aa0b12b999f6fd422d34a2a138e8cdde0c7d1f837d2f4bb209290a7c4517643
+size 913723
diff --git a/2020-wheel/2020-wheel-w.stl b/2020-wheel/2020-wheel-w.stl
index a51deec..933e37f 100644
--- a/2020-wheel/2020-wheel-w.stl
+++ b/2020-wheel/2020-wheel-w.stl
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4242764703d1d342bbd6ac962e2294051394f4d422cc33be880115e19cd0f2b0
-size 1688107
+oid sha256:e4d6d1817a4e1a56cf83e3615a43248e4ddf05dfe43313df82b29b790bfc7bd3
+size 1690764
diff --git a/2020-wheel/2020-wheel.scad b/2020-wheel/2020-wheel.scad
index 9778aee..78d6545 100644
--- a/2020-wheel/2020-wheel.scad
+++ b/2020-wheel/2020-wheel.scad
@@ -1,11 +1,10 @@
 $fn = 300;
 
 // * c w
-part = "w";
+part = "c";
 
 slot_center_spacing = 25.4;
 
-
 ramp_height = 5;
 ramp_slot_mid = 4.25;
 ramp_depth = 2.5;
@@ -13,23 +12,18 @@ ramp_depth = 2.5;
 deramp_height = 1;
 deramp_depth = (ramp_depth / ramp_height) * (ramp_height - deramp_height);
 
-bearing_radius = 8.1;
-bearing_underhang = 1;
-bulk_radius = 4;
+bulk_radius = 2;
 
-bearing_height = 5;
-bearing_count = 2;
+rod_radius = 4.2;
+bearing_radius = 4;
+bearing_cut_depth = 2;
 
-core_radius = 9.5;
 core_bump_radius = 1;
 core_bump_height = 2;
 
 e = 0.02;
 
-inner_radius = bearing_radius - bearing_underhang;
-echo("inner_radius=", inner_radius);
-
-outer_radius = inner_radius + bulk_radius;
+outer_radius = rod_radius + bearing_radius + bulk_radius;
 echo("outer_radius=", outer_radius);
 
 echo("max_radius=", outer_radius + ramp_depth);
@@ -39,8 +33,6 @@ mid = slot_center_spacing - ramp_slot_mid - ramp_slot_mid;
 total_height = deramp_height + ramp_height + mid + ramp_height + deramp_height;
 echo("total_height=", total_height);
 
-bearing_portion = mid / bearing_count;
-
 if (part == "*" || part == "c") {
     color("grey", 0.6)
     intersection() {
@@ -63,12 +55,10 @@ module core_mask() {
         [0, total_height + e],
         [0, 0 - e],
         
-        [core_radius + core_bump_radius, 0 - e],
-        [core_radius + core_bump_radius, 0],
-        [core_radius, core_bump_height],
-        [core_radius, total_height - core_bump_height],
-        [core_radius + core_bump_radius, total_height],
-        [core_radius + core_bump_radius, total_height + e],
+        [rod_radius + bearing_radius + core_bump_radius, 0 - e],
+        [rod_radius + bearing_radius + core_bump_radius, 0],
+        [rod_radius + bearing_radius, core_bump_height],
+        [rod_radius + bearing_radius + core_bump_radius, total_height + e],
     ]);
 }
 
@@ -86,8 +76,8 @@ module wheel() {
     difference() {
         rotate_extrude()
         polygon([
-            [inner_radius, total_height],
-            [inner_radius, 0],
+            [rod_radius, total_height],
+            [rod_radius, 0],
             
             [outer_radius + deramp_depth, 0],
             [outer_radius + ramp_depth, deramp_height],
@@ -97,11 +87,10 @@ module wheel() {
             [outer_radius + deramp_depth, total_height],
         ]);
         
-
-        for (b = [0 : bearing_count - 1]) {
-            translate([0, 0, deramp_height + ramp_height + (b * bearing_portion)])
-            translate([0, 0, bearing_portion / 2 - bearing_height / 2])
-            cylinder(h=bearing_height, r=bearing_radius);
+        for (a=[0:45:360]) {
+            translate([0, 0, -e])
+            rotate([0, 0, a])
+            cube([rod_radius + bearing_cut_depth, 1, e + total_height + e]);
         }
     }
 }
\ No newline at end of file