diff --git a/model/chainset.scad b/model/chainset.scad
index 62580ba..d04c620 100644
--- a/model/chainset.scad
+++ b/model/chainset.scad
@@ -5,11 +5,10 @@
 
 
 include <SprocketGenerator2/files/Sprocket_Generator_v2_example_10.scad>
+include <BOSL2/std.scad>
 
 include <pedal.scad>
 
-include <BOSL2/std.scad>
-
 function sprocket_radius(teeth=52, roller=7.9, pitch=12.7) = let(roller_radius = roller/2,
                 radius = pitch/(2*sin(180/teeth)))
                 sqrt((radius*radius) - (pitch*(roller_radius+tolerance))+((roller_radius+tolerance)*(roller_radius+tolerance)));
diff --git a/model/subframe.scad b/model/subframe.scad
index f7817e6..3e2fd2a 100644
--- a/model/subframe.scad
+++ b/model/subframe.scad
@@ -4,9 +4,9 @@
 
 
 include <BentSim/Bike_accessories.scad>
-
 include <SprocketGenerator2/files/Sprocket_Generator_v2_example_10.scad>
 
+include <chainset.scad>
 include <epicyclic.scad>
 
 module subframe () {
@@ -46,50 +46,12 @@ module subframe () {
         scale([0.70, 0.70, 0.70])
         wheel(rim=451, spoke_nbr=0);
         
-    // bottom bracket
-    translate([-25, 1680, -390])
-        color("black")
-        rotate([0, 90, 0])
-        cylinder(h=68, r=26);
-    translate([-35, 1680, -390]) 
-        color("silver")
-        rotate([0, 90, 0])
-        sprocket(teeth=82, roller=7.9, pitch=12.7);
-        
-     // left crank
-     translate([-44, 1680, -395])
-        color("black")
-        cube([12,20,150]);
-        
-     // left pedal
-     translate([-120, 1670, -265])
-        color("black")
-        cube([70,40,15]);
-        
-     // left pedal shaft
-     translate([-120, 1690, -257.5])
-        color("silver")
-        rotate([0,90,0])
-        cylinder(h=80,r=4);
-        
-     // right crank
-     translate([44, 1680, -535])
-        color("black")
-        cube([12,20,150]);
-        
-     // right pedal
-     translate([58, 1670, -525])
-        color("black")
-        cube([70,40,15]);
-        
-     // right pedal shaft
-     translate([44, 1690, -517.5])
-        color("silver")
-        rotate([0,90,0])
-        cylinder(h=80,r=4);
+    rotate([90, 0, 90])
+        translate([1680, -410, -40])
+        chainset( teeth=82, crank=140);
         
      rotate([0,90,0])
-        translate([450, 1900, 31])
+        translate([450, 1900, 24])
         epicyclic();   
         
 }