diff --git a/tests/stepper_motors.scad b/tests/stepper_motors.scad
index 68cc665..23747c3 100644
--- a/tests/stepper_motors.scad
+++ b/tests/stepper_motors.scad
@@ -24,7 +24,7 @@ use <../utils/layout.scad>
 module stepper_motors()
     layout([for(s = stepper_motors) NEMA_width(s)], 5) {
         rotate(180)
-            NEMA(stepper_motors[$i]);
+            NEMA(stepper_motors[$i], 0, $i > 1 && $i < 5);
 
         translate_z(4)
             NEMA_screws(stepper_motors[$i], M3_pan_screw, n = $i, earth = $i > 4 ? undef : $i - 1);
diff --git a/vitamins/stepper_motor.scad b/vitamins/stepper_motor.scad
index 5d11d3d..b317f36 100644
--- a/vitamins/stepper_motor.scad
+++ b/vitamins/stepper_motor.scad
@@ -40,7 +40,6 @@ function NEMA_shaft_length(type)= type[8]; //! Shaft length above the face, if a
 function NEMA_hole_pitch(type)  = type[9]; //! Screw hole pitch
 function NEMA_holes(type)       = [-NEMA_hole_pitch(type) / 2, NEMA_hole_pitch(type) / 2]; //! Screw positions for for loop
 function NEMA_big_hole(type)    = NEMA_boss_radius(type) + 0.2; //! Clearance hole for the big boss
-function NEMA_jst_connector(type)= type[10]; //! True if motor has JST connector
 stepper_body_colour = "black";
 stepper_cap_colour  = grey(50);
 stepper_machined_colour = grey(90);
@@ -53,7 +52,7 @@ module NEMA_outline(type) //! 2D outline
         circle(NEMA_radius(type));
     }
 
-module NEMA(type, shaft_angle = 0) { //! Draw specified NEMA stepper motor
+module NEMA(type, shaft_angle = 0, jst_connector = false) { //! Draw specified NEMA stepper motor
     side = NEMA_width(type);
     length = NEMA_length(type);
     body_rad = NEMA_body_radius(type);
@@ -100,12 +99,12 @@ module NEMA(type, shaft_angle = 0) { //! Draw specified NEMA stepper motor
                 linear_extrude(cap, center = true)
                     cap_shape(end);
 
-        if(NEMA_jst_connector(type))
+        if(jst_connector)
             translate([-tabSize.x / 2, side / 2, -length])
                 cube(tabSize);
     }
 
-    if(NEMA_jst_connector(type))
+    if(jst_connector)
         translate([0, side / 2 - 2, -length + tabSize.z + 0.75])
             rotate(180)
                 jst_xh_header(jst_xh_header, 6, true);
diff --git a/vitamins/stepper_motors.scad b/vitamins/stepper_motors.scad
index 2d63dba..820ff3a 100644
--- a/vitamins/stepper_motors.scad
+++ b/vitamins/stepper_motors.scad
@@ -21,15 +21,15 @@
 // NEMA stepper motor model
 //
 
-//                                   corner  body    boss    boss          shaft               jst
-//                     side, length, radius, radius, radius, depth, shaft, length,      holes, connector
-NEMA17  = ["NEMA17",   42.3, 47,     53.6/2, 25,     11,     2,     5,     24,          31,    true  ];
-NEMA17M = ["NEMA17M",  42.3, 40,     53.6/2, 25,     11,     2,     5,     20,          31,    true  ];
-NEMA17M8= ["NEMA17M8", 42.3, 40,     53.6/2, 25,     11,     2,     8,     [280, 8, 4], 31,    true  ];
-NEMA17S = ["NEMA17S",  42.3, 34,     53.6/2, 25,     11,     2,     5,     24,          31,    true  ];
-NEMA16  = ["NEMA16",   39.5, 19.2,   50.6/2, 50.6/2, 11,     2,     5,     12,          31,    false ];
-NEMA14  = ["NEMA14",   35.2, 36,     46.4/2, 21,     11,     2,     5,     21,          26,    false ];
-NEMA23  = ["NEMA23",   56.4, 51.2,   75.7/2, 35,   38.1/2, 1.6,   6.35,    24,        47.1,    false ];
+//                                   corner  body    boss    boss          shaft
+//                     side, length, radius, radius, radius, depth, shaft, length,      holes
+NEMA17  = ["NEMA17",   42.3, 47,     53.6/2, 25,     11,     2,     5,     24,          31];
+NEMA17M = ["NEMA17M",  42.3, 40,     53.6/2, 25,     11,     2,     5,     20,          31];
+NEMA17M8= ["NEMA17M8", 42.3, 40,     53.6/2, 25,     11,     2,     8,     [280, 8, 4], 31];
+NEMA17S = ["NEMA17S",  42.3, 34,     53.6/2, 25,     11,     2,     5,     24,          31];
+NEMA16  = ["NEMA16",   39.5, 19.2,   50.6/2, 50.6/2, 11,     2,     5,     12,          31];
+NEMA14  = ["NEMA14",   35.2, 36,     46.4/2, 21,     11,     2,     5,     21,          26];
+NEMA23  = ["NEMA23",   56.4, 51.2,   75.7/2, 35,   38.1/2, 1.6,   6.35,    24,        47.1];
 
 stepper_motors = [NEMA14, NEMA16, NEMA17S, NEMA17M, NEMA17, NEMA23];