diff --git a/Electrical Parts/Servos/Emax-ES08A/servo-rounded-horn.fcstd b/Electrical Parts/Servos/Emax-ES08A/servo-rounded-horn.fcstd
index 4c3ee75f..bf5b96f9 100644
Binary files a/Electrical Parts/Servos/Emax-ES08A/servo-rounded-horn.fcstd and b/Electrical Parts/Servos/Emax-ES08A/servo-rounded-horn.fcstd differ
diff --git a/Electrical Parts/Servos/Emax-ES08A/servo-rounded-horn.step b/Electrical Parts/Servos/Emax-ES08A/servo-rounded-horn.step
index 5911d8fb..1b0e7bcd 100644
--- a/Electrical Parts/Servos/Emax-ES08A/servo-rounded-horn.step	
+++ b/Electrical Parts/Servos/Emax-ES08A/servo-rounded-horn.step	
@@ -3,7 +3,7 @@ HEADER;
 FILE_DESCRIPTION(('FreeCAD Model'),'2;1');
 FILE_NAME(
 '/home/obijuan/development/FreeCAD-library/Electrical 
-Parts/Servos/Emax-ES08A/servo-rounded-horn.step','2015-01-10T19:42:53',(
+Parts/Servos/Emax-ES08A/servo-rounded-horn.step','2015-01-11T09:44:26',(
     'FreeCAD'),('FreeCAD'),'Open CASCADE STEP processor 6.7','FreeCAD',
   'Unknown');
 FILE_SCHEMA(('AUTOMOTIVE_DESIGN_CC2 { 1 2 10303 214 -1 1 5 4 }'));
@@ -17,17 +17,18 @@ DATA;
 #4 = PRODUCT_DEFINITION_SHAPE('','',#5);
 #5 = PRODUCT_DEFINITION('design','',#6,#9);
 #6 = PRODUCT_DEFINITION_FORMATION('','',#7);
-#7 = PRODUCT('Fillet','Fillet','',(#8));
+#7 = PRODUCT('shaft-drill','shaft-drill','',(#8));
 #8 = MECHANICAL_CONTEXT('',#2,'mechanical');
 #9 = PRODUCT_DEFINITION_CONTEXT('part definition',#2,'design');
-#10 = ADVANCED_BREP_SHAPE_REPRESENTATION('',(#11,#15),#1353);
+#10 = ADVANCED_BREP_SHAPE_REPRESENTATION('',(#11,#15),#1441);
 #11 = AXIS2_PLACEMENT_3D('',#12,#13,#14);
 #12 = CARTESIAN_POINT('',(0.,0.,0.));
 #13 = DIRECTION('',(0.,0.,1.));
 #14 = DIRECTION('',(1.,0.,-0.));
 #15 = MANIFOLD_SOLID_BREP('',#16);
 #16 = CLOSED_SHELL('',(#17,#109,#167,#486,#525,#584,#638,#692,#746,#800,
-    #854,#908,#962,#1016,#1070,#1129,#1188,#1247,#1251,#1290,#1349));
+    #854,#908,#962,#1016,#1070,#1129,#1188,#1247,#1286,#1325,#1380,#1434
+    ));
 #17 = ADVANCED_FACE('',(#18),#32,.T.);
 #18 = FACE_BOUND('',#19,.F.);
 #19 = EDGE_LOOP('',(#20,#50,#81,#82));
@@ -264,11 +265,11 @@ PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
 #208 = ORIENTED_EDGE('',*,*,#209,.T.);
 #209 = EDGE_CURVE('',#210,#210,#212,.T.);
 #210 = VERTEX_POINT('',#211);
-#211 = CARTESIAN_POINT('',(-1.4,5.776028047023,1.5));
+#211 = CARTESIAN_POINT('',(-1.4,7.126184112132,1.5));
 #212 = SURFACE_CURVE('',#213,(#218,#229),.PCURVE_S1.);
 #213 = CIRCLE('',#214,0.4);
 #214 = AXIS2_PLACEMENT_3D('',#215,#216,#217);
-#215 = CARTESIAN_POINT('',(-1.8,5.776028047023,1.5));
+#215 = CARTESIAN_POINT('',(-1.8,7.126184112132,1.5));
 #216 = DIRECTION('',(0.,0.,1.));
 #217 = DIRECTION('',(1.,0.,0.));
 #218 = PCURVE('',#66,#219);
@@ -279,20 +280,20 @@ PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
 8.377580409573),.UNSPECIFIED.) CURVE() GEOMETRIC_REPRESENTATION_ITEM() 
 RATIONAL_B_SPLINE_CURVE((1.,0.5,1.,0.5,1.,0.5,1.)) REPRESENTATION_ITEM(
   '') );
-#221 = CARTESIAN_POINT('',(10.75,5.776028047023));
-#222 = CARTESIAN_POINT('',(10.75,6.468848370051));
-#223 = CARTESIAN_POINT('',(11.35,6.122438208537));
-#224 = CARTESIAN_POINT('',(11.95,5.776028047023));
-#225 = CARTESIAN_POINT('',(11.35,5.42961788551));
-#226 = CARTESIAN_POINT('',(10.75,5.083207723996));
-#227 = CARTESIAN_POINT('',(10.75,5.776028047023));
+#221 = CARTESIAN_POINT('',(10.75,7.126184112132));
+#222 = CARTESIAN_POINT('',(10.75,7.819004435159));
+#223 = CARTESIAN_POINT('',(11.35,7.472594273646));
+#224 = CARTESIAN_POINT('',(11.95,7.126184112132));
+#225 = CARTESIAN_POINT('',(11.35,6.779773950618));
+#226 = CARTESIAN_POINT('',(10.75,6.433363789104));
+#227 = CARTESIAN_POINT('',(10.75,7.126184112132));
 #228 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) 
 PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
   ) );
 #229 = PCURVE('',#230,#235);
 #230 = CYLINDRICAL_SURFACE('',#231,0.4);
 #231 = AXIS2_PLACEMENT_3D('',#232,#233,#234);
-#232 = CARTESIAN_POINT('',(-1.8,5.776028047023,1.5));
+#232 = CARTESIAN_POINT('',(-1.8,7.126184112132,1.5));
 #233 = DIRECTION('',(0.,0.,1.));
 #234 = DIRECTION('',(1.,0.,0.));
 #235 = DEFINITIONAL_REPRESENTATION('',(#236),#240);
@@ -308,11 +309,11 @@ PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
 #243 = ORIENTED_EDGE('',*,*,#244,.T.);
 #244 = EDGE_CURVE('',#245,#245,#247,.T.);
 #245 = VERTEX_POINT('',#246);
-#246 = CARTESIAN_POINT('',(2.2,5.776028047023,1.5));
+#246 = CARTESIAN_POINT('',(2.2,7.126184112132,1.5));
 #247 = SURFACE_CURVE('',#248,(#253,#264),.PCURVE_S1.);
 #248 = CIRCLE('',#249,0.4);
 #249 = AXIS2_PLACEMENT_3D('',#250,#251,#252);
-#250 = CARTESIAN_POINT('',(1.8,5.776028047023,1.5));
+#250 = CARTESIAN_POINT('',(1.8,7.126184112132,1.5));
 #251 = DIRECTION('',(0.,0.,1.));
 #252 = DIRECTION('',(1.,0.,0.));
 #253 = PCURVE('',#66,#254);
@@ -323,20 +324,20 @@ PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
 8.377580409573),.UNSPECIFIED.) CURVE() GEOMETRIC_REPRESENTATION_ITEM() 
 RATIONAL_B_SPLINE_CURVE((1.,0.5,1.,0.5,1.,0.5,1.)) REPRESENTATION_ITEM(
   '') );
-#256 = CARTESIAN_POINT('',(7.15,5.776028047023));
-#257 = CARTESIAN_POINT('',(7.15,6.468848370051));
-#258 = CARTESIAN_POINT('',(7.75,6.122438208537));
-#259 = CARTESIAN_POINT('',(8.35,5.776028047023));
-#260 = CARTESIAN_POINT('',(7.75,5.42961788551));
-#261 = CARTESIAN_POINT('',(7.15,5.083207723996));
-#262 = CARTESIAN_POINT('',(7.15,5.776028047023));
+#256 = CARTESIAN_POINT('',(7.15,7.126184112132));
+#257 = CARTESIAN_POINT('',(7.15,7.819004435159));
+#258 = CARTESIAN_POINT('',(7.75,7.472594273646));
+#259 = CARTESIAN_POINT('',(8.35,7.126184112132));
+#260 = CARTESIAN_POINT('',(7.75,6.779773950618));
+#261 = CARTESIAN_POINT('',(7.15,6.433363789104));
+#262 = CARTESIAN_POINT('',(7.15,7.126184112132));
 #263 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) 
 PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
   ) );
 #264 = PCURVE('',#265,#270);
 #265 = CYLINDRICAL_SURFACE('',#266,0.4);
 #266 = AXIS2_PLACEMENT_3D('',#267,#268,#269);
-#267 = CARTESIAN_POINT('',(1.8,5.776028047023,1.5));
+#267 = CARTESIAN_POINT('',(1.8,7.126184112132,1.5));
 #268 = DIRECTION('',(0.,0.,1.));
 #269 = DIRECTION('',(1.,0.,0.));
 #270 = DEFINITIONAL_REPRESENTATION('',(#271),#275);
@@ -352,11 +353,11 @@ PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
 #278 = ORIENTED_EDGE('',*,*,#279,.T.);
 #279 = EDGE_CURVE('',#280,#280,#282,.T.);
 #280 = VERTEX_POINT('',#281);
-#281 = CARTESIAN_POINT('',(-2.2,-5.776028047023,1.5));
+#281 = CARTESIAN_POINT('',(-2.2,-7.126184112132,1.5));
 #282 = SURFACE_CURVE('',#283,(#288,#299),.PCURVE_S1.);
 #283 = CIRCLE('',#284,0.4);
 #284 = AXIS2_PLACEMENT_3D('',#285,#286,#287);
-#285 = CARTESIAN_POINT('',(-1.8,-5.776028047023,1.5));
+#285 = CARTESIAN_POINT('',(-1.8,-7.126184112132,1.5));
 #286 = DIRECTION('',(0.,0.,1.));
 #287 = DIRECTION('',(-1.,1.224646799147E-16,0.));
 #288 = PCURVE('',#66,#289);
@@ -367,20 +368,20 @@ PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
 8.377580409573),.UNSPECIFIED.) CURVE() GEOMETRIC_REPRESENTATION_ITEM() 
 RATIONAL_B_SPLINE_CURVE((1.,0.5,1.,0.5,1.,0.5,1.)) REPRESENTATION_ITEM(
   '') );
-#291 = CARTESIAN_POINT('',(11.55,-5.776028047023));
-#292 = CARTESIAN_POINT('',(11.55,-6.468848370051));
-#293 = CARTESIAN_POINT('',(10.95,-6.122438208537));
-#294 = CARTESIAN_POINT('',(10.35,-5.776028047023));
-#295 = CARTESIAN_POINT('',(10.95,-5.42961788551));
-#296 = CARTESIAN_POINT('',(11.55,-5.083207723996));
-#297 = CARTESIAN_POINT('',(11.55,-5.776028047023));
+#291 = CARTESIAN_POINT('',(11.55,-7.126184112132));
+#292 = CARTESIAN_POINT('',(11.55,-7.819004435159));
+#293 = CARTESIAN_POINT('',(10.95,-7.472594273646));
+#294 = CARTESIAN_POINT('',(10.35,-7.126184112132));
+#295 = CARTESIAN_POINT('',(10.95,-6.779773950618));
+#296 = CARTESIAN_POINT('',(11.55,-6.433363789104));
+#297 = CARTESIAN_POINT('',(11.55,-7.126184112132));
 #298 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) 
 PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
   ) );
 #299 = PCURVE('',#300,#305);
 #300 = CYLINDRICAL_SURFACE('',#301,0.4);
 #301 = AXIS2_PLACEMENT_3D('',#302,#303,#304);
-#302 = CARTESIAN_POINT('',(-1.8,-5.776028047023,1.5));
+#302 = CARTESIAN_POINT('',(-1.8,-7.126184112132,1.5));
 #303 = DIRECTION('',(0.,0.,1.));
 #304 = DIRECTION('',(-1.,1.224646799147E-16,0.));
 #305 = DEFINITIONAL_REPRESENTATION('',(#306),#310);
@@ -396,11 +397,11 @@ PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
 #313 = ORIENTED_EDGE('',*,*,#314,.T.);
 #314 = EDGE_CURVE('',#315,#315,#317,.T.);
 #315 = VERTEX_POINT('',#316);
-#316 = CARTESIAN_POINT('',(-5.776028047023,-1.4,1.5));
+#316 = CARTESIAN_POINT('',(-7.126184112132,-1.4,1.5));
 #317 = SURFACE_CURVE('',#318,(#323,#334),.PCURVE_S1.);
 #318 = CIRCLE('',#319,0.4);
 #319 = AXIS2_PLACEMENT_3D('',#320,#321,#322);
-#320 = CARTESIAN_POINT('',(-5.776028047023,-1.8,1.5));
+#320 = CARTESIAN_POINT('',(-7.126184112132,-1.8,1.5));
 #321 = DIRECTION('',(0.,-0.,1.));
 #322 = DIRECTION('',(1.110223024625E-16,1.,0.));
 #323 = PCURVE('',#66,#324);
@@ -411,20 +412,20 @@ PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
 8.377580409573),.UNSPECIFIED.) CURVE() GEOMETRIC_REPRESENTATION_ITEM() 
 RATIONAL_B_SPLINE_CURVE((1.,0.5,1.,0.5,1.,0.5,1.)) REPRESENTATION_ITEM(
   '') );
-#326 = CARTESIAN_POINT('',(15.126028047023,-1.4));
-#327 = CARTESIAN_POINT('',(15.818848370051,-1.4));
-#328 = CARTESIAN_POINT('',(15.472438208537,-2.));
-#329 = CARTESIAN_POINT('',(15.126028047023,-2.6));
-#330 = CARTESIAN_POINT('',(14.77961788551,-2.));
-#331 = CARTESIAN_POINT('',(14.433207723996,-1.4));
-#332 = CARTESIAN_POINT('',(15.126028047023,-1.4));
+#326 = CARTESIAN_POINT('',(16.476184112132,-1.4));
+#327 = CARTESIAN_POINT('',(17.169004435159,-1.4));
+#328 = CARTESIAN_POINT('',(16.822594273646,-2.));
+#329 = CARTESIAN_POINT('',(16.476184112132,-2.6));
+#330 = CARTESIAN_POINT('',(16.129773950618,-2.));
+#331 = CARTESIAN_POINT('',(15.783363789104,-1.4));
+#332 = CARTESIAN_POINT('',(16.476184112132,-1.4));
 #333 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) 
 PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
   ) );
 #334 = PCURVE('',#335,#340);
 #335 = CYLINDRICAL_SURFACE('',#336,0.4);
 #336 = AXIS2_PLACEMENT_3D('',#337,#338,#339);
-#337 = CARTESIAN_POINT('',(-5.776028047023,-1.8,1.5));
+#337 = CARTESIAN_POINT('',(-7.126184112132,-1.8,1.5));
 #338 = DIRECTION('',(0.,0.,1.));
 #339 = DIRECTION('',(1.110223024625E-16,1.,0.));
 #340 = DEFINITIONAL_REPRESENTATION('',(#341),#345);
@@ -440,11 +441,11 @@ PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
 #348 = ORIENTED_EDGE('',*,*,#349,.T.);
 #349 = EDGE_CURVE('',#350,#350,#352,.T.);
 #350 = VERTEX_POINT('',#351);
-#351 = CARTESIAN_POINT('',(-5.776028047023,2.2,1.5));
+#351 = CARTESIAN_POINT('',(-7.126184112132,2.2,1.5));
 #352 = SURFACE_CURVE('',#353,(#358,#369),.PCURVE_S1.);
 #353 = CIRCLE('',#354,0.4);
 #354 = AXIS2_PLACEMENT_3D('',#355,#356,#357);
-#355 = CARTESIAN_POINT('',(-5.776028047023,1.8,1.5));
+#355 = CARTESIAN_POINT('',(-7.126184112132,1.8,1.5));
 #356 = DIRECTION('',(0.,-0.,1.));
 #357 = DIRECTION('',(1.110223024625E-16,1.,0.));
 #358 = PCURVE('',#66,#359);
@@ -455,20 +456,20 @@ PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
 8.377580409573),.UNSPECIFIED.) CURVE() GEOMETRIC_REPRESENTATION_ITEM() 
 RATIONAL_B_SPLINE_CURVE((1.,0.5,1.,0.5,1.,0.5,1.)) REPRESENTATION_ITEM(
   '') );
-#361 = CARTESIAN_POINT('',(15.126028047023,2.2));
-#362 = CARTESIAN_POINT('',(15.818848370051,2.2));
-#363 = CARTESIAN_POINT('',(15.472438208537,1.6));
-#364 = CARTESIAN_POINT('',(15.126028047023,1.));
-#365 = CARTESIAN_POINT('',(14.77961788551,1.6));
-#366 = CARTESIAN_POINT('',(14.433207723996,2.2));
-#367 = CARTESIAN_POINT('',(15.126028047023,2.2));
+#361 = CARTESIAN_POINT('',(16.476184112132,2.2));
+#362 = CARTESIAN_POINT('',(17.169004435159,2.2));
+#363 = CARTESIAN_POINT('',(16.822594273646,1.6));
+#364 = CARTESIAN_POINT('',(16.476184112132,1.));
+#365 = CARTESIAN_POINT('',(16.129773950618,1.6));
+#366 = CARTESIAN_POINT('',(15.783363789104,2.2));
+#367 = CARTESIAN_POINT('',(16.476184112132,2.2));
 #368 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) 
 PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
   ) );
 #369 = PCURVE('',#370,#375);
 #370 = CYLINDRICAL_SURFACE('',#371,0.4);
 #371 = AXIS2_PLACEMENT_3D('',#372,#373,#374);
-#372 = CARTESIAN_POINT('',(-5.776028047023,1.8,1.5));
+#372 = CARTESIAN_POINT('',(-7.126184112132,1.8,1.5));
 #373 = DIRECTION('',(0.,0.,1.));
 #374 = DIRECTION('',(1.110223024625E-16,1.,0.));
 #375 = DEFINITIONAL_REPRESENTATION('',(#376),#380);
@@ -484,11 +485,11 @@ PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
 #383 = ORIENTED_EDGE('',*,*,#384,.T.);
 #384 = EDGE_CURVE('',#385,#385,#387,.T.);
 #385 = VERTEX_POINT('',#386);
-#386 = CARTESIAN_POINT('',(5.776028047023,1.4,1.5));
+#386 = CARTESIAN_POINT('',(7.126184112132,1.4,1.5));
 #387 = SURFACE_CURVE('',#388,(#393,#404),.PCURVE_S1.);
 #388 = CIRCLE('',#389,0.4);
 #389 = AXIS2_PLACEMENT_3D('',#390,#391,#392);
-#390 = CARTESIAN_POINT('',(5.776028047023,1.8,1.5));
+#390 = CARTESIAN_POINT('',(7.126184112132,1.8,1.5));
 #391 = DIRECTION('',(0.,0.,1.));
 #392 = DIRECTION('',(-2.22044604925E-16,-1.,0.));
 #393 = PCURVE('',#66,#394);
@@ -499,20 +500,20 @@ PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
 8.377580409573),.UNSPECIFIED.) CURVE() GEOMETRIC_REPRESENTATION_ITEM() 
 RATIONAL_B_SPLINE_CURVE((1.,0.5,1.,0.5,1.,0.5,1.)) REPRESENTATION_ITEM(
   '') );
-#396 = CARTESIAN_POINT('',(3.573971952977,1.4));
-#397 = CARTESIAN_POINT('',(2.881151629949,1.4));
-#398 = CARTESIAN_POINT('',(3.227561791463,2.));
-#399 = CARTESIAN_POINT('',(3.573971952977,2.6));
-#400 = CARTESIAN_POINT('',(3.92038211449,2.));
-#401 = CARTESIAN_POINT('',(4.266792276004,1.4));
-#402 = CARTESIAN_POINT('',(3.573971952977,1.4));
+#396 = CARTESIAN_POINT('',(2.223815887868,1.4));
+#397 = CARTESIAN_POINT('',(1.530995564841,1.4));
+#398 = CARTESIAN_POINT('',(1.877405726354,2.));
+#399 = CARTESIAN_POINT('',(2.223815887868,2.6));
+#400 = CARTESIAN_POINT('',(2.570226049382,2.));
+#401 = CARTESIAN_POINT('',(2.916636210896,1.4));
+#402 = CARTESIAN_POINT('',(2.223815887868,1.4));
 #403 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) 
 PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
   ) );
 #404 = PCURVE('',#405,#410);
 #405 = CYLINDRICAL_SURFACE('',#406,0.4);
 #406 = AXIS2_PLACEMENT_3D('',#407,#408,#409);
-#407 = CARTESIAN_POINT('',(5.776028047023,1.8,1.5));
+#407 = CARTESIAN_POINT('',(7.126184112132,1.8,1.5));
 #408 = DIRECTION('',(0.,0.,1.));
 #409 = DIRECTION('',(-2.22044604925E-16,-1.,0.));
 #410 = DEFINITIONAL_REPRESENTATION('',(#411),#415);
@@ -528,37 +529,37 @@ PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
 #418 = ORIENTED_EDGE('',*,*,#419,.T.);
 #419 = EDGE_CURVE('',#420,#420,#422,.T.);
 #420 = VERTEX_POINT('',#421);
-#421 = CARTESIAN_POINT('',(1.4,-5.776028047023,1.5));
+#421 = CARTESIAN_POINT('',(7.126184112132,-2.2,1.5));
 #422 = SURFACE_CURVE('',#423,(#428,#439),.PCURVE_S1.);
 #423 = CIRCLE('',#424,0.4);
 #424 = AXIS2_PLACEMENT_3D('',#425,#426,#427);
-#425 = CARTESIAN_POINT('',(1.8,-5.776028047023,1.5));
+#425 = CARTESIAN_POINT('',(7.126184112132,-1.8,1.5));
 #426 = DIRECTION('',(0.,0.,1.));
-#427 = DIRECTION('',(-1.,1.224646799147E-16,0.));
+#427 = DIRECTION('',(-2.22044604925E-16,-1.,0.));
 #428 = PCURVE('',#66,#429);
 #429 = DEFINITIONAL_REPRESENTATION('',(#430),#438);
 #430 = ( BOUNDED_CURVE() B_SPLINE_CURVE(2,(#431,#432,#433,#434,#435,#436
-,#437),.UNSPECIFIED.,.T.,.F.) B_SPLINE_CURVE_WITH_KNOTS((1,2,2,2,2,1),(
+,#437),.UNSPECIFIED.,.F.,.F.) B_SPLINE_CURVE_WITH_KNOTS((1,2,2,2,2,1),(
     -2.094395102393,0.,2.094395102393,4.188790204786,6.28318530718,
 8.377580409573),.UNSPECIFIED.) CURVE() GEOMETRIC_REPRESENTATION_ITEM() 
 RATIONAL_B_SPLINE_CURVE((1.,0.5,1.,0.5,1.,0.5,1.)) REPRESENTATION_ITEM(
   '') );
-#431 = CARTESIAN_POINT('',(7.95,-5.776028047023));
-#432 = CARTESIAN_POINT('',(7.95,-6.468848370051));
-#433 = CARTESIAN_POINT('',(7.35,-6.122438208537));
-#434 = CARTESIAN_POINT('',(6.75,-5.776028047023));
-#435 = CARTESIAN_POINT('',(7.35,-5.42961788551));
-#436 = CARTESIAN_POINT('',(7.95,-5.083207723996));
-#437 = CARTESIAN_POINT('',(7.95,-5.776028047023));
+#431 = CARTESIAN_POINT('',(2.223815887868,-2.2));
+#432 = CARTESIAN_POINT('',(1.530995564841,-2.2));
+#433 = CARTESIAN_POINT('',(1.877405726354,-1.6));
+#434 = CARTESIAN_POINT('',(2.223815887868,-1.));
+#435 = CARTESIAN_POINT('',(2.570226049382,-1.6));
+#436 = CARTESIAN_POINT('',(2.916636210896,-2.2));
+#437 = CARTESIAN_POINT('',(2.223815887868,-2.2));
 #438 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) 
 PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
   ) );
 #439 = PCURVE('',#440,#445);
 #440 = CYLINDRICAL_SURFACE('',#441,0.4);
 #441 = AXIS2_PLACEMENT_3D('',#442,#443,#444);
-#442 = CARTESIAN_POINT('',(1.8,-5.776028047023,1.5));
+#442 = CARTESIAN_POINT('',(7.126184112132,-1.8,1.5));
 #443 = DIRECTION('',(0.,0.,1.));
-#444 = DIRECTION('',(-1.,1.224646799147E-16,0.));
+#444 = DIRECTION('',(-2.22044604925E-16,-1.,0.));
 #445 = DEFINITIONAL_REPRESENTATION('',(#446),#450);
 #446 = LINE('',#447,#448);
 #447 = CARTESIAN_POINT('',(0.,0.));
@@ -572,13 +573,13 @@ PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
 #453 = ORIENTED_EDGE('',*,*,#454,.T.);
 #454 = EDGE_CURVE('',#455,#455,#457,.T.);
 #455 = VERTEX_POINT('',#456);
-#456 = CARTESIAN_POINT('',(5.776028047023,-2.2,1.5));
+#456 = CARTESIAN_POINT('',(1.4,-7.126184112132,1.5));
 #457 = SURFACE_CURVE('',#458,(#463,#474),.PCURVE_S1.);
 #458 = CIRCLE('',#459,0.4);
 #459 = AXIS2_PLACEMENT_3D('',#460,#461,#462);
-#460 = CARTESIAN_POINT('',(5.776028047023,-1.8,1.5));
+#460 = CARTESIAN_POINT('',(1.8,-7.126184112132,1.5));
 #461 = DIRECTION('',(0.,0.,1.));
-#462 = DIRECTION('',(-2.22044604925E-16,-1.,0.));
+#462 = DIRECTION('',(-1.,1.224646799147E-16,0.));
 #463 = PCURVE('',#66,#464);
 #464 = DEFINITIONAL_REPRESENTATION('',(#465),#473);
 #465 = ( BOUNDED_CURVE() B_SPLINE_CURVE(2,(#466,#467,#468,#469,#470,#471
@@ -587,22 +588,22 @@ PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
 8.377580409573),.UNSPECIFIED.) CURVE() GEOMETRIC_REPRESENTATION_ITEM() 
 RATIONAL_B_SPLINE_CURVE((1.,0.5,1.,0.5,1.,0.5,1.)) REPRESENTATION_ITEM(
   '') );
-#466 = CARTESIAN_POINT('',(3.573971952977,-2.2));
-#467 = CARTESIAN_POINT('',(2.881151629949,-2.2));
-#468 = CARTESIAN_POINT('',(3.227561791463,-1.6));
-#469 = CARTESIAN_POINT('',(3.573971952977,-1.));
-#470 = CARTESIAN_POINT('',(3.92038211449,-1.6));
-#471 = CARTESIAN_POINT('',(4.266792276004,-2.2));
-#472 = CARTESIAN_POINT('',(3.573971952977,-2.2));
+#466 = CARTESIAN_POINT('',(7.95,-7.126184112132));
+#467 = CARTESIAN_POINT('',(7.95,-7.819004435159));
+#468 = CARTESIAN_POINT('',(7.35,-7.472594273646));
+#469 = CARTESIAN_POINT('',(6.75,-7.126184112132));
+#470 = CARTESIAN_POINT('',(7.35,-6.779773950618));
+#471 = CARTESIAN_POINT('',(7.95,-6.433363789104));
+#472 = CARTESIAN_POINT('',(7.95,-7.126184112132));
 #473 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) 
 PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
   ) );
 #474 = PCURVE('',#475,#480);
 #475 = CYLINDRICAL_SURFACE('',#476,0.4);
 #476 = AXIS2_PLACEMENT_3D('',#477,#478,#479);
-#477 = CARTESIAN_POINT('',(5.776028047023,-1.8,1.5));
+#477 = CARTESIAN_POINT('',(1.8,-7.126184112132,1.5));
 #478 = DIRECTION('',(0.,0.,1.));
-#479 = DIRECTION('',(-2.22044604925E-16,-1.,0.));
+#479 = DIRECTION('',(-1.,1.224646799147E-16,0.));
 #480 = DEFINITIONAL_REPRESENTATION('',(#481),#485);
 #481 = LINE('',#482,#483);
 #482 = CARTESIAN_POINT('',(0.,0.));
@@ -738,10 +739,10 @@ PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
 #588 = ORIENTED_EDGE('',*,*,#589,.T.);
 #589 = EDGE_CURVE('',#210,#590,#592,.T.);
 #590 = VERTEX_POINT('',#591);
-#591 = CARTESIAN_POINT('',(-1.4,5.776028047023,0.));
+#591 = CARTESIAN_POINT('',(-1.4,7.126184112132,0.));
 #592 = SEAM_CURVE('',#593,(#597,#604),.PCURVE_S1.);
 #593 = LINE('',#594,#595);
-#594 = CARTESIAN_POINT('',(-1.4,5.776028047023,1.5));
+#594 = CARTESIAN_POINT('',(-1.4,7.126184112132,1.5));
 #595 = VECTOR('',#596,1.);
 #596 = DIRECTION('',(-0.,-0.,-1.));
 #597 = PCURVE('',#230,#598);
@@ -767,7 +768,7 @@ PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
 #613 = SURFACE_CURVE('',#614,(#619,#626),.PCURVE_S1.);
 #614 = CIRCLE('',#615,0.4);
 #615 = AXIS2_PLACEMENT_3D('',#616,#617,#618);
-#616 = CARTESIAN_POINT('',(-1.8,5.776028047023,0.));
+#616 = CARTESIAN_POINT('',(-1.8,7.126184112132,0.));
 #617 = DIRECTION('',(0.,0.,1.));
 #618 = DIRECTION('',(1.,0.,0.));
 #619 = PCURVE('',#230,#620);
@@ -787,13 +788,13 @@ PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
 8.377580409573),.UNSPECIFIED.) CURVE() GEOMETRIC_REPRESENTATION_ITEM() 
 RATIONAL_B_SPLINE_CURVE((1.,0.5,1.,0.5,1.,0.5,1.)) REPRESENTATION_ITEM(
   '') );
-#629 = CARTESIAN_POINT('',(10.75,5.776028047023));
-#630 = CARTESIAN_POINT('',(10.75,6.468848370051));
-#631 = CARTESIAN_POINT('',(11.35,6.122438208537));
-#632 = CARTESIAN_POINT('',(11.95,5.776028047023));
-#633 = CARTESIAN_POINT('',(11.35,5.42961788551));
-#634 = CARTESIAN_POINT('',(10.75,5.083207723996));
-#635 = CARTESIAN_POINT('',(10.75,5.776028047023));
+#629 = CARTESIAN_POINT('',(10.75,7.126184112132));
+#630 = CARTESIAN_POINT('',(10.75,7.819004435159));
+#631 = CARTESIAN_POINT('',(11.35,7.472594273646));
+#632 = CARTESIAN_POINT('',(11.95,7.126184112132));
+#633 = CARTESIAN_POINT('',(11.35,6.779773950618));
+#634 = CARTESIAN_POINT('',(10.75,6.433363789104));
+#635 = CARTESIAN_POINT('',(10.75,7.126184112132));
 #636 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) 
 PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
   ) );
@@ -805,10 +806,10 @@ PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
 #642 = ORIENTED_EDGE('',*,*,#643,.T.);
 #643 = EDGE_CURVE('',#245,#644,#646,.T.);
 #644 = VERTEX_POINT('',#645);
-#645 = CARTESIAN_POINT('',(2.2,5.776028047023,0.));
+#645 = CARTESIAN_POINT('',(2.2,7.126184112132,0.));
 #646 = SEAM_CURVE('',#647,(#651,#658),.PCURVE_S1.);
 #647 = LINE('',#648,#649);
-#648 = CARTESIAN_POINT('',(2.2,5.776028047023,1.5));
+#648 = CARTESIAN_POINT('',(2.2,7.126184112132,1.5));
 #649 = VECTOR('',#650,1.);
 #650 = DIRECTION('',(-0.,-0.,-1.));
 #651 = PCURVE('',#265,#652);
@@ -834,7 +835,7 @@ PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
 #667 = SURFACE_CURVE('',#668,(#673,#680),.PCURVE_S1.);
 #668 = CIRCLE('',#669,0.4);
 #669 = AXIS2_PLACEMENT_3D('',#670,#671,#672);
-#670 = CARTESIAN_POINT('',(1.8,5.776028047023,0.));
+#670 = CARTESIAN_POINT('',(1.8,7.126184112132,0.));
 #671 = DIRECTION('',(0.,0.,1.));
 #672 = DIRECTION('',(1.,0.,0.));
 #673 = PCURVE('',#265,#674);
@@ -854,13 +855,13 @@ PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
 8.377580409573),.UNSPECIFIED.) CURVE() GEOMETRIC_REPRESENTATION_ITEM() 
 RATIONAL_B_SPLINE_CURVE((1.,0.5,1.,0.5,1.,0.5,1.)) REPRESENTATION_ITEM(
   '') );
-#683 = CARTESIAN_POINT('',(7.15,5.776028047023));
-#684 = CARTESIAN_POINT('',(7.15,6.468848370051));
-#685 = CARTESIAN_POINT('',(7.75,6.122438208537));
-#686 = CARTESIAN_POINT('',(8.35,5.776028047023));
-#687 = CARTESIAN_POINT('',(7.75,5.42961788551));
-#688 = CARTESIAN_POINT('',(7.15,5.083207723996));
-#689 = CARTESIAN_POINT('',(7.15,5.776028047023));
+#683 = CARTESIAN_POINT('',(7.15,7.126184112132));
+#684 = CARTESIAN_POINT('',(7.15,7.819004435159));
+#685 = CARTESIAN_POINT('',(7.75,7.472594273646));
+#686 = CARTESIAN_POINT('',(8.35,7.126184112132));
+#687 = CARTESIAN_POINT('',(7.75,6.779773950618));
+#688 = CARTESIAN_POINT('',(7.15,6.433363789104));
+#689 = CARTESIAN_POINT('',(7.15,7.126184112132));
 #690 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) 
 PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
   ) );
@@ -872,10 +873,10 @@ PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
 #696 = ORIENTED_EDGE('',*,*,#697,.T.);
 #697 = EDGE_CURVE('',#280,#698,#700,.T.);
 #698 = VERTEX_POINT('',#699);
-#699 = CARTESIAN_POINT('',(-2.2,-5.776028047023,0.));
+#699 = CARTESIAN_POINT('',(-2.2,-7.126184112132,0.));
 #700 = SEAM_CURVE('',#701,(#705,#712),.PCURVE_S1.);
 #701 = LINE('',#702,#703);
-#702 = CARTESIAN_POINT('',(-2.2,-5.776028047023,1.5));
+#702 = CARTESIAN_POINT('',(-2.2,-7.126184112132,1.5));
 #703 = VECTOR('',#704,1.);
 #704 = DIRECTION('',(0.,0.,-1.));
 #705 = PCURVE('',#300,#706);
@@ -901,7 +902,7 @@ PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
 #721 = SURFACE_CURVE('',#722,(#727,#734),.PCURVE_S1.);
 #722 = CIRCLE('',#723,0.4);
 #723 = AXIS2_PLACEMENT_3D('',#724,#725,#726);
-#724 = CARTESIAN_POINT('',(-1.8,-5.776028047023,0.));
+#724 = CARTESIAN_POINT('',(-1.8,-7.126184112132,0.));
 #725 = DIRECTION('',(0.,0.,1.));
 #726 = DIRECTION('',(-1.,1.224646799147E-16,0.));
 #727 = PCURVE('',#300,#728);
@@ -921,13 +922,13 @@ PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
 8.377580409573),.UNSPECIFIED.) CURVE() GEOMETRIC_REPRESENTATION_ITEM() 
 RATIONAL_B_SPLINE_CURVE((1.,0.5,1.,0.5,1.,0.5,1.)) REPRESENTATION_ITEM(
   '') );
-#737 = CARTESIAN_POINT('',(11.55,-5.776028047023));
-#738 = CARTESIAN_POINT('',(11.55,-6.468848370051));
-#739 = CARTESIAN_POINT('',(10.95,-6.122438208537));
-#740 = CARTESIAN_POINT('',(10.35,-5.776028047023));
-#741 = CARTESIAN_POINT('',(10.95,-5.42961788551));
-#742 = CARTESIAN_POINT('',(11.55,-5.083207723996));
-#743 = CARTESIAN_POINT('',(11.55,-5.776028047023));
+#737 = CARTESIAN_POINT('',(11.55,-7.126184112132));
+#738 = CARTESIAN_POINT('',(11.55,-7.819004435159));
+#739 = CARTESIAN_POINT('',(10.95,-7.472594273646));
+#740 = CARTESIAN_POINT('',(10.35,-7.126184112132));
+#741 = CARTESIAN_POINT('',(10.95,-6.779773950618));
+#742 = CARTESIAN_POINT('',(11.55,-6.433363789104));
+#743 = CARTESIAN_POINT('',(11.55,-7.126184112132));
 #744 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) 
 PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
   ) );
@@ -939,10 +940,10 @@ PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
 #750 = ORIENTED_EDGE('',*,*,#751,.T.);
 #751 = EDGE_CURVE('',#315,#752,#754,.T.);
 #752 = VERTEX_POINT('',#753);
-#753 = CARTESIAN_POINT('',(-5.776028047023,-1.4,0.));
+#753 = CARTESIAN_POINT('',(-7.126184112132,-1.4,0.));
 #754 = SEAM_CURVE('',#755,(#759,#766),.PCURVE_S1.);
 #755 = LINE('',#756,#757);
-#756 = CARTESIAN_POINT('',(-5.776028047023,-1.4,1.5));
+#756 = CARTESIAN_POINT('',(-7.126184112132,-1.4,1.5));
 #757 = VECTOR('',#758,1.);
 #758 = DIRECTION('',(0.,-0.,-1.));
 #759 = PCURVE('',#335,#760);
@@ -968,7 +969,7 @@ PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
 #775 = SURFACE_CURVE('',#776,(#781,#788),.PCURVE_S1.);
 #776 = CIRCLE('',#777,0.4);
 #777 = AXIS2_PLACEMENT_3D('',#778,#779,#780);
-#778 = CARTESIAN_POINT('',(-5.776028047023,-1.8,0.));
+#778 = CARTESIAN_POINT('',(-7.126184112132,-1.8,0.));
 #779 = DIRECTION('',(0.,-0.,1.));
 #780 = DIRECTION('',(1.110223024625E-16,1.,0.));
 #781 = PCURVE('',#335,#782);
@@ -988,13 +989,13 @@ PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
 8.377580409573),.UNSPECIFIED.) CURVE() GEOMETRIC_REPRESENTATION_ITEM() 
 RATIONAL_B_SPLINE_CURVE((1.,0.5,1.,0.5,1.,0.5,1.)) REPRESENTATION_ITEM(
   '') );
-#791 = CARTESIAN_POINT('',(15.126028047023,-1.4));
-#792 = CARTESIAN_POINT('',(15.818848370051,-1.4));
-#793 = CARTESIAN_POINT('',(15.472438208537,-2.));
-#794 = CARTESIAN_POINT('',(15.126028047023,-2.6));
-#795 = CARTESIAN_POINT('',(14.77961788551,-2.));
-#796 = CARTESIAN_POINT('',(14.433207723996,-1.4));
-#797 = CARTESIAN_POINT('',(15.126028047023,-1.4));
+#791 = CARTESIAN_POINT('',(16.476184112132,-1.4));
+#792 = CARTESIAN_POINT('',(17.169004435159,-1.4));
+#793 = CARTESIAN_POINT('',(16.822594273646,-2.));
+#794 = CARTESIAN_POINT('',(16.476184112132,-2.6));
+#795 = CARTESIAN_POINT('',(16.129773950618,-2.));
+#796 = CARTESIAN_POINT('',(15.783363789104,-1.4));
+#797 = CARTESIAN_POINT('',(16.476184112132,-1.4));
 #798 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) 
 PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
   ) );
@@ -1006,10 +1007,10 @@ PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
 #804 = ORIENTED_EDGE('',*,*,#805,.T.);
 #805 = EDGE_CURVE('',#350,#806,#808,.T.);
 #806 = VERTEX_POINT('',#807);
-#807 = CARTESIAN_POINT('',(-5.776028047023,2.2,0.));
+#807 = CARTESIAN_POINT('',(-7.126184112132,2.2,0.));
 #808 = SEAM_CURVE('',#809,(#813,#820),.PCURVE_S1.);
 #809 = LINE('',#810,#811);
-#810 = CARTESIAN_POINT('',(-5.776028047023,2.2,1.5));
+#810 = CARTESIAN_POINT('',(-7.126184112132,2.2,1.5));
 #811 = VECTOR('',#812,1.);
 #812 = DIRECTION('',(0.,-0.,-1.));
 #813 = PCURVE('',#370,#814);
@@ -1035,7 +1036,7 @@ PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
 #829 = SURFACE_CURVE('',#830,(#835,#842),.PCURVE_S1.);
 #830 = CIRCLE('',#831,0.4);
 #831 = AXIS2_PLACEMENT_3D('',#832,#833,#834);
-#832 = CARTESIAN_POINT('',(-5.776028047023,1.8,0.));
+#832 = CARTESIAN_POINT('',(-7.126184112132,1.8,0.));
 #833 = DIRECTION('',(0.,-0.,1.));
 #834 = DIRECTION('',(1.110223024625E-16,1.,0.));
 #835 = PCURVE('',#370,#836);
@@ -1055,13 +1056,13 @@ PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
 8.377580409573),.UNSPECIFIED.) CURVE() GEOMETRIC_REPRESENTATION_ITEM() 
 RATIONAL_B_SPLINE_CURVE((1.,0.5,1.,0.5,1.,0.5,1.)) REPRESENTATION_ITEM(
   '') );
-#845 = CARTESIAN_POINT('',(15.126028047023,2.2));
-#846 = CARTESIAN_POINT('',(15.818848370051,2.2));
-#847 = CARTESIAN_POINT('',(15.472438208537,1.6));
-#848 = CARTESIAN_POINT('',(15.126028047023,1.));
-#849 = CARTESIAN_POINT('',(14.77961788551,1.6));
-#850 = CARTESIAN_POINT('',(14.433207723996,2.2));
-#851 = CARTESIAN_POINT('',(15.126028047023,2.2));
+#845 = CARTESIAN_POINT('',(16.476184112132,2.2));
+#846 = CARTESIAN_POINT('',(17.169004435159,2.2));
+#847 = CARTESIAN_POINT('',(16.822594273646,1.6));
+#848 = CARTESIAN_POINT('',(16.476184112132,1.));
+#849 = CARTESIAN_POINT('',(16.129773950618,1.6));
+#850 = CARTESIAN_POINT('',(15.783363789104,2.2));
+#851 = CARTESIAN_POINT('',(16.476184112132,2.2));
 #852 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) 
 PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
   ) );
@@ -1073,10 +1074,10 @@ PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
 #858 = ORIENTED_EDGE('',*,*,#859,.T.);
 #859 = EDGE_CURVE('',#385,#860,#862,.T.);
 #860 = VERTEX_POINT('',#861);
-#861 = CARTESIAN_POINT('',(5.776028047023,1.4,0.));
+#861 = CARTESIAN_POINT('',(7.126184112132,1.4,0.));
 #862 = SEAM_CURVE('',#863,(#867,#874),.PCURVE_S1.);
 #863 = LINE('',#864,#865);
-#864 = CARTESIAN_POINT('',(5.776028047023,1.4,1.5));
+#864 = CARTESIAN_POINT('',(7.126184112132,1.4,1.5));
 #865 = VECTOR('',#866,1.);
 #866 = DIRECTION('',(0.,0.,-1.));
 #867 = PCURVE('',#405,#868);
@@ -1102,7 +1103,7 @@ PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
 #883 = SURFACE_CURVE('',#884,(#889,#896),.PCURVE_S1.);
 #884 = CIRCLE('',#885,0.4);
 #885 = AXIS2_PLACEMENT_3D('',#886,#887,#888);
-#886 = CARTESIAN_POINT('',(5.776028047023,1.8,0.));
+#886 = CARTESIAN_POINT('',(7.126184112132,1.8,0.));
 #887 = DIRECTION('',(0.,0.,1.));
 #888 = DIRECTION('',(-2.22044604925E-16,-1.,0.));
 #889 = PCURVE('',#405,#890);
@@ -1122,13 +1123,13 @@ PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
 8.377580409573),.UNSPECIFIED.) CURVE() GEOMETRIC_REPRESENTATION_ITEM() 
 RATIONAL_B_SPLINE_CURVE((1.,0.5,1.,0.5,1.,0.5,1.)) REPRESENTATION_ITEM(
   '') );
-#899 = CARTESIAN_POINT('',(3.573971952977,1.4));
-#900 = CARTESIAN_POINT('',(2.881151629949,1.4));
-#901 = CARTESIAN_POINT('',(3.227561791463,2.));
-#902 = CARTESIAN_POINT('',(3.573971952977,2.6));
-#903 = CARTESIAN_POINT('',(3.92038211449,2.));
-#904 = CARTESIAN_POINT('',(4.266792276004,1.4));
-#905 = CARTESIAN_POINT('',(3.573971952977,1.4));
+#899 = CARTESIAN_POINT('',(2.223815887868,1.4));
+#900 = CARTESIAN_POINT('',(1.530995564841,1.4));
+#901 = CARTESIAN_POINT('',(1.877405726354,2.));
+#902 = CARTESIAN_POINT('',(2.223815887868,2.6));
+#903 = CARTESIAN_POINT('',(2.570226049382,2.));
+#904 = CARTESIAN_POINT('',(2.916636210896,1.4));
+#905 = CARTESIAN_POINT('',(2.223815887868,1.4));
 #906 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) 
 PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
   ) );
@@ -1140,10 +1141,10 @@ PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
 #912 = ORIENTED_EDGE('',*,*,#913,.T.);
 #913 = EDGE_CURVE('',#420,#914,#916,.T.);
 #914 = VERTEX_POINT('',#915);
-#915 = CARTESIAN_POINT('',(1.4,-5.776028047023,0.));
+#915 = CARTESIAN_POINT('',(7.126184112132,-2.2,0.));
 #916 = SEAM_CURVE('',#917,(#921,#928),.PCURVE_S1.);
 #917 = LINE('',#918,#919);
-#918 = CARTESIAN_POINT('',(1.4,-5.776028047023,1.5));
+#918 = CARTESIAN_POINT('',(7.126184112132,-2.2,1.5));
 #919 = VECTOR('',#920,1.);
 #920 = DIRECTION('',(0.,0.,-1.));
 #921 = PCURVE('',#440,#922);
@@ -1169,9 +1170,9 @@ PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
 #937 = SURFACE_CURVE('',#938,(#943,#950),.PCURVE_S1.);
 #938 = CIRCLE('',#939,0.4);
 #939 = AXIS2_PLACEMENT_3D('',#940,#941,#942);
-#940 = CARTESIAN_POINT('',(1.8,-5.776028047023,0.));
+#940 = CARTESIAN_POINT('',(7.126184112132,-1.8,0.));
 #941 = DIRECTION('',(0.,0.,1.));
-#942 = DIRECTION('',(-1.,1.224646799147E-16,0.));
+#942 = DIRECTION('',(-2.22044604925E-16,-1.,0.));
 #943 = PCURVE('',#440,#944);
 #944 = DEFINITIONAL_REPRESENTATION('',(#945),#949);
 #945 = LINE('',#946,#947);
@@ -1189,13 +1190,13 @@ PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
 8.377580409573),.UNSPECIFIED.) CURVE() GEOMETRIC_REPRESENTATION_ITEM() 
 RATIONAL_B_SPLINE_CURVE((1.,0.5,1.,0.5,1.,0.5,1.)) REPRESENTATION_ITEM(
   '') );
-#953 = CARTESIAN_POINT('',(7.95,-5.776028047023));
-#954 = CARTESIAN_POINT('',(7.95,-6.468848370051));
-#955 = CARTESIAN_POINT('',(7.35,-6.122438208537));
-#956 = CARTESIAN_POINT('',(6.75,-5.776028047023));
-#957 = CARTESIAN_POINT('',(7.35,-5.42961788551));
-#958 = CARTESIAN_POINT('',(7.95,-5.083207723996));
-#959 = CARTESIAN_POINT('',(7.95,-5.776028047023));
+#953 = CARTESIAN_POINT('',(2.223815887868,-2.2));
+#954 = CARTESIAN_POINT('',(1.530995564841,-2.2));
+#955 = CARTESIAN_POINT('',(1.877405726354,-1.6));
+#956 = CARTESIAN_POINT('',(2.223815887868,-1.));
+#957 = CARTESIAN_POINT('',(2.570226049382,-1.6));
+#958 = CARTESIAN_POINT('',(2.916636210896,-2.2));
+#959 = CARTESIAN_POINT('',(2.223815887868,-2.2));
 #960 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) 
 PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
   ) );
@@ -1207,10 +1208,10 @@ PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
 #966 = ORIENTED_EDGE('',*,*,#967,.T.);
 #967 = EDGE_CURVE('',#455,#968,#970,.T.);
 #968 = VERTEX_POINT('',#969);
-#969 = CARTESIAN_POINT('',(5.776028047023,-2.2,0.));
+#969 = CARTESIAN_POINT('',(1.4,-7.126184112132,0.));
 #970 = SEAM_CURVE('',#971,(#975,#982),.PCURVE_S1.);
 #971 = LINE('',#972,#973);
-#972 = CARTESIAN_POINT('',(5.776028047023,-2.2,1.5));
+#972 = CARTESIAN_POINT('',(1.4,-7.126184112132,1.5));
 #973 = VECTOR('',#974,1.);
 #974 = DIRECTION('',(0.,0.,-1.));
 #975 = PCURVE('',#475,#976);
@@ -1236,9 +1237,9 @@ PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
 #991 = SURFACE_CURVE('',#992,(#997,#1004),.PCURVE_S1.);
 #992 = CIRCLE('',#993,0.4);
 #993 = AXIS2_PLACEMENT_3D('',#994,#995,#996);
-#994 = CARTESIAN_POINT('',(5.776028047023,-1.8,0.));
+#994 = CARTESIAN_POINT('',(1.8,-7.126184112132,0.));
 #995 = DIRECTION('',(0.,0.,1.));
-#996 = DIRECTION('',(-2.22044604925E-16,-1.,0.));
+#996 = DIRECTION('',(-1.,1.224646799147E-16,0.));
 #997 = PCURVE('',#475,#998);
 #998 = DEFINITIONAL_REPRESENTATION('',(#999),#1003);
 #999 = LINE('',#1000,#1001);
@@ -1251,18 +1252,18 @@ PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
 #1004 = PCURVE('',#569,#1005);
 #1005 = DEFINITIONAL_REPRESENTATION('',(#1006),#1014);
 #1006 = ( BOUNDED_CURVE() B_SPLINE_CURVE(2,(#1007,#1008,#1009,#1010,
-#1011,#1012,#1013),.UNSPECIFIED.,.F.,.F.) B_SPLINE_CURVE_WITH_KNOTS((1,2
+#1011,#1012,#1013),.UNSPECIFIED.,.T.,.F.) B_SPLINE_CURVE_WITH_KNOTS((1,2
     ,2,2,2,1),(-2.094395102393,0.,2.094395102393,4.188790204786,
 6.28318530718,8.377580409573),.UNSPECIFIED.) CURVE() 
 GEOMETRIC_REPRESENTATION_ITEM() RATIONAL_B_SPLINE_CURVE((1.,0.5,1.,0.5,
 1.,0.5,1.)) REPRESENTATION_ITEM('') );
-#1007 = CARTESIAN_POINT('',(3.573971952977,-2.2));
-#1008 = CARTESIAN_POINT('',(2.881151629949,-2.2));
-#1009 = CARTESIAN_POINT('',(3.227561791463,-1.6));
-#1010 = CARTESIAN_POINT('',(3.573971952977,-1.));
-#1011 = CARTESIAN_POINT('',(3.92038211449,-1.6));
-#1012 = CARTESIAN_POINT('',(4.266792276004,-2.2));
-#1013 = CARTESIAN_POINT('',(3.573971952977,-2.2));
+#1007 = CARTESIAN_POINT('',(7.95,-7.126184112132));
+#1008 = CARTESIAN_POINT('',(7.95,-7.819004435159));
+#1009 = CARTESIAN_POINT('',(7.35,-7.472594273646));
+#1010 = CARTESIAN_POINT('',(6.75,-7.126184112132));
+#1011 = CARTESIAN_POINT('',(7.35,-6.779773950618));
+#1012 = CARTESIAN_POINT('',(7.95,-6.433363789104));
+#1013 = CARTESIAN_POINT('',(7.95,-7.126184112132));
 #1014 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) 
 PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
   ) );
@@ -1385,13 +1386,13 @@ PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
 #1116 = ORIENTED_EDGE('',*,*,#882,.T.);
 #1117 = FACE_BOUND('',#1118,.T.);
 #1118 = EDGE_LOOP('',(#1119));
-#1119 = ORIENTED_EDGE('',*,*,#990,.T.);
+#1119 = ORIENTED_EDGE('',*,*,#936,.T.);
 #1120 = FACE_BOUND('',#1121,.T.);
 #1121 = EDGE_LOOP('',(#1122));
 #1122 = ORIENTED_EDGE('',*,*,#828,.T.);
 #1123 = FACE_BOUND('',#1124,.T.);
 #1124 = EDGE_LOOP('',(#1125));
-#1125 = ORIENTED_EDGE('',*,*,#936,.T.);
+#1125 = ORIENTED_EDGE('',*,*,#990,.T.);
 #1126 = FACE_BOUND('',#1127,.T.);
 #1127 = EDGE_LOOP('',(#1128));
 #1128 = ORIENTED_EDGE('',*,*,#774,.T.);
@@ -1539,155 +1540,260 @@ GEOMETRIC_REPRESENTATION_ITEM() RATIONAL_B_SPLINE_CURVE((1.,0.5,1.,0.5,
 PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
   ) );
 #1246 = ORIENTED_EDGE('',*,*,#1193,.F.);
-#1247 = ADVANCED_FACE('',(#1248),#1173,.F.);
-#1248 = FACE_BOUND('',#1249,.T.);
+#1247 = ADVANCED_FACE('',(#1248,#1251),#1173,.F.);
+#1248 = FACE_BOUND('',#1249,.F.);
 #1249 = EDGE_LOOP('',(#1250));
-#1250 = ORIENTED_EDGE('',*,*,#1158,.T.);
-#1251 = ADVANCED_FACE('',(#1252,#1255),#1231,.F.);
-#1252 = FACE_BOUND('',#1253,.F.);
-#1253 = EDGE_LOOP('',(#1254));
-#1254 = ORIENTED_EDGE('',*,*,#1216,.F.);
-#1255 = FACE_BOUND('',#1256,.F.);
-#1256 = EDGE_LOOP('',(#1257));
-#1257 = ORIENTED_EDGE('',*,*,#1258,.T.);
-#1258 = EDGE_CURVE('',#1259,#1259,#1261,.T.);
-#1259 = VERTEX_POINT('',#1260);
-#1260 = CARTESIAN_POINT('',(1.7,0.,-1.7));
-#1261 = SURFACE_CURVE('',#1262,(#1267,#1278),.PCURVE_S1.);
-#1262 = CIRCLE('',#1263,1.7);
-#1263 = AXIS2_PLACEMENT_3D('',#1264,#1265,#1266);
-#1264 = CARTESIAN_POINT('',(0.,0.,-1.7));
-#1265 = DIRECTION('',(0.,0.,-1.));
-#1266 = DIRECTION('',(1.,0.,0.));
-#1267 = PCURVE('',#1231,#1268);
-#1268 = DEFINITIONAL_REPRESENTATION('',(#1269),#1277);
-#1269 = ( BOUNDED_CURVE() B_SPLINE_CURVE(2,(#1270,#1271,#1272,#1273,
-#1274,#1275,#1276),.UNSPECIFIED.,.T.,.F.) B_SPLINE_CURVE_WITH_KNOTS((1,2
+#1250 = ORIENTED_EDGE('',*,*,#1158,.F.);
+#1251 = FACE_BOUND('',#1252,.F.);
+#1252 = EDGE_LOOP('',(#1253));
+#1253 = ORIENTED_EDGE('',*,*,#1254,.T.);
+#1254 = EDGE_CURVE('',#1255,#1255,#1257,.T.);
+#1255 = VERTEX_POINT('',#1256);
+#1256 = CARTESIAN_POINT('',(0.85,0.,1.3));
+#1257 = SURFACE_CURVE('',#1258,(#1263,#1274),.PCURVE_S1.);
+#1258 = CIRCLE('',#1259,0.85);
+#1259 = AXIS2_PLACEMENT_3D('',#1260,#1261,#1262);
+#1260 = CARTESIAN_POINT('',(0.,0.,1.3));
+#1261 = DIRECTION('',(0.,0.,1.));
+#1262 = DIRECTION('',(1.,0.,0.));
+#1263 = PCURVE('',#1173,#1264);
+#1264 = DEFINITIONAL_REPRESENTATION('',(#1265),#1273);
+#1265 = ( BOUNDED_CURVE() B_SPLINE_CURVE(2,(#1266,#1267,#1268,#1269,
+#1270,#1271,#1272),.UNSPECIFIED.,.F.,.F.) B_SPLINE_CURVE_WITH_KNOTS((1,2
     ,2,2,2,1),(-2.094395102393,0.,2.094395102393,4.188790204786,
 6.28318530718,8.377580409573),.UNSPECIFIED.) CURVE() 
 GEOMETRIC_REPRESENTATION_ITEM() RATIONAL_B_SPLINE_CURVE((1.,0.5,1.,0.5,
 1.,0.5,1.)) REPRESENTATION_ITEM('') );
-#1270 = CARTESIAN_POINT('',(-1.2,0.));
-#1271 = CARTESIAN_POINT('',(-1.2,-2.944486372867));
-#1272 = CARTESIAN_POINT('',(-3.75,-1.472243186434));
-#1273 = CARTESIAN_POINT('',(-6.3,-4.163799117101E-16));
-#1274 = CARTESIAN_POINT('',(-3.75,1.472243186434));
-#1275 = CARTESIAN_POINT('',(-1.2,2.944486372867));
-#1276 = CARTESIAN_POINT('',(-1.2,0.));
-#1277 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) 
+#1266 = CARTESIAN_POINT('',(0.95,0.));
+#1267 = CARTESIAN_POINT('',(0.95,1.472243186434));
+#1268 = CARTESIAN_POINT('',(2.225,0.736121593217));
+#1269 = CARTESIAN_POINT('',(3.5,2.081899558551E-16));
+#1270 = CARTESIAN_POINT('',(2.225,-0.736121593217));
+#1271 = CARTESIAN_POINT('',(0.95,-1.472243186434));
+#1272 = CARTESIAN_POINT('',(0.95,0.));
+#1273 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) 
 PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
   ) );
-#1278 = PCURVE('',#1279,#1284);
-#1279 = CYLINDRICAL_SURFACE('',#1280,1.7);
-#1280 = AXIS2_PLACEMENT_3D('',#1281,#1282,#1283);
-#1281 = CARTESIAN_POINT('',(0.,0.,-1.7));
-#1282 = DIRECTION('',(0.,0.,-1.));
-#1283 = DIRECTION('',(1.,0.,0.));
-#1284 = DEFINITIONAL_REPRESENTATION('',(#1285),#1289);
-#1285 = LINE('',#1286,#1287);
-#1286 = CARTESIAN_POINT('',(0.,0.));
-#1287 = VECTOR('',#1288,1.);
-#1288 = DIRECTION('',(1.,0.));
-#1289 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) 
+#1274 = PCURVE('',#1275,#1280);
+#1275 = CYLINDRICAL_SURFACE('',#1276,0.85);
+#1276 = AXIS2_PLACEMENT_3D('',#1277,#1278,#1279);
+#1277 = CARTESIAN_POINT('',(0.,0.,1.3));
+#1278 = DIRECTION('',(0.,0.,1.));
+#1279 = DIRECTION('',(1.,0.,0.));
+#1280 = DEFINITIONAL_REPRESENTATION('',(#1281),#1285);
+#1281 = LINE('',#1282,#1283);
+#1282 = CARTESIAN_POINT('',(0.,0.));
+#1283 = VECTOR('',#1284,1.);
+#1284 = DIRECTION('',(1.,0.));
+#1285 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) 
 PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
   ) );
-#1290 = ADVANCED_FACE('',(#1291),#1279,.F.);
-#1291 = FACE_BOUND('',#1292,.F.);
-#1292 = EDGE_LOOP('',(#1293,#1294,#1317,#1348));
-#1293 = ORIENTED_EDGE('',*,*,#1258,.F.);
-#1294 = ORIENTED_EDGE('',*,*,#1295,.T.);
-#1295 = EDGE_CURVE('',#1259,#1296,#1298,.T.);
-#1296 = VERTEX_POINT('',#1297);
-#1297 = CARTESIAN_POINT('',(1.7,0.,0.9));
-#1298 = SEAM_CURVE('',#1299,(#1303,#1310),.PCURVE_S1.);
-#1299 = LINE('',#1300,#1301);
-#1300 = CARTESIAN_POINT('',(1.7,0.,-1.7));
-#1301 = VECTOR('',#1302,1.);
-#1302 = DIRECTION('',(0.,0.,1.));
-#1303 = PCURVE('',#1279,#1304);
-#1304 = DEFINITIONAL_REPRESENTATION('',(#1305),#1309);
-#1305 = LINE('',#1306,#1307);
-#1306 = CARTESIAN_POINT('',(6.28318530718,0.));
-#1307 = VECTOR('',#1308,1.);
-#1308 = DIRECTION('',(0.,-1.));
-#1309 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) 
-PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
-  ) );
-#1310 = PCURVE('',#1279,#1311);
-#1311 = DEFINITIONAL_REPRESENTATION('',(#1312),#1316);
-#1312 = LINE('',#1313,#1314);
-#1313 = CARTESIAN_POINT('',(0.,0.));
-#1314 = VECTOR('',#1315,1.);
-#1315 = DIRECTION('',(0.,-1.));
-#1316 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) 
-PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
-  ) );
-#1317 = ORIENTED_EDGE('',*,*,#1318,.T.);
-#1318 = EDGE_CURVE('',#1296,#1296,#1319,.T.);
-#1319 = SURFACE_CURVE('',#1320,(#1325,#1332),.PCURVE_S1.);
-#1320 = CIRCLE('',#1321,1.7);
-#1321 = AXIS2_PLACEMENT_3D('',#1322,#1323,#1324);
-#1322 = CARTESIAN_POINT('',(0.,0.,0.9));
-#1323 = DIRECTION('',(0.,0.,-1.));
-#1324 = DIRECTION('',(1.,0.,0.));
-#1325 = PCURVE('',#1279,#1326);
-#1326 = DEFINITIONAL_REPRESENTATION('',(#1327),#1331);
-#1327 = LINE('',#1328,#1329);
-#1328 = CARTESIAN_POINT('',(0.,-2.6));
-#1329 = VECTOR('',#1330,1.);
-#1330 = DIRECTION('',(1.,0.));
-#1331 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) 
-PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
-  ) );
-#1332 = PCURVE('',#1333,#1338);
-#1333 = PLANE('',#1334);
-#1334 = AXIS2_PLACEMENT_3D('',#1335,#1336,#1337);
-#1335 = CARTESIAN_POINT('',(1.7,0.,0.9));
-#1336 = DIRECTION('',(0.,0.,1.));
-#1337 = DIRECTION('',(1.,0.,0.));
-#1338 = DEFINITIONAL_REPRESENTATION('',(#1339),#1347);
-#1339 = ( BOUNDED_CURVE() B_SPLINE_CURVE(2,(#1340,#1341,#1342,#1343,
-#1344,#1345,#1346),.UNSPECIFIED.,.F.,.F.) B_SPLINE_CURVE_WITH_KNOTS((1,2
+#1286 = ADVANCED_FACE('',(#1287,#1290),#1231,.F.);
+#1287 = FACE_BOUND('',#1288,.F.);
+#1288 = EDGE_LOOP('',(#1289));
+#1289 = ORIENTED_EDGE('',*,*,#1216,.F.);
+#1290 = FACE_BOUND('',#1291,.F.);
+#1291 = EDGE_LOOP('',(#1292));
+#1292 = ORIENTED_EDGE('',*,*,#1293,.T.);
+#1293 = EDGE_CURVE('',#1294,#1294,#1296,.T.);
+#1294 = VERTEX_POINT('',#1295);
+#1295 = CARTESIAN_POINT('',(1.7,0.,-1.7));
+#1296 = SURFACE_CURVE('',#1297,(#1302,#1313),.PCURVE_S1.);
+#1297 = CIRCLE('',#1298,1.7);
+#1298 = AXIS2_PLACEMENT_3D('',#1299,#1300,#1301);
+#1299 = CARTESIAN_POINT('',(0.,0.,-1.7));
+#1300 = DIRECTION('',(0.,0.,-1.));
+#1301 = DIRECTION('',(1.,0.,0.));
+#1302 = PCURVE('',#1231,#1303);
+#1303 = DEFINITIONAL_REPRESENTATION('',(#1304),#1312);
+#1304 = ( BOUNDED_CURVE() B_SPLINE_CURVE(2,(#1305,#1306,#1307,#1308,
+#1309,#1310,#1311),.UNSPECIFIED.,.T.,.F.) B_SPLINE_CURVE_WITH_KNOTS((1,2
     ,2,2,2,1),(-2.094395102393,0.,2.094395102393,4.188790204786,
 6.28318530718,8.377580409573),.UNSPECIFIED.) CURVE() 
 GEOMETRIC_REPRESENTATION_ITEM() RATIONAL_B_SPLINE_CURVE((1.,0.5,1.,0.5,
 1.,0.5,1.)) REPRESENTATION_ITEM('') );
-#1340 = CARTESIAN_POINT('',(0.,0.));
-#1341 = CARTESIAN_POINT('',(0.,-2.944486372867));
-#1342 = CARTESIAN_POINT('',(-2.55,-1.472243186434));
-#1343 = CARTESIAN_POINT('',(-5.1,-4.163799117101E-16));
-#1344 = CARTESIAN_POINT('',(-2.55,1.472243186434));
-#1345 = CARTESIAN_POINT('',(-2.6645352591E-15,2.944486372867));
-#1346 = CARTESIAN_POINT('',(0.,0.));
-#1347 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) 
+#1305 = CARTESIAN_POINT('',(-1.2,0.));
+#1306 = CARTESIAN_POINT('',(-1.2,-2.944486372867));
+#1307 = CARTESIAN_POINT('',(-3.75,-1.472243186434));
+#1308 = CARTESIAN_POINT('',(-6.3,-4.163799117101E-16));
+#1309 = CARTESIAN_POINT('',(-3.75,1.472243186434));
+#1310 = CARTESIAN_POINT('',(-1.2,2.944486372867));
+#1311 = CARTESIAN_POINT('',(-1.2,0.));
+#1312 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) 
 PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
   ) );
-#1348 = ORIENTED_EDGE('',*,*,#1295,.F.);
-#1349 = ADVANCED_FACE('',(#1350),#1333,.F.);
-#1350 = FACE_BOUND('',#1351,.T.);
-#1351 = EDGE_LOOP('',(#1352));
-#1352 = ORIENTED_EDGE('',*,*,#1318,.T.);
-#1353 = ( GEOMETRIC_REPRESENTATION_CONTEXT(3) 
-GLOBAL_UNCERTAINTY_ASSIGNED_CONTEXT((#1357)) 
-GLOBAL_UNIT_ASSIGNED_CONTEXT((#1354,#1355,#1356)) REPRESENTATION_CONTEXT
+#1313 = PCURVE('',#1314,#1319);
+#1314 = CYLINDRICAL_SURFACE('',#1315,1.7);
+#1315 = AXIS2_PLACEMENT_3D('',#1316,#1317,#1318);
+#1316 = CARTESIAN_POINT('',(0.,0.,-1.7));
+#1317 = DIRECTION('',(0.,0.,-1.));
+#1318 = DIRECTION('',(1.,0.,0.));
+#1319 = DEFINITIONAL_REPRESENTATION('',(#1320),#1324);
+#1320 = LINE('',#1321,#1322);
+#1321 = CARTESIAN_POINT('',(0.,0.));
+#1322 = VECTOR('',#1323,1.);
+#1323 = DIRECTION('',(1.,0.));
+#1324 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) 
+PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
+  ) );
+#1325 = ADVANCED_FACE('',(#1326),#1275,.F.);
+#1326 = FACE_BOUND('',#1327,.F.);
+#1327 = EDGE_LOOP('',(#1328,#1329,#1352,#1379));
+#1328 = ORIENTED_EDGE('',*,*,#1254,.F.);
+#1329 = ORIENTED_EDGE('',*,*,#1330,.T.);
+#1330 = EDGE_CURVE('',#1255,#1331,#1333,.T.);
+#1331 = VERTEX_POINT('',#1332);
+#1332 = CARTESIAN_POINT('',(0.85,0.,0.9));
+#1333 = SEAM_CURVE('',#1334,(#1338,#1345),.PCURVE_S1.);
+#1334 = LINE('',#1335,#1336);
+#1335 = CARTESIAN_POINT('',(0.85,0.,1.3));
+#1336 = VECTOR('',#1337,1.);
+#1337 = DIRECTION('',(-0.,-0.,-1.));
+#1338 = PCURVE('',#1275,#1339);
+#1339 = DEFINITIONAL_REPRESENTATION('',(#1340),#1344);
+#1340 = LINE('',#1341,#1342);
+#1341 = CARTESIAN_POINT('',(6.28318530718,0.));
+#1342 = VECTOR('',#1343,1.);
+#1343 = DIRECTION('',(0.,-1.));
+#1344 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) 
+PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
+  ) );
+#1345 = PCURVE('',#1275,#1346);
+#1346 = DEFINITIONAL_REPRESENTATION('',(#1347),#1351);
+#1347 = LINE('',#1348,#1349);
+#1348 = CARTESIAN_POINT('',(0.,0.));
+#1349 = VECTOR('',#1350,1.);
+#1350 = DIRECTION('',(0.,-1.));
+#1351 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) 
+PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
+  ) );
+#1352 = ORIENTED_EDGE('',*,*,#1353,.T.);
+#1353 = EDGE_CURVE('',#1331,#1331,#1354,.T.);
+#1354 = SURFACE_CURVE('',#1355,(#1360,#1367),.PCURVE_S1.);
+#1355 = CIRCLE('',#1356,0.85);
+#1356 = AXIS2_PLACEMENT_3D('',#1357,#1358,#1359);
+#1357 = CARTESIAN_POINT('',(0.,0.,0.9));
+#1358 = DIRECTION('',(0.,0.,1.));
+#1359 = DIRECTION('',(1.,0.,0.));
+#1360 = PCURVE('',#1275,#1361);
+#1361 = DEFINITIONAL_REPRESENTATION('',(#1362),#1366);
+#1362 = LINE('',#1363,#1364);
+#1363 = CARTESIAN_POINT('',(0.,-0.4));
+#1364 = VECTOR('',#1365,1.);
+#1365 = DIRECTION('',(1.,0.));
+#1366 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) 
+PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
+  ) );
+#1367 = PCURVE('',#1368,#1373);
+#1368 = PLANE('',#1369);
+#1369 = AXIS2_PLACEMENT_3D('',#1370,#1371,#1372);
+#1370 = CARTESIAN_POINT('',(1.7,0.,0.9));
+#1371 = DIRECTION('',(0.,0.,1.));
+#1372 = DIRECTION('',(1.,0.,0.));
+#1373 = DEFINITIONAL_REPRESENTATION('',(#1374),#1378);
+#1374 = CIRCLE('',#1375,0.85);
+#1375 = AXIS2_PLACEMENT_2D('',#1376,#1377);
+#1376 = CARTESIAN_POINT('',(-1.7,0.));
+#1377 = DIRECTION('',(1.,0.));
+#1378 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) 
+PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
+  ) );
+#1379 = ORIENTED_EDGE('',*,*,#1330,.F.);
+#1380 = ADVANCED_FACE('',(#1381),#1314,.F.);
+#1381 = FACE_BOUND('',#1382,.F.);
+#1382 = EDGE_LOOP('',(#1383,#1384,#1407,#1433));
+#1383 = ORIENTED_EDGE('',*,*,#1293,.F.);
+#1384 = ORIENTED_EDGE('',*,*,#1385,.T.);
+#1385 = EDGE_CURVE('',#1294,#1386,#1388,.T.);
+#1386 = VERTEX_POINT('',#1387);
+#1387 = CARTESIAN_POINT('',(1.7,0.,0.9));
+#1388 = SEAM_CURVE('',#1389,(#1393,#1400),.PCURVE_S1.);
+#1389 = LINE('',#1390,#1391);
+#1390 = CARTESIAN_POINT('',(1.7,0.,-1.7));
+#1391 = VECTOR('',#1392,1.);
+#1392 = DIRECTION('',(0.,0.,1.));
+#1393 = PCURVE('',#1314,#1394);
+#1394 = DEFINITIONAL_REPRESENTATION('',(#1395),#1399);
+#1395 = LINE('',#1396,#1397);
+#1396 = CARTESIAN_POINT('',(6.28318530718,0.));
+#1397 = VECTOR('',#1398,1.);
+#1398 = DIRECTION('',(0.,-1.));
+#1399 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) 
+PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
+  ) );
+#1400 = PCURVE('',#1314,#1401);
+#1401 = DEFINITIONAL_REPRESENTATION('',(#1402),#1406);
+#1402 = LINE('',#1403,#1404);
+#1403 = CARTESIAN_POINT('',(0.,0.));
+#1404 = VECTOR('',#1405,1.);
+#1405 = DIRECTION('',(0.,-1.));
+#1406 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) 
+PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
+  ) );
+#1407 = ORIENTED_EDGE('',*,*,#1408,.T.);
+#1408 = EDGE_CURVE('',#1386,#1386,#1409,.T.);
+#1409 = SURFACE_CURVE('',#1410,(#1415,#1422),.PCURVE_S1.);
+#1410 = CIRCLE('',#1411,1.7);
+#1411 = AXIS2_PLACEMENT_3D('',#1412,#1413,#1414);
+#1412 = CARTESIAN_POINT('',(0.,0.,0.9));
+#1413 = DIRECTION('',(0.,0.,-1.));
+#1414 = DIRECTION('',(1.,0.,0.));
+#1415 = PCURVE('',#1314,#1416);
+#1416 = DEFINITIONAL_REPRESENTATION('',(#1417),#1421);
+#1417 = LINE('',#1418,#1419);
+#1418 = CARTESIAN_POINT('',(0.,-2.6));
+#1419 = VECTOR('',#1420,1.);
+#1420 = DIRECTION('',(1.,0.));
+#1421 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) 
+PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
+  ) );
+#1422 = PCURVE('',#1368,#1423);
+#1423 = DEFINITIONAL_REPRESENTATION('',(#1424),#1432);
+#1424 = ( BOUNDED_CURVE() B_SPLINE_CURVE(2,(#1425,#1426,#1427,#1428,
+#1429,#1430,#1431),.UNSPECIFIED.,.F.,.F.) B_SPLINE_CURVE_WITH_KNOTS((1,2
+    ,2,2,2,1),(-2.094395102393,0.,2.094395102393,4.188790204786,
+6.28318530718,8.377580409573),.UNSPECIFIED.) CURVE() 
+GEOMETRIC_REPRESENTATION_ITEM() RATIONAL_B_SPLINE_CURVE((1.,0.5,1.,0.5,
+1.,0.5,1.)) REPRESENTATION_ITEM('') );
+#1425 = CARTESIAN_POINT('',(0.,0.));
+#1426 = CARTESIAN_POINT('',(0.,-2.944486372867));
+#1427 = CARTESIAN_POINT('',(-2.55,-1.472243186434));
+#1428 = CARTESIAN_POINT('',(-5.1,-4.163799117101E-16));
+#1429 = CARTESIAN_POINT('',(-2.55,1.472243186434));
+#1430 = CARTESIAN_POINT('',(-2.6645352591E-15,2.944486372867));
+#1431 = CARTESIAN_POINT('',(0.,0.));
+#1432 = ( GEOMETRIC_REPRESENTATION_CONTEXT(2) 
+PARAMETRIC_REPRESENTATION_CONTEXT() REPRESENTATION_CONTEXT('2D SPACE',''
+  ) );
+#1433 = ORIENTED_EDGE('',*,*,#1385,.F.);
+#1434 = ADVANCED_FACE('',(#1435,#1438),#1368,.F.);
+#1435 = FACE_BOUND('',#1436,.F.);
+#1436 = EDGE_LOOP('',(#1437));
+#1437 = ORIENTED_EDGE('',*,*,#1408,.F.);
+#1438 = FACE_BOUND('',#1439,.F.);
+#1439 = EDGE_LOOP('',(#1440));
+#1440 = ORIENTED_EDGE('',*,*,#1353,.F.);
+#1441 = ( GEOMETRIC_REPRESENTATION_CONTEXT(3) 
+GLOBAL_UNCERTAINTY_ASSIGNED_CONTEXT((#1445)) 
+GLOBAL_UNIT_ASSIGNED_CONTEXT((#1442,#1443,#1444)) REPRESENTATION_CONTEXT
 ('Context #1','3D Context with UNIT and UNCERTAINTY') );
-#1354 = ( LENGTH_UNIT() NAMED_UNIT(*) SI_UNIT(.MILLI.,.METRE.) );
-#1355 = ( NAMED_UNIT(*) PLANE_ANGLE_UNIT() SI_UNIT($,.RADIAN.) );
-#1356 = ( NAMED_UNIT(*) SI_UNIT($,.STERADIAN.) SOLID_ANGLE_UNIT() );
-#1357 = UNCERTAINTY_MEASURE_WITH_UNIT(LENGTH_MEASURE(1.E-07),#1354,
+#1442 = ( LENGTH_UNIT() NAMED_UNIT(*) SI_UNIT(.MILLI.,.METRE.) );
+#1443 = ( NAMED_UNIT(*) PLANE_ANGLE_UNIT() SI_UNIT($,.RADIAN.) );
+#1444 = ( NAMED_UNIT(*) SI_UNIT($,.STERADIAN.) SOLID_ANGLE_UNIT() );
+#1445 = UNCERTAINTY_MEASURE_WITH_UNIT(LENGTH_MEASURE(1.E-07),#1442,
   'distance_accuracy_value','confusion accuracy');
-#1358 = PRODUCT_TYPE('part',$,(#7));
-#1359 = MECHANICAL_DESIGN_GEOMETRIC_PRESENTATION_REPRESENTATION('',(
-    #1360),#1353);
-#1360 = STYLED_ITEM('color',(#1361),#15);
-#1361 = PRESENTATION_STYLE_ASSIGNMENT((#1362,#1368));
-#1362 = SURFACE_STYLE_USAGE(.BOTH.,#1363);
-#1363 = SURFACE_SIDE_STYLE('',(#1364));
-#1364 = SURFACE_STYLE_FILL_AREA(#1365);
-#1365 = FILL_AREA_STYLE('',(#1366));
-#1366 = FILL_AREA_STYLE_COLOUR('',#1367);
-#1367 = COLOUR_RGB('',0.800000011921,0.800000011921,0.800000011921);
-#1368 = CURVE_STYLE('',#1369,POSITIVE_LENGTH_MEASURE(0.1),#1367);
-#1369 = DRAUGHTING_PRE_DEFINED_CURVE_FONT('continuous');
+#1446 = PRODUCT_TYPE('part',$,(#7));
+#1447 = MECHANICAL_DESIGN_GEOMETRIC_PRESENTATION_REPRESENTATION('',(
+    #1448),#1441);
+#1448 = STYLED_ITEM('color',(#1449),#15);
+#1449 = PRESENTATION_STYLE_ASSIGNMENT((#1450,#1456));
+#1450 = SURFACE_STYLE_USAGE(.BOTH.,#1451);
+#1451 = SURFACE_SIDE_STYLE('',(#1452));
+#1452 = SURFACE_STYLE_FILL_AREA(#1453);
+#1453 = FILL_AREA_STYLE('',(#1454));
+#1454 = FILL_AREA_STYLE_COLOUR('',#1455);
+#1455 = COLOUR_RGB('',0.800000011921,0.800000011921,0.800000011921);
+#1456 = CURVE_STYLE('',#1457,POSITIVE_LENGTH_MEASURE(0.1),#1455);
+#1457 = DRAUGHTING_PRE_DEFINED_CURVE_FONT('continuous');
 ENDSEC;
 END-ISO-10303-21;
diff --git a/Electrical Parts/Servos/Emax-ES08A/servo-rounded-horn.stl b/Electrical Parts/Servos/Emax-ES08A/servo-rounded-horn.stl
index 91286a59..c0884ba8 100644
Binary files a/Electrical Parts/Servos/Emax-ES08A/servo-rounded-horn.stl and b/Electrical Parts/Servos/Emax-ES08A/servo-rounded-horn.stl differ