diff --git a/bldc-controller-rev1.zip b/bldc-controller-rev1.zip
new file mode 100644
index 0000000..a6fe382
Binary files /dev/null and b/bldc-controller-rev1.zip differ
diff --git a/bldc-controller.kicad_pcb b/bldc-controller.kicad_pcb
index 626291c..005b434 100644
--- a/bldc-controller.kicad_pcb
+++ b/bldc-controller.kicad_pcb
@@ -72,7 +72,7 @@
     (pcbplotparams
       (layerselection 0x310fc_ffffffff)
       (usegerberextensions true)
-      (usegerberattributes true)
+      (usegerberattributes false)
       (usegerberadvancedattributes false)
       (creategerberjobfile false)
       (excludeedgelayer true)
@@ -7574,7 +7574,7 @@
   (segment (start 22.413514 120.05) (end 19.749999 117.386485) (width 0.254) (layer B.Cu) (net 91))
   (segment (start 23.55 120.05) (end 22.413514 120.05) (width 0.254) (layer B.Cu) (net 91))
 
-  (zone (net 2) (net_name /VDRAIN) (layer F.Cu) (tstamp 5DFC9E31) (hatch edge 0.508)
+  (zone (net 2) (net_name /VDRAIN) (layer F.Cu) (tstamp 5DFC615E) (hatch edge 0.508)
     (priority 4)
     (connect_pads yes (clearance 0.254))
     (min_thickness 0.254)
@@ -7597,7 +7597,7 @@
       )
     )
   )
-  (zone (net 84) (net_name /VSOURCE) (layer F.Cu) (tstamp 5DFC9E2E) (hatch edge 0.508)
+  (zone (net 84) (net_name /VSOURCE) (layer F.Cu) (tstamp 5DFC615B) (hatch edge 0.508)
     (priority 5)
     (connect_pads yes (clearance 0.254))
     (min_thickness 0.254)
@@ -7649,7 +7649,7 @@
       )
     )
   )
-  (zone (net 2) (net_name /VDRAIN) (layer F.Cu) (tstamp 5DFC9E2B) (hatch edge 0.508)
+  (zone (net 2) (net_name /VDRAIN) (layer F.Cu) (tstamp 5DFC6158) (hatch edge 0.508)
     (priority 4)
     (connect_pads yes (clearance 0.254))
     (min_thickness 0.254)
@@ -7669,7 +7669,7 @@
       )
     )
   )
-  (zone (net 2) (net_name /VDRAIN) (layer F.Cu) (tstamp 5DFC9E28) (hatch edge 0.508)
+  (zone (net 2) (net_name /VDRAIN) (layer F.Cu) (tstamp 5DFC6155) (hatch edge 0.508)
     (priority 3)
     (connect_pads yes (clearance 0.1524))
     (min_thickness 0.254)
@@ -7706,7 +7706,7 @@
       )
     )
   )
-  (zone (net 2) (net_name /VDRAIN) (layer B.Cu) (tstamp 5DFC9E25) (hatch edge 0.508)
+  (zone (net 2) (net_name /VDRAIN) (layer B.Cu) (tstamp 5DFC6152) (hatch edge 0.508)
     (priority 4)
     (connect_pads yes (clearance 0.254))
     (min_thickness 0.254)
@@ -7739,7 +7739,7 @@
       )
     )
   )
-  (zone (net 84) (net_name /VSOURCE) (layer F.Cu) (tstamp 5DFC9E22) (hatch edge 0.508)
+  (zone (net 84) (net_name /VSOURCE) (layer F.Cu) (tstamp 5DFC614F) (hatch edge 0.508)
     (priority 3)
     (connect_pads yes (clearance 0.254))
     (min_thickness 0.254)
@@ -7769,7 +7769,7 @@
       )
     )
   )
-  (zone (net 2) (net_name /VDRAIN) (layer B.Cu) (tstamp 5DFC9E1F) (hatch edge 0.508)
+  (zone (net 2) (net_name /VDRAIN) (layer B.Cu) (tstamp 5DFC614C) (hatch edge 0.508)
     (priority 4)
     (connect_pads yes (clearance 0.1524))
     (min_thickness 0.254)
@@ -7795,7 +7795,7 @@
       )
     )
   )
-  (zone (net 2) (net_name /VDRAIN) (layer B.Cu) (tstamp 5DFC9E1C) (hatch edge 0.508)
+  (zone (net 2) (net_name /VDRAIN) (layer B.Cu) (tstamp 5DFC6149) (hatch edge 0.508)
     (priority 4)
     (connect_pads yes (clearance 0.254))
     (min_thickness 0.254)
@@ -7814,7 +7814,7 @@
       )
     )
   )
-  (zone (net 84) (net_name /VSOURCE) (layer B.Cu) (tstamp 5DFC9E19) (hatch edge 0.508)
+  (zone (net 84) (net_name /VSOURCE) (layer B.Cu) (tstamp 5DFC6146) (hatch edge 0.508)
     (priority 3)
     (connect_pads yes (clearance 0.254))
     (min_thickness 0.254)
@@ -7862,7 +7862,7 @@
       )
     )
   )
-  (zone (net 28) (net_name /A) (layer F.Cu) (tstamp 5DFC9E16) (hatch edge 0.508)
+  (zone (net 28) (net_name /A) (layer F.Cu) (tstamp 5DFC6143) (hatch edge 0.508)
     (priority 2)
     (connect_pads yes (clearance 0.1524))
     (min_thickness 0.254)
@@ -7890,7 +7890,7 @@
       )
     )
   )
-  (zone (net 29) (net_name /B) (layer F.Cu) (tstamp 5DFC9E13) (hatch edge 0.508)
+  (zone (net 29) (net_name /B) (layer F.Cu) (tstamp 5DFC6140) (hatch edge 0.508)
     (priority 2)
     (connect_pads yes (clearance 0.254))
     (min_thickness 0.254)
@@ -7919,7 +7919,7 @@
       )
     )
   )
-  (zone (net 27) (net_name /C) (layer F.Cu) (tstamp 5DFC9E10) (hatch edge 0.508)
+  (zone (net 27) (net_name /C) (layer F.Cu) (tstamp 5DFC613D) (hatch edge 0.508)
     (priority 2)
     (connect_pads yes (clearance 0.1524))
     (min_thickness 0.254)
@@ -7944,7 +7944,7 @@
       )
     )
   )
-  (zone (net 1) (net_name GND) (layer F.Cu) (tstamp 5DFC9E0D) (hatch edge 0.508)
+  (zone (net 1) (net_name GND) (layer F.Cu) (tstamp 5DFC613A) (hatch edge 0.508)
     (connect_pads (clearance 0.1524))
     (min_thickness 0.254)
     (fill yes (arc_segments 32) (thermal_gap 0.508) (thermal_bridge_width 0.508))
@@ -9274,7 +9274,7 @@
       )
     )
   )
-  (zone (net 1) (net_name GND) (layer B.Cu) (tstamp 5DFC9E0A) (hatch edge 0.508)
+  (zone (net 1) (net_name GND) (layer B.Cu) (tstamp 5DFC6137) (hatch edge 0.508)
     (connect_pads (clearance 0.254))
     (min_thickness 0.254)
     (fill yes (arc_segments 32) (thermal_gap 0.508) (thermal_bridge_width 0.508))
@@ -9806,7 +9806,7 @@
       )
     )
   )
-  (zone (net 27) (net_name /C) (layer B.Cu) (tstamp 5DFC9E07) (hatch edge 0.508)
+  (zone (net 27) (net_name /C) (layer B.Cu) (tstamp 5DFC6134) (hatch edge 0.508)
     (connect_pads (clearance 0.254))
     (min_thickness 0.254)
     (fill yes (arc_segments 32) (thermal_gap 0.508) (thermal_bridge_width 0.508))
@@ -9823,7 +9823,7 @@
       )
     )
   )
-  (zone (net 29) (net_name /B) (layer B.Cu) (tstamp 5DFC9E04) (hatch edge 0.508)
+  (zone (net 29) (net_name /B) (layer B.Cu) (tstamp 5DFC6131) (hatch edge 0.508)
     (connect_pads (clearance 0.254))
     (min_thickness 0.254)
     (fill yes (arc_segments 32) (thermal_gap 0.508) (thermal_bridge_width 0.508))
@@ -9838,7 +9838,7 @@
       )
     )
   )
-  (zone (net 28) (net_name /A) (layer B.Cu) (tstamp 5DFC9E01) (hatch edge 0.508)
+  (zone (net 28) (net_name /A) (layer B.Cu) (tstamp 5DFC612E) (hatch edge 0.508)
     (connect_pads (clearance 0.254))
     (min_thickness 0.254)
     (fill yes (arc_segments 32) (thermal_gap 0.508) (thermal_bridge_width 0.508))
diff --git a/bldc-drivr-gerbers/bldc-controller-B_Cu.gbl b/bldc-drivr-gerbers/bldc-controller-B_Cu.gbl
index ee12593..e36d517 100644
--- a/bldc-drivr-gerbers/bldc-controller-B_Cu.gbl
+++ b/bldc-drivr-gerbers/bldc-controller-B_Cu.gbl
@@ -1,12 +1,12 @@
-%TF.GenerationSoftware,KiCad,Pcbnew,5.1.5-52549c5~84~ubuntu19.10.1*%
-%TF.CreationDate,2019-12-20T00:06:15-05:00*%
-%TF.ProjectId,bldc-controller,626c6463-2d63-46f6-9e74-726f6c6c6572,rev?*%
-%TF.SameCoordinates,Original*%
-%TF.FileFunction,Copper,L2,Bot*%
-%TF.FilePolarity,Positive*%
+G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.1.5-52549c5~84~ubuntu19.10.1*
+G04 #@! TF.CreationDate,2019-12-20T00:42:21-05:00*
+G04 #@! TF.ProjectId,bldc-controller,626c6463-2d63-46f6-9e74-726f6c6c6572,rev?*
+G04 #@! TF.SameCoordinates,Original*
+G04 #@! TF.FileFunction,Copper,L2,Bot*
+G04 #@! TF.FilePolarity,Positive*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.1.5-52549c5~84~ubuntu19.10.1) date 2019-12-20 00:06:15*
+G04 Created by KiCad (PCBNEW 5.1.5-52549c5~84~ubuntu19.10.1) date 2019-12-20 00:42:21*
 %MOMM*%
 %LPD*%
 G04 APERTURE LIST*
@@ -35,7 +35,7 @@ D12*
 X86750000Y-127860000D03*
 D13*
 X86750000Y-122860000D03*
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 D14*
 G36*
 X40761771Y-120239580D02*
@@ -109,8 +109,8 @@ X40718889Y-120239580D01*
 X40740330Y-120238527D01*
 X40761771Y-120239580D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X39648077Y-121353274D02*
 G01*
@@ -183,8 +183,8 @@ X39605195Y-121353274D01*
 X39626636Y-121352221D01*
 X39648077Y-121353274D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X50246958Y-143370710D02*
 G01*
@@ -257,8 +257,8 @@ X49887500Y-143370000D01*
 X50232500Y-143370000D01*
 X50246958Y-143370710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X50246958Y-144340710D02*
 G01*
@@ -331,8 +331,8 @@ X49887500Y-144340000D01*
 X50232500Y-144340000D01*
 X50246958Y-144340710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X49186958Y-143370710D02*
 G01*
@@ -405,8 +405,8 @@ X48827500Y-143370000D01*
 X49172500Y-143370000D01*
 X49186958Y-143370710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X49186958Y-144340710D02*
 G01*
@@ -479,8 +479,8 @@ X48827500Y-144340000D01*
 X49172500Y-144340000D01*
 X49186958Y-144340710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X47186958Y-144630710D02*
 G01*
@@ -553,8 +553,8 @@ X46877500Y-144630000D01*
 X47172500Y-144630000D01*
 X47186958Y-144630710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X48156958Y-144630710D02*
 G01*
@@ -627,7 +627,7 @@ X47847500Y-144630000D01*
 X48142500Y-144630000D01*
 X48156958Y-144630710D01*
 G37*
-%TD.AperFunction*%
+G04 #@! TD.AperFunction*
 D10*
 X42240000Y-106210000D03*
 X43510000Y-106210000D03*
@@ -650,7 +650,7 @@ X20320000Y-132430000D03*
 X20320000Y-129890000D03*
 D16*
 X20320000Y-127350000D03*
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 D14*
 G36*
 X39699189Y-118433989D02*
@@ -724,8 +724,8 @@ X39670273Y-118433989D01*
 X39684731Y-118433279D01*
 X39699189Y-118433989D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X40385083Y-119119883D02*
 G01*
@@ -798,8 +798,8 @@ X40356167Y-119119883D01*
 X40370625Y-119119173D01*
 X40385083Y-119119883D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X40456242Y-117681042D02*
 G01*
@@ -872,8 +872,8 @@ X40427326Y-117681042D01*
 X40441784Y-117680332D01*
 X40456242Y-117681042D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X41142136Y-118366936D02*
 G01*
@@ -946,8 +946,8 @@ X41113220Y-118366936D01*
 X41127678Y-118366226D01*
 X41142136Y-118366936D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X38219189Y-119903989D02*
 G01*
@@ -1020,8 +1020,8 @@ X38190273Y-119903989D01*
 X38204731Y-119903279D01*
 X38219189Y-119903989D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X38905083Y-120589883D02*
 G01*
@@ -1094,8 +1094,8 @@ X38876167Y-120589883D01*
 X38890625Y-120589173D01*
 X38905083Y-120589883D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X38929189Y-119163989D02*
 G01*
@@ -1168,8 +1168,8 @@ X38900273Y-119163989D01*
 X38914731Y-119163279D01*
 X38929189Y-119163989D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X39615083Y-119849883D02*
 G01*
@@ -1242,8 +1242,8 @@ X39586167Y-119849883D01*
 X39600625Y-119849173D01*
 X39615083Y-119849883D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X39111652Y-123030121D02*
 G01*
@@ -1316,8 +1316,8 @@ X39068770Y-123030121D01*
 X39090211Y-123029068D01*
 X39111652Y-123030121D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X37997958Y-121916427D02*
 G01*
@@ -1390,8 +1390,8 @@ X37955076Y-121916427D01*
 X37976517Y-121915374D01*
 X37997958Y-121916427D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X33928077Y-122273274D02*
 G01*
@@ -1464,8 +1464,8 @@ X33885195Y-122273274D01*
 X33906636Y-122272221D01*
 X33928077Y-122273274D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X35041771Y-121159580D02*
 G01*
@@ -1538,8 +1538,8 @@ X34998889Y-121159580D01*
 X35020330Y-121158527D01*
 X35041771Y-121159580D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X36259727Y-119373989D02*
 G01*
@@ -1612,8 +1612,8 @@ X36230811Y-119373989D01*
 X36245269Y-119373279D01*
 X36259727Y-119373989D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X35573833Y-120059883D02*
 G01*
@@ -1686,8 +1686,8 @@ X35544917Y-120059883D01*
 X35559375Y-120059173D01*
 X35573833Y-120059883D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X36999727Y-120103989D02*
 G01*
@@ -1760,8 +1760,8 @@ X36970811Y-120103989D01*
 X36985269Y-120103279D01*
 X36999727Y-120103989D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X36313833Y-120789883D02*
 G01*
@@ -1834,8 +1834,8 @@ X36284917Y-120789883D01*
 X36299375Y-120789173D01*
 X36313833Y-120789883D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X47327691Y-141666053D02*
 G01*
@@ -1908,8 +1908,8 @@ X46793750Y-141665000D01*
 X47306250Y-141665000D01*
 X47327691Y-141666053D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X47327691Y-143241053D02*
 G01*
@@ -1982,7 +1982,7 @@ X46793750Y-143240000D01*
 X47306250Y-143240000D01*
 X47327691Y-143241053D01*
 G37*
-%TD.AperFunction*%
+G04 #@! TD.AperFunction*
 D12*
 X87120000Y-137620000D03*
 D13*
diff --git a/bldc-drivr-gerbers/bldc-controller-B_Fab.gbr b/bldc-drivr-gerbers/bldc-controller-B_Fab.gbr
index d9a06cc..b7c5493 100644
--- a/bldc-drivr-gerbers/bldc-controller-B_Fab.gbr
+++ b/bldc-drivr-gerbers/bldc-controller-B_Fab.gbr
@@ -1,11 +1,11 @@
-%TF.GenerationSoftware,KiCad,Pcbnew,5.1.5-52549c5~84~ubuntu19.10.1*%
-%TF.CreationDate,2019-12-20T00:06:15-05:00*%
-%TF.ProjectId,bldc-controller,626c6463-2d63-46f6-9e74-726f6c6c6572,rev?*%
-%TF.SameCoordinates,Original*%
-%TF.FileFunction,Other,Fab,Bot*%
+G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.1.5-52549c5~84~ubuntu19.10.1*
+G04 #@! TF.CreationDate,2019-12-20T00:42:21-05:00*
+G04 #@! TF.ProjectId,bldc-controller,626c6463-2d63-46f6-9e74-726f6c6c6572,rev?*
+G04 #@! TF.SameCoordinates,Original*
+G04 #@! TF.FileFunction,Other,Fab,Bot*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.1.5-52549c5~84~ubuntu19.10.1) date 2019-12-20 00:06:15*
+G04 Created by KiCad (PCBNEW 5.1.5-52549c5~84~ubuntu19.10.1) date 2019-12-20 00:42:21*
 %MOMM*%
 %LPD*%
 G04 APERTURE LIST*
diff --git a/bldc-drivr-gerbers/bldc-controller-B_Mask.gbs b/bldc-drivr-gerbers/bldc-controller-B_Mask.gbs
index 0f4a073..02257a2 100644
--- a/bldc-drivr-gerbers/bldc-controller-B_Mask.gbs
+++ b/bldc-drivr-gerbers/bldc-controller-B_Mask.gbs
@@ -1,12 +1,12 @@
-%TF.GenerationSoftware,KiCad,Pcbnew,5.1.5-52549c5~84~ubuntu19.10.1*%
-%TF.CreationDate,2019-12-20T00:06:15-05:00*%
-%TF.ProjectId,bldc-controller,626c6463-2d63-46f6-9e74-726f6c6c6572,rev?*%
-%TF.SameCoordinates,Original*%
-%TF.FileFunction,Soldermask,Bot*%
-%TF.FilePolarity,Negative*%
+G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.1.5-52549c5~84~ubuntu19.10.1*
+G04 #@! TF.CreationDate,2019-12-20T00:42:21-05:00*
+G04 #@! TF.ProjectId,bldc-controller,626c6463-2d63-46f6-9e74-726f6c6c6572,rev?*
+G04 #@! TF.SameCoordinates,Original*
+G04 #@! TF.FileFunction,Soldermask,Bot*
+G04 #@! TF.FilePolarity,Negative*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.1.5-52549c5~84~ubuntu19.10.1) date 2019-12-20 00:06:15*
+G04 Created by KiCad (PCBNEW 5.1.5-52549c5~84~ubuntu19.10.1) date 2019-12-20 00:42:21*
 %MOMM*%
 %LPD*%
 G04 APERTURE LIST*
diff --git a/bldc-drivr-gerbers/bldc-controller-B_Paste.gbp b/bldc-drivr-gerbers/bldc-controller-B_Paste.gbp
index f074112..c81fabe 100644
--- a/bldc-drivr-gerbers/bldc-controller-B_Paste.gbp
+++ b/bldc-drivr-gerbers/bldc-controller-B_Paste.gbp
@@ -1,12 +1,12 @@
-%TF.GenerationSoftware,KiCad,Pcbnew,5.1.5-52549c5~84~ubuntu19.10.1*%
-%TF.CreationDate,2019-12-20T00:06:15-05:00*%
-%TF.ProjectId,bldc-controller,626c6463-2d63-46f6-9e74-726f6c6c6572,rev?*%
-%TF.SameCoordinates,Original*%
-%TF.FileFunction,Paste,Bot*%
-%TF.FilePolarity,Positive*%
+G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.1.5-52549c5~84~ubuntu19.10.1*
+G04 #@! TF.CreationDate,2019-12-20T00:42:21-05:00*
+G04 #@! TF.ProjectId,bldc-controller,626c6463-2d63-46f6-9e74-726f6c6c6572,rev?*
+G04 #@! TF.SameCoordinates,Original*
+G04 #@! TF.FileFunction,Paste,Bot*
+G04 #@! TF.FilePolarity,Positive*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.1.5-52549c5~84~ubuntu19.10.1) date 2019-12-20 00:06:15*
+G04 Created by KiCad (PCBNEW 5.1.5-52549c5~84~ubuntu19.10.1) date 2019-12-20 00:42:21*
 %MOMM*%
 %LPD*%
 G04 APERTURE LIST*
diff --git a/bldc-drivr-gerbers/bldc-controller-B_SilkS.gbo b/bldc-drivr-gerbers/bldc-controller-B_SilkS.gbo
index 509f3e9..8518710 100644
--- a/bldc-drivr-gerbers/bldc-controller-B_SilkS.gbo
+++ b/bldc-drivr-gerbers/bldc-controller-B_SilkS.gbo
@@ -1,12 +1,12 @@
-%TF.GenerationSoftware,KiCad,Pcbnew,5.1.5-52549c5~84~ubuntu19.10.1*%
-%TF.CreationDate,2019-12-20T00:06:15-05:00*%
-%TF.ProjectId,bldc-controller,626c6463-2d63-46f6-9e74-726f6c6c6572,rev?*%
-%TF.SameCoordinates,Original*%
-%TF.FileFunction,Legend,Bot*%
-%TF.FilePolarity,Positive*%
+G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.1.5-52549c5~84~ubuntu19.10.1*
+G04 #@! TF.CreationDate,2019-12-20T00:42:21-05:00*
+G04 #@! TF.ProjectId,bldc-controller,626c6463-2d63-46f6-9e74-726f6c6c6572,rev?*
+G04 #@! TF.SameCoordinates,Original*
+G04 #@! TF.FileFunction,Legend,Bot*
+G04 #@! TF.FilePolarity,Positive*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.1.5-52549c5~84~ubuntu19.10.1) date 2019-12-20 00:06:15*
+G04 Created by KiCad (PCBNEW 5.1.5-52549c5~84~ubuntu19.10.1) date 2019-12-20 00:42:21*
 %MOMM*%
 %LPD*%
 G04 APERTURE LIST*
diff --git a/bldc-drivr-gerbers/bldc-controller-Edge_Cuts.gm1 b/bldc-drivr-gerbers/bldc-controller-Edge_Cuts.gm1
index a1d7f93..d369c15 100644
--- a/bldc-drivr-gerbers/bldc-controller-Edge_Cuts.gm1
+++ b/bldc-drivr-gerbers/bldc-controller-Edge_Cuts.gm1
@@ -1,11 +1,11 @@
-%TF.GenerationSoftware,KiCad,Pcbnew,5.1.5-52549c5~84~ubuntu19.10.1*%
-%TF.CreationDate,2019-12-20T00:06:15-05:00*%
-%TF.ProjectId,bldc-controller,626c6463-2d63-46f6-9e74-726f6c6c6572,rev?*%
-%TF.SameCoordinates,Original*%
-%TF.FileFunction,Profile,NP*%
+G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.1.5-52549c5~84~ubuntu19.10.1*
+G04 #@! TF.CreationDate,2019-12-20T00:42:21-05:00*
+G04 #@! TF.ProjectId,bldc-controller,626c6463-2d63-46f6-9e74-726f6c6c6572,rev?*
+G04 #@! TF.SameCoordinates,Original*
+G04 #@! TF.FileFunction,Profile,NP*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.1.5-52549c5~84~ubuntu19.10.1) date 2019-12-20 00:06:15*
+G04 Created by KiCad (PCBNEW 5.1.5-52549c5~84~ubuntu19.10.1) date 2019-12-20 00:42:21*
 %MOMM*%
 %LPD*%
 G04 APERTURE LIST*
diff --git a/bldc-drivr-gerbers/bldc-controller-F_Cu.gtl b/bldc-drivr-gerbers/bldc-controller-F_Cu.gtl
index b09b75e..abd506d 100644
--- a/bldc-drivr-gerbers/bldc-controller-F_Cu.gtl
+++ b/bldc-drivr-gerbers/bldc-controller-F_Cu.gtl
@@ -1,12 +1,12 @@
-%TF.GenerationSoftware,KiCad,Pcbnew,5.1.5-52549c5~84~ubuntu19.10.1*%
-%TF.CreationDate,2019-12-20T00:06:15-05:00*%
-%TF.ProjectId,bldc-controller,626c6463-2d63-46f6-9e74-726f6c6c6572,rev?*%
-%TF.SameCoordinates,Original*%
-%TF.FileFunction,Copper,L1,Top*%
-%TF.FilePolarity,Positive*%
+G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.1.5-52549c5~84~ubuntu19.10.1*
+G04 #@! TF.CreationDate,2019-12-20T00:42:21-05:00*
+G04 #@! TF.ProjectId,bldc-controller,626c6463-2d63-46f6-9e74-726f6c6c6572,rev?*
+G04 #@! TF.SameCoordinates,Original*
+G04 #@! TF.FileFunction,Copper,L1,Top*
+G04 #@! TF.FilePolarity,Positive*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.1.5-52549c5~84~ubuntu19.10.1) date 2019-12-20 00:06:15*
+G04 Created by KiCad (PCBNEW 5.1.5-52549c5~84~ubuntu19.10.1) date 2019-12-20 00:42:21*
 %MOMM*%
 %LPD*%
 G04 APERTURE LIST*
@@ -48,7 +48,7 @@ X19250000Y-118040000D03*
 X19250000Y-116770000D03*
 D11*
 X19250000Y-115500000D03*
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 D12*
 G36*
 X72359860Y-118210244D02*
@@ -122,8 +122,8 @@ X67481100Y-118210000D01*
 X72354900Y-118210000D01*
 X72359860Y-118210244D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X66584902Y-123140241D02*
 G01*
@@ -196,8 +196,8 @@ X66079999Y-123140000D01*
 X66580001Y-123140000D01*
 X66584902Y-123140241D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X66584902Y-122640241D02*
 G01*
@@ -270,8 +270,8 @@ X66079999Y-122640000D01*
 X66580001Y-122640000D01*
 X66584902Y-122640241D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X66584902Y-122140241D02*
 G01*
@@ -344,8 +344,8 @@ X66079999Y-122140000D01*
 X66580001Y-122140000D01*
 X66584902Y-122140241D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X66584902Y-121640241D02*
 G01*
@@ -418,8 +418,8 @@ X66079999Y-121640000D01*
 X66580001Y-121640000D01*
 X66584902Y-121640241D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X66584902Y-121140241D02*
 G01*
@@ -492,8 +492,8 @@ X66079999Y-121140000D01*
 X66580001Y-121140000D01*
 X66584902Y-121140241D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X66584902Y-120640241D02*
 G01*
@@ -566,8 +566,8 @@ X66079999Y-120640000D01*
 X66580001Y-120640000D01*
 X66584902Y-120640241D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X66584902Y-120140241D02*
 G01*
@@ -640,8 +640,8 @@ X66079999Y-120140000D01*
 X66580001Y-120140000D01*
 X66584902Y-120140241D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X66584902Y-119640241D02*
 G01*
@@ -714,8 +714,8 @@ X66079999Y-119640000D01*
 X66580001Y-119640000D01*
 X66584902Y-119640241D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X66584902Y-119140241D02*
 G01*
@@ -788,8 +788,8 @@ X66079999Y-119140000D01*
 X66580001Y-119140000D01*
 X66584902Y-119140241D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X66584902Y-118640241D02*
 G01*
@@ -862,8 +862,8 @@ X66079999Y-118640000D01*
 X66580001Y-118640000D01*
 X66584902Y-118640241D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X66584902Y-118140241D02*
 G01*
@@ -936,8 +936,8 @@ X66079999Y-118140000D01*
 X66580001Y-118140000D01*
 X66584902Y-118140241D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X66584902Y-117640241D02*
 G01*
@@ -1010,8 +1010,8 @@ X66079999Y-117640000D01*
 X66580001Y-117640000D01*
 X66584902Y-117640241D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X67054902Y-116810241D02*
 G01*
@@ -1084,8 +1084,8 @@ X66909999Y-116810000D01*
 X67050001Y-116810000D01*
 X67054902Y-116810241D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X67554902Y-116810241D02*
 G01*
@@ -1158,8 +1158,8 @@ X67409999Y-116810000D01*
 X67550001Y-116810000D01*
 X67554902Y-116810241D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X68054902Y-116810241D02*
 G01*
@@ -1232,8 +1232,8 @@ X67909999Y-116810000D01*
 X68050001Y-116810000D01*
 X68054902Y-116810241D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X68554902Y-116810241D02*
 G01*
@@ -1306,8 +1306,8 @@ X68409999Y-116810000D01*
 X68550001Y-116810000D01*
 X68554902Y-116810241D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X69054902Y-116810241D02*
 G01*
@@ -1380,8 +1380,8 @@ X68909999Y-116810000D01*
 X69050001Y-116810000D01*
 X69054902Y-116810241D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X69554902Y-116810241D02*
 G01*
@@ -1454,8 +1454,8 @@ X69409999Y-116810000D01*
 X69550001Y-116810000D01*
 X69554902Y-116810241D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X70054902Y-116810241D02*
 G01*
@@ -1528,8 +1528,8 @@ X69909999Y-116810000D01*
 X70050001Y-116810000D01*
 X70054902Y-116810241D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X70554902Y-116810241D02*
 G01*
@@ -1602,8 +1602,8 @@ X70409999Y-116810000D01*
 X70550001Y-116810000D01*
 X70554902Y-116810241D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X71054902Y-116810241D02*
 G01*
@@ -1676,8 +1676,8 @@ X70909999Y-116810000D01*
 X71050001Y-116810000D01*
 X71054902Y-116810241D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X71554902Y-116810241D02*
 G01*
@@ -1750,8 +1750,8 @@ X71409999Y-116810000D01*
 X71550001Y-116810000D01*
 X71554902Y-116810241D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X72054902Y-116810241D02*
 G01*
@@ -1824,8 +1824,8 @@ X71909999Y-116810000D01*
 X72050001Y-116810000D01*
 X72054902Y-116810241D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X72554902Y-116810241D02*
 G01*
@@ -1898,8 +1898,8 @@ X72409999Y-116810000D01*
 X72550001Y-116810000D01*
 X72554902Y-116810241D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X73384902Y-117640241D02*
 G01*
@@ -1972,8 +1972,8 @@ X72879999Y-117640000D01*
 X73380001Y-117640000D01*
 X73384902Y-117640241D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X73384902Y-118140241D02*
 G01*
@@ -2046,8 +2046,8 @@ X72879999Y-118140000D01*
 X73380001Y-118140000D01*
 X73384902Y-118140241D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X73384902Y-118640241D02*
 G01*
@@ -2120,8 +2120,8 @@ X72879999Y-118640000D01*
 X73380001Y-118640000D01*
 X73384902Y-118640241D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X73384902Y-119140241D02*
 G01*
@@ -2194,8 +2194,8 @@ X72879999Y-119140000D01*
 X73380001Y-119140000D01*
 X73384902Y-119140241D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X73384902Y-119640241D02*
 G01*
@@ -2268,8 +2268,8 @@ X72879999Y-119640000D01*
 X73380001Y-119640000D01*
 X73384902Y-119640241D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X73384902Y-120140241D02*
 G01*
@@ -2342,8 +2342,8 @@ X72879999Y-120140000D01*
 X73380001Y-120140000D01*
 X73384902Y-120140241D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X73384902Y-120640241D02*
 G01*
@@ -2416,8 +2416,8 @@ X72879999Y-120640000D01*
 X73380001Y-120640000D01*
 X73384902Y-120640241D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X73384902Y-121140241D02*
 G01*
@@ -2490,8 +2490,8 @@ X72879999Y-121140000D01*
 X73380001Y-121140000D01*
 X73384902Y-121140241D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X73384902Y-121640241D02*
 G01*
@@ -2564,8 +2564,8 @@ X72879999Y-121640000D01*
 X73380001Y-121640000D01*
 X73384902Y-121640241D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X73384902Y-122140241D02*
 G01*
@@ -2638,8 +2638,8 @@ X72879999Y-122140000D01*
 X73380001Y-122140000D01*
 X73384902Y-122140241D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X73384902Y-122640241D02*
 G01*
@@ -2712,8 +2712,8 @@ X72879999Y-122640000D01*
 X73380001Y-122640000D01*
 X73384902Y-122640241D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X73384902Y-123140241D02*
 G01*
@@ -2786,8 +2786,8 @@ X72879999Y-123140000D01*
 X73380001Y-123140000D01*
 X73384902Y-123140241D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X72554902Y-123610241D02*
 G01*
@@ -2860,8 +2860,8 @@ X72409999Y-123610000D01*
 X72550001Y-123610000D01*
 X72554902Y-123610241D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X72054902Y-123610241D02*
 G01*
@@ -2934,8 +2934,8 @@ X71909999Y-123610000D01*
 X72050001Y-123610000D01*
 X72054902Y-123610241D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X71554902Y-123610241D02*
 G01*
@@ -3008,8 +3008,8 @@ X71409999Y-123610000D01*
 X71550001Y-123610000D01*
 X71554902Y-123610241D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X71054902Y-123610241D02*
 G01*
@@ -3082,8 +3082,8 @@ X70909999Y-123610000D01*
 X71050001Y-123610000D01*
 X71054902Y-123610241D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X70554902Y-123610241D02*
 G01*
@@ -3156,8 +3156,8 @@ X70409999Y-123610000D01*
 X70550001Y-123610000D01*
 X70554902Y-123610241D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X70054902Y-123610241D02*
 G01*
@@ -3230,8 +3230,8 @@ X69909999Y-123610000D01*
 X70050001Y-123610000D01*
 X70054902Y-123610241D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X69554902Y-123610241D02*
 G01*
@@ -3304,8 +3304,8 @@ X69409999Y-123610000D01*
 X69550001Y-123610000D01*
 X69554902Y-123610241D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X69054902Y-123610241D02*
 G01*
@@ -3378,8 +3378,8 @@ X68909999Y-123610000D01*
 X69050001Y-123610000D01*
 X69054902Y-123610241D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X68554902Y-123610241D02*
 G01*
@@ -3452,8 +3452,8 @@ X68409999Y-123610000D01*
 X68550001Y-123610000D01*
 X68554902Y-123610241D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X68054902Y-123610241D02*
 G01*
@@ -3526,8 +3526,8 @@ X67909999Y-123610000D01*
 X68050001Y-123610000D01*
 X68054902Y-123610241D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X67554902Y-123610241D02*
 G01*
@@ -3600,8 +3600,8 @@ X67409999Y-123610000D01*
 X67550001Y-123610000D01*
 X67554902Y-123610241D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X67054902Y-123610241D02*
 G01*
@@ -3674,7 +3674,7 @@ X66909999Y-123610000D01*
 X67050001Y-123610000D01*
 X67054902Y-123610241D01*
 G37*
-%TD.AperFunction*%
+G04 #@! TD.AperFunction*
 D13*
 X100287500Y-122485000D03*
 D14*
@@ -3785,7 +3785,7 @@ X41830000Y-132590000D03*
 X41830000Y-134790000D03*
 X40880000Y-134790000D03*
 X39930000Y-134790000D03*
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 D12*
 G36*
 X28669703Y-120790722D02*
@@ -3859,8 +3859,8 @@ X28355000Y-120790000D01*
 X28655000Y-120790000D01*
 X28669703Y-120790722D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X27399703Y-120790722D02*
 G01*
@@ -3933,8 +3933,8 @@ X27085000Y-120790000D01*
 X27385000Y-120790000D01*
 X27399703Y-120790722D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X26129703Y-120790722D02*
 G01*
@@ -4007,8 +4007,8 @@ X25815000Y-120790000D01*
 X26115000Y-120790000D01*
 X26129703Y-120790722D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X24859703Y-120790722D02*
 G01*
@@ -4081,8 +4081,8 @@ X24545000Y-120790000D01*
 X24845000Y-120790000D01*
 X24859703Y-120790722D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X24859703Y-113590722D02*
 G01*
@@ -4155,8 +4155,8 @@ X24545000Y-113590000D01*
 X24845000Y-113590000D01*
 X24859703Y-113590722D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X26129703Y-113590722D02*
 G01*
@@ -4229,8 +4229,8 @@ X25815000Y-113590000D01*
 X26115000Y-113590000D01*
 X26129703Y-113590722D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X27399703Y-113590722D02*
 G01*
@@ -4303,8 +4303,8 @@ X27085000Y-113590000D01*
 X27385000Y-113590000D01*
 X27399703Y-113590722D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X28669703Y-113590722D02*
 G01*
@@ -4377,8 +4377,8 @@ X28355000Y-113590000D01*
 X28655000Y-113590000D01*
 X28669703Y-113590722D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X33280913Y-117410000D02*
 G01*
@@ -4387,8 +4387,8 @@ X41059087Y-117410000D01*
 X37170000Y-121299087D01*
 X33280913Y-117410000D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X37910081Y-112673170D02*
 G01*
@@ -4461,8 +4461,8 @@ X37886557Y-112673170D01*
 X37898319Y-112672592D01*
 X37910081Y-112673170D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X38263634Y-113026723D02*
 G01*
@@ -4535,8 +4535,8 @@ X38240110Y-113026723D01*
 X38251872Y-113026145D01*
 X38263634Y-113026723D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X38617188Y-113380276D02*
 G01*
@@ -4609,8 +4609,8 @@ X38593664Y-113380276D01*
 X38605426Y-113379698D01*
 X38617188Y-113380276D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X38970741Y-113733830D02*
 G01*
@@ -4683,8 +4683,8 @@ X38947217Y-113733830D01*
 X38958979Y-113733252D01*
 X38970741Y-113733830D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X39324295Y-114087383D02*
 G01*
@@ -4757,8 +4757,8 @@ X39300771Y-114087383D01*
 X39312533Y-114086805D01*
 X39324295Y-114087383D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X39677848Y-114440937D02*
 G01*
@@ -4831,8 +4831,8 @@ X39654324Y-114440937D01*
 X39666086Y-114440359D01*
 X39677848Y-114440937D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X40031401Y-114794490D02*
 G01*
@@ -4905,8 +4905,8 @@ X40007877Y-114794490D01*
 X40019639Y-114793912D01*
 X40031401Y-114794490D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X40384955Y-115148043D02*
 G01*
@@ -4979,8 +4979,8 @@ X40361431Y-115148043D01*
 X40373193Y-115147465D01*
 X40384955Y-115148043D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X40738508Y-115501597D02*
 G01*
@@ -5053,8 +5053,8 @@ X40714984Y-115501597D01*
 X40726746Y-115501019D01*
 X40738508Y-115501597D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X41092062Y-115855150D02*
 G01*
@@ -5127,8 +5127,8 @@ X41068538Y-115855150D01*
 X41080300Y-115854572D01*
 X41092062Y-115855150D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X41445615Y-116208704D02*
 G01*
@@ -5201,8 +5201,8 @@ X41422091Y-116208704D01*
 X41433853Y-116208126D01*
 X41445615Y-116208704D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X41799168Y-116562257D02*
 G01*
@@ -5275,8 +5275,8 @@ X41775644Y-116562257D01*
 X41787406Y-116561679D01*
 X41799168Y-116562257D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X41403190Y-117622917D02*
 G01*
@@ -5349,8 +5349,8 @@ X41379666Y-117622917D01*
 X41391428Y-117622339D01*
 X41403190Y-117622917D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X41049637Y-117976470D02*
 G01*
@@ -5423,8 +5423,8 @@ X41026113Y-117976470D01*
 X41037875Y-117975892D01*
 X41049637Y-117976470D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X40696084Y-118330024D02*
 G01*
@@ -5497,8 +5497,8 @@ X40672560Y-118330024D01*
 X40684322Y-118329446D01*
 X40696084Y-118330024D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X40342530Y-118683577D02*
 G01*
@@ -5571,8 +5571,8 @@ X40319006Y-118683577D01*
 X40330768Y-118682999D01*
 X40342530Y-118683577D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X39988977Y-119037131D02*
 G01*
@@ -5645,8 +5645,8 @@ X39965453Y-119037131D01*
 X39977215Y-119036553D01*
 X39988977Y-119037131D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X39635423Y-119390684D02*
 G01*
@@ -5719,8 +5719,8 @@ X39611899Y-119390684D01*
 X39623661Y-119390106D01*
 X39635423Y-119390684D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X39281870Y-119744237D02*
 G01*
@@ -5793,8 +5793,8 @@ X39258346Y-119744237D01*
 X39270108Y-119743659D01*
 X39281870Y-119744237D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X38928317Y-120097791D02*
 G01*
@@ -5867,8 +5867,8 @@ X38904793Y-120097791D01*
 X38916555Y-120097213D01*
 X38928317Y-120097791D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X38574763Y-120451344D02*
 G01*
@@ -5941,8 +5941,8 @@ X38551239Y-120451344D01*
 X38563001Y-120450766D01*
 X38574763Y-120451344D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X38221210Y-120804898D02*
 G01*
@@ -6015,8 +6015,8 @@ X38197686Y-120804898D01*
 X38209448Y-120804320D01*
 X38221210Y-120804898D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X37867656Y-121158451D02*
 G01*
@@ -6089,8 +6089,8 @@ X37844132Y-121158451D01*
 X37855894Y-121157873D01*
 X37867656Y-121158451D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X37514103Y-121512004D02*
 G01*
@@ -6163,8 +6163,8 @@ X37490579Y-121512004D01*
 X37502341Y-121511426D01*
 X37514103Y-121512004D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X36849421Y-121512004D02*
 G01*
@@ -6237,8 +6237,8 @@ X36825897Y-121512004D01*
 X36837659Y-121511426D01*
 X36849421Y-121512004D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X36495868Y-121158451D02*
 G01*
@@ -6311,8 +6311,8 @@ X36472344Y-121158451D01*
 X36484106Y-121157873D01*
 X36495868Y-121158451D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X36142314Y-120804898D02*
 G01*
@@ -6385,8 +6385,8 @@ X36118790Y-120804898D01*
 X36130552Y-120804320D01*
 X36142314Y-120804898D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X35788761Y-120451344D02*
 G01*
@@ -6459,8 +6459,8 @@ X35765237Y-120451344D01*
 X35776999Y-120450766D01*
 X35788761Y-120451344D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X35435207Y-120097791D02*
 G01*
@@ -6533,8 +6533,8 @@ X35411683Y-120097791D01*
 X35423445Y-120097213D01*
 X35435207Y-120097791D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X35081654Y-119744237D02*
 G01*
@@ -6607,8 +6607,8 @@ X35058130Y-119744237D01*
 X35069892Y-119743659D01*
 X35081654Y-119744237D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X34728101Y-119390684D02*
 G01*
@@ -6681,8 +6681,8 @@ X34704577Y-119390684D01*
 X34716339Y-119390106D01*
 X34728101Y-119390684D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X34374547Y-119037131D02*
 G01*
@@ -6755,8 +6755,8 @@ X34351023Y-119037131D01*
 X34362785Y-119036553D01*
 X34374547Y-119037131D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X34020994Y-118683577D02*
 G01*
@@ -6829,8 +6829,8 @@ X33997470Y-118683577D01*
 X34009232Y-118682999D01*
 X34020994Y-118683577D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X33667440Y-118330024D02*
 G01*
@@ -6903,8 +6903,8 @@ X33643916Y-118330024D01*
 X33655678Y-118329446D01*
 X33667440Y-118330024D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X33313887Y-117976470D02*
 G01*
@@ -6977,8 +6977,8 @@ X33290363Y-117976470D01*
 X33302125Y-117975892D01*
 X33313887Y-117976470D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X32960334Y-117622917D02*
 G01*
@@ -7051,8 +7051,8 @@ X32936810Y-117622917D01*
 X32948572Y-117622339D01*
 X32960334Y-117622917D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X32564356Y-116562257D02*
 G01*
@@ -7125,8 +7125,8 @@ X32540832Y-116562257D01*
 X32552594Y-116561679D01*
 X32564356Y-116562257D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X32917909Y-116208704D02*
 G01*
@@ -7199,8 +7199,8 @@ X32894385Y-116208704D01*
 X32906147Y-116208126D01*
 X32917909Y-116208704D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X33271462Y-115855150D02*
 G01*
@@ -7273,8 +7273,8 @@ X33247938Y-115855150D01*
 X33259700Y-115854572D01*
 X33271462Y-115855150D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X33625016Y-115501597D02*
 G01*
@@ -7347,8 +7347,8 @@ X33601492Y-115501597D01*
 X33613254Y-115501019D01*
 X33625016Y-115501597D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X33978569Y-115148043D02*
 G01*
@@ -7421,8 +7421,8 @@ X33955045Y-115148043D01*
 X33966807Y-115147465D01*
 X33978569Y-115148043D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X34332123Y-114794490D02*
 G01*
@@ -7495,8 +7495,8 @@ X34308599Y-114794490D01*
 X34320361Y-114793912D01*
 X34332123Y-114794490D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X34685676Y-114440937D02*
 G01*
@@ -7569,8 +7569,8 @@ X34662152Y-114440937D01*
 X34673914Y-114440359D01*
 X34685676Y-114440937D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X35039229Y-114087383D02*
 G01*
@@ -7643,8 +7643,8 @@ X35015705Y-114087383D01*
 X35027467Y-114086805D01*
 X35039229Y-114087383D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X35392783Y-113733830D02*
 G01*
@@ -7717,8 +7717,8 @@ X35369259Y-113733830D01*
 X35381021Y-113733252D01*
 X35392783Y-113733830D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X35746336Y-113380276D02*
 G01*
@@ -7791,8 +7791,8 @@ X35722812Y-113380276D01*
 X35734574Y-113379698D01*
 X35746336Y-113380276D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X36099890Y-113026723D02*
 G01*
@@ -7865,8 +7865,8 @@ X36076366Y-113026723D01*
 X36088128Y-113026145D01*
 X36099890Y-113026723D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X36453443Y-112673170D02*
 G01*
@@ -7939,7 +7939,7 @@ X36429919Y-112673170D01*
 X36441681Y-112672592D01*
 X36453443Y-112673170D01*
 G37*
-%TD.AperFunction*%
+G04 #@! TD.AperFunction*
 D21*
 X47450000Y-141050000D03*
 D22*
@@ -7974,7 +7974,7 @@ X47450000Y-138710000D03*
 X47950000Y-138710000D03*
 X48450000Y-138710000D03*
 X48950000Y-138710000D03*
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 D12*
 G36*
 X54016958Y-131560710D02*
@@ -8048,8 +8048,8 @@ X53657500Y-131560000D01*
 X54002500Y-131560000D01*
 X54016958Y-131560710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X54016958Y-130590710D02*
 G01*
@@ -8122,8 +8122,8 @@ X53657500Y-130590000D01*
 X54002500Y-130590000D01*
 X54016958Y-130590710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X24632691Y-139646053D02*
 G01*
@@ -8196,8 +8196,8 @@ X24173750Y-139645000D01*
 X24611250Y-139645000D01*
 X24632691Y-139646053D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X26207691Y-139646053D02*
 G01*
@@ -8270,8 +8270,8 @@ X25748750Y-139645000D01*
 X26186250Y-139645000D01*
 X26207691Y-139646053D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X24902691Y-137146053D02*
 G01*
@@ -8344,8 +8344,8 @@ X24443750Y-137145000D01*
 X24881250Y-137145000D01*
 X24902691Y-137146053D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X26477691Y-137146053D02*
 G01*
@@ -8418,8 +8418,8 @@ X26018750Y-137145000D01*
 X26456250Y-137145000D01*
 X26477691Y-137146053D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X24862691Y-131936053D02*
 G01*
@@ -8492,8 +8492,8 @@ X24403750Y-131935000D01*
 X24841250Y-131935000D01*
 X24862691Y-131936053D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X26437691Y-131936053D02*
 G01*
@@ -8566,8 +8566,8 @@ X25978750Y-131935000D01*
 X26416250Y-131935000D01*
 X26437691Y-131936053D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X24810191Y-129406053D02*
 G01*
@@ -8640,8 +8640,8 @@ X24351250Y-129405000D01*
 X24788750Y-129405000D01*
 X24810191Y-129406053D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X26385191Y-129406053D02*
 G01*
@@ -8714,8 +8714,8 @@ X25926250Y-129405000D01*
 X26363750Y-129405000D01*
 X26385191Y-129406053D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X24862691Y-134496053D02*
 G01*
@@ -8788,8 +8788,8 @@ X24403750Y-134495000D01*
 X24841250Y-134495000D01*
 X24862691Y-134496053D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X26437691Y-134496053D02*
 G01*
@@ -8862,8 +8862,8 @@ X25978750Y-134495000D01*
 X26416250Y-134495000D01*
 X26437691Y-134496053D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X21456958Y-110710710D02*
 G01*
@@ -8936,8 +8936,8 @@ X21147500Y-110710000D01*
 X21442500Y-110710000D01*
 X21456958Y-110710710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X20486958Y-110710710D02*
 G01*
@@ -9010,8 +9010,8 @@ X20177500Y-110710000D01*
 X20472500Y-110710000D01*
 X20486958Y-110710710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X23436958Y-105420710D02*
 G01*
@@ -9084,8 +9084,8 @@ X23077500Y-105420000D01*
 X23422500Y-105420000D01*
 X23436958Y-105420710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X23436958Y-104450710D02*
 G01*
@@ -9158,8 +9158,8 @@ X23077500Y-104450000D01*
 X23422500Y-104450000D01*
 X23436958Y-104450710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X27666958Y-123120710D02*
 G01*
@@ -9232,8 +9232,8 @@ X27357500Y-123120000D01*
 X27652500Y-123120000D01*
 X27666958Y-123120710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X28636958Y-123120710D02*
 G01*
@@ -9306,8 +9306,8 @@ X28327500Y-123120000D01*
 X28622500Y-123120000D01*
 X28636958Y-123120710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X25284958Y-111730710D02*
 G01*
@@ -9380,8 +9380,8 @@ X24975500Y-111730000D01*
 X25270500Y-111730000D01*
 X25284958Y-111730710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X24314958Y-111730710D02*
 G01*
@@ -9454,8 +9454,8 @@ X24005500Y-111730000D01*
 X24300500Y-111730000D01*
 X24314958Y-111730710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X55296958Y-131630710D02*
 G01*
@@ -9528,8 +9528,8 @@ X54937500Y-131630000D01*
 X55282500Y-131630000D01*
 X55296958Y-131630710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X55296958Y-130660710D02*
 G01*
@@ -9602,8 +9602,8 @@ X54937500Y-130660000D01*
 X55282500Y-130660000D01*
 X55296958Y-130660710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X65356958Y-127130710D02*
 G01*
@@ -9676,8 +9676,8 @@ X65047500Y-127130000D01*
 X65342500Y-127130000D01*
 X65356958Y-127130710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X64386958Y-127130710D02*
 G01*
@@ -9750,8 +9750,8 @@ X64077500Y-127130000D01*
 X64372500Y-127130000D01*
 X64386958Y-127130710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X65366958Y-126040710D02*
 G01*
@@ -9824,8 +9824,8 @@ X65057500Y-126040000D01*
 X65352500Y-126040000D01*
 X65366958Y-126040710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X64396958Y-126040710D02*
 G01*
@@ -9898,8 +9898,8 @@ X64087500Y-126040000D01*
 X64382500Y-126040000D01*
 X64396958Y-126040710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X39246958Y-104880710D02*
 G01*
@@ -9972,8 +9972,8 @@ X38937500Y-104880000D01*
 X39232500Y-104880000D01*
 X39246958Y-104880710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X38276958Y-104880710D02*
 G01*
@@ -10046,8 +10046,8 @@ X37967500Y-104880000D01*
 X38262500Y-104880000D01*
 X38276958Y-104880710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X64386958Y-124990710D02*
 G01*
@@ -10120,8 +10120,8 @@ X64077500Y-124990000D01*
 X64372500Y-124990000D01*
 X64386958Y-124990710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X65356958Y-124990710D02*
 G01*
@@ -10194,8 +10194,8 @@ X65047500Y-124990000D01*
 X65342500Y-124990000D01*
 X65356958Y-124990710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X39246958Y-106080710D02*
 G01*
@@ -10268,8 +10268,8 @@ X38937500Y-106080000D01*
 X39232500Y-106080000D01*
 X39246958Y-106080710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X38276958Y-106080710D02*
 G01*
@@ -10342,8 +10342,8 @@ X37967500Y-106080000D01*
 X38262500Y-106080000D01*
 X38276958Y-106080710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X72186958Y-115460710D02*
 G01*
@@ -10416,8 +10416,8 @@ X71877500Y-115460000D01*
 X72172500Y-115460000D01*
 X72186958Y-115460710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X71216958Y-115460710D02*
 G01*
@@ -10490,8 +10490,8 @@ X70907500Y-115460000D01*
 X71202500Y-115460000D01*
 X71216958Y-115460710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X70166958Y-114400710D02*
 G01*
@@ -10564,8 +10564,8 @@ X69807500Y-114400000D01*
 X70152500Y-114400000D01*
 X70166958Y-114400710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X70166958Y-115370710D02*
 G01*
@@ -10638,8 +10638,8 @@ X69807500Y-115370000D01*
 X70152500Y-115370000D01*
 X70166958Y-115370710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X67736958Y-113685710D02*
 G01*
@@ -10712,8 +10712,8 @@ X67377500Y-113685000D01*
 X67722500Y-113685000D01*
 X67736958Y-113685710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X67736958Y-114655710D02*
 G01*
@@ -10786,8 +10786,8 @@ X67377500Y-114655000D01*
 X67722500Y-114655000D01*
 X67736958Y-114655710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X62330886Y-124942830D02*
 G01*
@@ -10860,8 +10860,8 @@ X62301970Y-124942830D01*
 X62316428Y-124942120D01*
 X62330886Y-124942830D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X63016780Y-124256936D02*
 G01*
@@ -10934,8 +10934,8 @@ X62987864Y-124256936D01*
 X63002322Y-124256226D01*
 X63016780Y-124256936D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X25284958Y-110678710D02*
 G01*
@@ -11008,8 +11008,8 @@ X24975500Y-110678000D01*
 X25270500Y-110678000D01*
 X25284958Y-110678710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X24314958Y-110678710D02*
 G01*
@@ -11082,8 +11082,8 @@ X24005500Y-110678000D01*
 X24300500Y-110678000D01*
 X24314958Y-110678710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X27676958Y-124280710D02*
 G01*
@@ -11156,8 +11156,8 @@ X27367500Y-124280000D01*
 X27662500Y-124280000D01*
 X27676958Y-124280710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X28646958Y-124280710D02*
 G01*
@@ -11230,8 +11230,8 @@ X28337500Y-124280000D01*
 X28632500Y-124280000D01*
 X28646958Y-124280710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X28786958Y-111670710D02*
 G01*
@@ -11304,8 +11304,8 @@ X28427500Y-111670000D01*
 X28772500Y-111670000D01*
 X28786958Y-111670710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X28786958Y-110700710D02*
 G01*
@@ -11378,8 +11378,8 @@ X28427500Y-110700000D01*
 X28772500Y-110700000D01*
 X28786958Y-110700710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X66106958Y-137460710D02*
 G01*
@@ -11452,8 +11452,8 @@ X65747500Y-137460000D01*
 X66092500Y-137460000D01*
 X66106958Y-137460710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X66106958Y-138430710D02*
 G01*
@@ -11526,8 +11526,8 @@ X65747500Y-138430000D01*
 X66092500Y-138430000D01*
 X66106958Y-138430710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X66076958Y-139480710D02*
 G01*
@@ -11600,8 +11600,8 @@ X65717500Y-139480000D01*
 X66062500Y-139480000D01*
 X66076958Y-139480710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X66076958Y-140450710D02*
 G01*
@@ -11674,8 +11674,8 @@ X65717500Y-140450000D01*
 X66062500Y-140450000D01*
 X66076958Y-140450710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X31206958Y-113260710D02*
 G01*
@@ -11748,8 +11748,8 @@ X30897500Y-113260000D01*
 X31192500Y-113260000D01*
 X31206958Y-113260710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X30236958Y-113260710D02*
 G01*
@@ -11822,8 +11822,8 @@ X29927500Y-113260000D01*
 X30222500Y-113260000D01*
 X30236958Y-113260710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X31211958Y-114300710D02*
 G01*
@@ -11896,8 +11896,8 @@ X30902500Y-114300000D01*
 X31197500Y-114300000D01*
 X31211958Y-114300710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X30241958Y-114300710D02*
 G01*
@@ -11970,8 +11970,8 @@ X29932500Y-114300000D01*
 X30227500Y-114300000D01*
 X30241958Y-114300710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X66086958Y-141470710D02*
 G01*
@@ -12044,8 +12044,8 @@ X65727500Y-141470000D01*
 X66072500Y-141470000D01*
 X66086958Y-141470710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X66086958Y-142440710D02*
 G01*
@@ -12118,8 +12118,8 @@ X65727500Y-142440000D01*
 X66072500Y-142440000D01*
 X66086958Y-142440710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X66086958Y-143390710D02*
 G01*
@@ -12192,8 +12192,8 @@ X65727500Y-143390000D01*
 X66072500Y-143390000D01*
 X66086958Y-143390710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X66086958Y-144360710D02*
 G01*
@@ -12266,8 +12266,8 @@ X65727500Y-144360000D01*
 X66072500Y-144360000D01*
 X66086958Y-144360710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X66126958Y-133520710D02*
 G01*
@@ -12340,8 +12340,8 @@ X65767500Y-133520000D01*
 X66112500Y-133520000D01*
 X66126958Y-133520710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X66126958Y-134490710D02*
 G01*
@@ -12414,8 +12414,8 @@ X65767500Y-134490000D01*
 X66112500Y-134490000D01*
 X66126958Y-134490710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X66126958Y-135490710D02*
 G01*
@@ -12488,8 +12488,8 @@ X65767500Y-135490000D01*
 X66112500Y-135490000D01*
 X66126958Y-135490710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X66126958Y-136460710D02*
 G01*
@@ -12562,7 +12562,7 @@ X65767500Y-136460000D01*
 X66112500Y-136460000D01*
 X66126958Y-136460710D01*
 G37*
-%TD.AperFunction*%
+G04 #@! TD.AperFunction*
 D24*
 X75160000Y-145050000D03*
 X70840000Y-145050000D03*
@@ -12571,7 +12571,7 @@ X75160000Y-138150000D03*
 D25*
 X73000000Y-145050000D03*
 X73000000Y-138150000D03*
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 D12*
 G36*
 X43546958Y-141890710D02*
@@ -12645,8 +12645,8 @@ X43187500Y-141890000D01*
 X43532500Y-141890000D01*
 X43546958Y-141890710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X43546958Y-142860710D02*
 G01*
@@ -12719,8 +12719,8 @@ X43187500Y-142860000D01*
 X43532500Y-142860000D01*
 X43546958Y-142860710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X58227691Y-137066053D02*
 G01*
@@ -12793,8 +12793,8 @@ X57768750Y-137065000D01*
 X58206250Y-137065000D01*
 X58227691Y-137066053D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X56652691Y-137066053D02*
 G01*
@@ -12867,8 +12867,8 @@ X56193750Y-137065000D01*
 X56631250Y-137065000D01*
 X56652691Y-137066053D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X54876261Y-127393010D02*
 G01*
@@ -12941,8 +12941,8 @@ X52865000Y-127390000D01*
 X54815000Y-127390000D01*
 X54876261Y-127393010D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X54876261Y-119293010D02*
 G01*
@@ -13015,7 +13015,7 @@ X52865000Y-119290000D01*
 X54815000Y-119290000D01*
 X54876261Y-119293010D01*
 G37*
-%TD.AperFunction*%
+G04 #@! TD.AperFunction*
 D10*
 X42240000Y-106210000D03*
 X43510000Y-106210000D03*
@@ -13074,7 +13074,7 @@ X62580000Y-142200000D03*
 X64580000Y-135260000D03*
 X62580000Y-136210000D03*
 X62580000Y-134310000D03*
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 D12*
 G36*
 X43349505Y-123526204D02*
@@ -13148,8 +13148,8 @@ X42499999Y-123525000D01*
 X43325001Y-123525000D01*
 X43349505Y-123526204D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X46424505Y-123526204D02*
 G01*
@@ -13222,8 +13222,8 @@ X45574999Y-123525000D01*
 X46400001Y-123525000D01*
 X46424505Y-123526204D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X42224505Y-127236204D02*
 G01*
@@ -13296,8 +13296,8 @@ X41374999Y-127235000D01*
 X42200001Y-127235000D01*
 X42224505Y-127236204D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X39149505Y-127236204D02*
 G01*
@@ -13370,8 +13370,8 @@ X38299999Y-127235000D01*
 X39125001Y-127235000D01*
 X39149505Y-127236204D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X43832691Y-126756053D02*
 G01*
@@ -13444,8 +13444,8 @@ X43373750Y-126755000D01*
 X43811250Y-126755000D01*
 X43832691Y-126756053D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X45407691Y-126756053D02*
 G01*
@@ -13518,8 +13518,8 @@ X44948750Y-126755000D01*
 X45386250Y-126755000D01*
 X45407691Y-126756053D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X38347691Y-133771053D02*
 G01*
@@ -13592,8 +13592,8 @@ X37813750Y-133770000D01*
 X38326250Y-133770000D01*
 X38347691Y-133771053D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X38347691Y-132196053D02*
 G01*
@@ -13666,8 +13666,8 @@ X37813750Y-132195000D01*
 X38326250Y-132195000D01*
 X38347691Y-132196053D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X44036958Y-128230710D02*
 G01*
@@ -13740,8 +13740,8 @@ X43727500Y-128230000D01*
 X44022500Y-128230000D01*
 X44036958Y-128230710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X45006958Y-128230710D02*
 G01*
@@ -13814,8 +13814,8 @@ X44697500Y-128230000D01*
 X44992500Y-128230000D01*
 X45006958Y-128230710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X41086958Y-130710710D02*
 G01*
@@ -13888,8 +13888,8 @@ X40777500Y-130710000D01*
 X41072500Y-130710000D01*
 X41086958Y-130710710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X40116958Y-130710710D02*
 G01*
@@ -13962,8 +13962,8 @@ X39807500Y-130710000D01*
 X40102500Y-130710000D01*
 X40116958Y-130710710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X44926958Y-134350710D02*
 G01*
@@ -14036,8 +14036,8 @@ X44617500Y-134350000D01*
 X44912500Y-134350000D01*
 X44926958Y-134350710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X43956958Y-134350710D02*
 G01*
@@ -14110,8 +14110,8 @@ X43647500Y-134350000D01*
 X43942500Y-134350000D01*
 X43956958Y-134350710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X40996958Y-135950710D02*
 G01*
@@ -14184,8 +14184,8 @@ X40687500Y-135950000D01*
 X40982500Y-135950000D01*
 X40996958Y-135950710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X40026958Y-135950710D02*
 G01*
@@ -14258,8 +14258,8 @@ X39717500Y-135950000D01*
 X40012500Y-135950000D01*
 X40026958Y-135950710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X60425142Y-133061174D02*
 G01*
@@ -14332,8 +14332,8 @@ X59913750Y-133060000D01*
 X60401250Y-133060000D01*
 X60425142Y-133061174D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X58550142Y-133061174D02*
 G01*
@@ -14406,8 +14406,8 @@ X58038750Y-133060000D01*
 X58526250Y-133060000D01*
 X58550142Y-133061174D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X60425142Y-130661174D02*
 G01*
@@ -14480,8 +14480,8 @@ X59913750Y-130660000D01*
 X60401250Y-130660000D01*
 X60425142Y-130661174D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X58550142Y-130661174D02*
 G01*
@@ -14554,8 +14554,8 @@ X58038750Y-130660000D01*
 X58526250Y-130660000D01*
 X58550142Y-130661174D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X63627691Y-119016053D02*
 G01*
@@ -14628,8 +14628,8 @@ X63093750Y-119015000D01*
 X63606250Y-119015000D01*
 X63627691Y-119016053D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X63627691Y-120591053D02*
 G01*
@@ -14702,8 +14702,8 @@ X63093750Y-120590000D01*
 X63606250Y-120590000D01*
 X63627691Y-120591053D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X64936958Y-119530710D02*
 G01*
@@ -14776,8 +14776,8 @@ X64577500Y-119530000D01*
 X64922500Y-119530000D01*
 X64936958Y-119530710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X64936958Y-120500710D02*
 G01*
@@ -14850,8 +14850,8 @@ X64577500Y-120500000D01*
 X64922500Y-120500000D01*
 X64936958Y-120500710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X61299189Y-123093989D02*
 G01*
@@ -14924,8 +14924,8 @@ X61270273Y-123093989D01*
 X61284731Y-123093279D01*
 X61299189Y-123093989D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X61985083Y-123779883D02*
 G01*
@@ -14998,8 +14998,8 @@ X61956167Y-123779883D01*
 X61970625Y-123779173D01*
 X61985083Y-123779883D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X63566958Y-117940710D02*
 G01*
@@ -15072,8 +15072,8 @@ X63257500Y-117940000D01*
 X63552500Y-117940000D01*
 X63566958Y-117940710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X64536958Y-117940710D02*
 G01*
@@ -15146,8 +15146,8 @@ X64227500Y-117940000D01*
 X64522500Y-117940000D01*
 X64536958Y-117940710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X71226958Y-114320710D02*
 G01*
@@ -15220,8 +15220,8 @@ X70917500Y-114320000D01*
 X71212500Y-114320000D01*
 X71226958Y-114320710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X72196958Y-114320710D02*
 G01*
@@ -15294,8 +15294,8 @@ X71887500Y-114320000D01*
 X72182500Y-114320000D01*
 X72196958Y-114320710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X63112691Y-122106053D02*
 G01*
@@ -15368,8 +15368,8 @@ X62653750Y-122105000D01*
 X63091250Y-122105000D01*
 X63112691Y-122106053D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X64687691Y-122106053D02*
 G01*
@@ -15442,8 +15442,8 @@ X64228750Y-122105000D01*
 X64666250Y-122105000D01*
 X64687691Y-122106053D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X43947691Y-121276053D02*
 G01*
@@ -15516,8 +15516,8 @@ X43488750Y-121275000D01*
 X43926250Y-121275000D01*
 X43947691Y-121276053D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X42372691Y-121276053D02*
 G01*
@@ -15590,8 +15590,8 @@ X41913750Y-121275000D01*
 X42351250Y-121275000D01*
 X42372691Y-121276053D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X22946958Y-117100710D02*
 G01*
@@ -15664,8 +15664,8 @@ X22587500Y-117100000D01*
 X22932500Y-117100000D01*
 X22946958Y-117100710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X22946958Y-118070710D02*
 G01*
@@ -15738,8 +15738,8 @@ X22587500Y-118070000D01*
 X22932500Y-118070000D01*
 X22946958Y-118070710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X42866958Y-119780710D02*
 G01*
@@ -15812,8 +15812,8 @@ X42557500Y-119780000D01*
 X42852500Y-119780000D01*
 X42866958Y-119780710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X41896958Y-119780710D02*
 G01*
@@ -15886,8 +15886,8 @@ X41587500Y-119780000D01*
 X41882500Y-119780000D01*
 X41896958Y-119780710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X71061111Y-126359580D02*
 G01*
@@ -15960,8 +15960,8 @@ X71018229Y-126359580D01*
 X71039670Y-126358527D01*
 X71061111Y-126359580D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X72174805Y-127473274D02*
 G01*
@@ -16034,8 +16034,8 @@ X72131923Y-127473274D01*
 X72153364Y-127472221D01*
 X72174805Y-127473274D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X68646242Y-128401042D02*
 G01*
@@ -16108,8 +16108,8 @@ X68617326Y-128401042D01*
 X68631784Y-128400332D01*
 X68646242Y-128401042D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X69332136Y-129086936D02*
 G01*
@@ -16182,8 +16182,8 @@ X69303220Y-129086936D01*
 X69317678Y-129086226D01*
 X69332136Y-129086936D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X71164924Y-130696427D02*
 G01*
@@ -16256,8 +16256,8 @@ X71122042Y-130696427D01*
 X71143483Y-130695374D01*
 X71164924Y-130696427D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X72278618Y-129582733D02*
 G01*
@@ -16330,8 +16330,8 @@ X72235736Y-129582733D01*
 X72257177Y-129581680D01*
 X72278618Y-129582733D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X67337691Y-127041053D02*
 G01*
@@ -16404,8 +16404,8 @@ X66803750Y-127040000D01*
 X67316250Y-127040000D01*
 X67337691Y-127041053D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X67337691Y-125466053D02*
 G01*
@@ -16478,8 +16478,8 @@ X66803750Y-125465000D01*
 X67316250Y-125465000D01*
 X67337691Y-125466053D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X70423833Y-129669883D02*
 G01*
@@ -16552,8 +16552,8 @@ X70394917Y-129669883D01*
 X70409375Y-129669173D01*
 X70423833Y-129669883D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X71109727Y-128983989D02*
 G01*
@@ -16626,8 +16626,8 @@ X71080811Y-128983989D01*
 X71095269Y-128983279D01*
 X71109727Y-128983989D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X29996958Y-124660710D02*
 G01*
@@ -16700,8 +16700,8 @@ X29637500Y-124660000D01*
 X29982500Y-124660000D01*
 X29996958Y-124660710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X29996958Y-123690710D02*
 G01*
@@ -16774,8 +16774,8 @@ X29637500Y-123690000D01*
 X29982500Y-123690000D01*
 X29996958Y-123690710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X55076958Y-141525710D02*
 G01*
@@ -16848,8 +16848,8 @@ X54717500Y-141525000D01*
 X55062500Y-141525000D01*
 X55076958Y-141525710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X55076958Y-142495710D02*
 G01*
@@ -16922,8 +16922,8 @@ X54717500Y-142495000D01*
 X55062500Y-142495000D01*
 X55076958Y-142495710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X35870886Y-111592830D02*
 G01*
@@ -16996,8 +16996,8 @@ X35841970Y-111592830D01*
 X35856428Y-111592120D01*
 X35870886Y-111592830D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X36556780Y-110906936D02*
 G01*
@@ -17070,8 +17070,8 @@ X36527864Y-110906936D01*
 X36542322Y-110906226D01*
 X36556780Y-110906936D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X35058077Y-110293274D02*
 G01*
@@ -17144,8 +17144,8 @@ X35015195Y-110293274D01*
 X35036636Y-110292221D01*
 X35058077Y-110293274D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X36171771Y-109179580D02*
 G01*
@@ -17218,8 +17218,8 @@ X36128889Y-109179580D01*
 X36150330Y-109178527D01*
 X36171771Y-109179580D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X30316958Y-110150710D02*
 G01*
@@ -17292,8 +17292,8 @@ X29957500Y-110150000D01*
 X30302500Y-110150000D01*
 X30316958Y-110150710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X30316958Y-111120710D02*
 G01*
@@ -17366,8 +17366,8 @@ X29957500Y-111120000D01*
 X30302500Y-111120000D01*
 X30316958Y-111120710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X33629727Y-112573989D02*
 G01*
@@ -17440,8 +17440,8 @@ X33600811Y-112573989D01*
 X33615269Y-112573279D01*
 X33629727Y-112573989D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X32943833Y-113259883D02*
 G01*
@@ -17514,8 +17514,8 @@ X32914917Y-113259883D01*
 X32929375Y-113259173D01*
 X32943833Y-113259883D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X55076958Y-143500710D02*
 G01*
@@ -17588,8 +17588,8 @@ X54717500Y-143500000D01*
 X55062500Y-143500000D01*
 X55076958Y-143500710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X55076958Y-144470710D02*
 G01*
@@ -17662,8 +17662,8 @@ X54717500Y-144470000D01*
 X55062500Y-144470000D01*
 X55076958Y-144470710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X55096958Y-139570710D02*
 G01*
@@ -17736,8 +17736,8 @@ X54737500Y-139570000D01*
 X55082500Y-139570000D01*
 X55096958Y-139570710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X55096958Y-140540710D02*
 G01*
@@ -17810,8 +17810,8 @@ X54737500Y-140540000D01*
 X55082500Y-140540000D01*
 X55096958Y-140540710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X32829727Y-111693989D02*
 G01*
@@ -17884,8 +17884,8 @@ X32800811Y-111693989D01*
 X32815269Y-111693279D01*
 X32829727Y-111693989D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X32143833Y-112379883D02*
 G01*
@@ -17958,8 +17958,8 @@ X32114917Y-112379883D01*
 X32129375Y-112379173D01*
 X32143833Y-112379883D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X31999727Y-110853989D02*
 G01*
@@ -18032,8 +18032,8 @@ X31970811Y-110853989D01*
 X31985269Y-110853279D01*
 X31999727Y-110853989D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X31313833Y-111539883D02*
 G01*
@@ -18106,8 +18106,8 @@ X31284917Y-111539883D01*
 X31299375Y-111539173D01*
 X31313833Y-111539883D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X51336958Y-143155710D02*
 G01*
@@ -18180,8 +18180,8 @@ X50977500Y-143155000D01*
 X51322500Y-143155000D01*
 X51336958Y-143155710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X51336958Y-142185710D02*
 G01*
@@ -18254,8 +18254,8 @@ X50977500Y-142185000D01*
 X51322500Y-142185000D01*
 X51336958Y-142185710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X52747691Y-143931053D02*
 G01*
@@ -18328,8 +18328,8 @@ X52213750Y-143930000D01*
 X52726250Y-143930000D01*
 X52747691Y-143931053D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X52747691Y-142356053D02*
 G01*
@@ -18402,8 +18402,8 @@ X52213750Y-142355000D01*
 X52726250Y-142355000D01*
 X52747691Y-142356053D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X46246958Y-145520710D02*
 G01*
@@ -18476,8 +18476,8 @@ X45937500Y-145520000D01*
 X46232500Y-145520000D01*
 X46246958Y-145520710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X45276958Y-145520710D02*
 G01*
@@ -18550,8 +18550,8 @@ X44967500Y-145520000D01*
 X45262500Y-145520000D01*
 X45276958Y-145520710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X46296958Y-144430710D02*
 G01*
@@ -18624,8 +18624,8 @@ X45987500Y-144430000D01*
 X46282500Y-144430000D01*
 X46296958Y-144430710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X45326958Y-144430710D02*
 G01*
@@ -18698,8 +18698,8 @@ X45017500Y-144430000D01*
 X45312500Y-144430000D01*
 X45326958Y-144430710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X47376958Y-145500710D02*
 G01*
@@ -18772,8 +18772,8 @@ X47017500Y-145500000D01*
 X47362500Y-145500000D01*
 X47376958Y-145500710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X47376958Y-144530710D02*
 G01*
@@ -18846,8 +18846,8 @@ X47017500Y-144530000D01*
 X47362500Y-144530000D01*
 X47376958Y-144530710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X55146958Y-138530710D02*
 G01*
@@ -18920,8 +18920,8 @@ X54787500Y-138530000D01*
 X55132500Y-138530000D01*
 X55146958Y-138530710D01*
 G37*
-%TD.AperFunction*%
-%TA.AperFunction,SMDPad,CuDef*%
+G04 #@! TD.AperFunction*
+G04 #@! TA.AperFunction,SMDPad,CuDef*
 G36*
 X55146958Y-137560710D02*
 G01*
@@ -18994,7 +18994,7 @@ X54787500Y-137560000D01*
 X55132500Y-137560000D01*
 X55146958Y-137560710D01*
 G37*
-%TD.AperFunction*%
+G04 #@! TD.AperFunction*
 D17*
 X87120000Y-137620000D03*
 D18*
diff --git a/bldc-drivr-gerbers/bldc-controller-F_Fab.gbr b/bldc-drivr-gerbers/bldc-controller-F_Fab.gbr
index 6ae389b..529d109 100644
--- a/bldc-drivr-gerbers/bldc-controller-F_Fab.gbr
+++ b/bldc-drivr-gerbers/bldc-controller-F_Fab.gbr
@@ -1,11 +1,11 @@
-%TF.GenerationSoftware,KiCad,Pcbnew,5.1.5-52549c5~84~ubuntu19.10.1*%
-%TF.CreationDate,2019-12-20T00:06:15-05:00*%
-%TF.ProjectId,bldc-controller,626c6463-2d63-46f6-9e74-726f6c6c6572,rev?*%
-%TF.SameCoordinates,Original*%
-%TF.FileFunction,Other,Fab,Top*%
+G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.1.5-52549c5~84~ubuntu19.10.1*
+G04 #@! TF.CreationDate,2019-12-20T00:42:21-05:00*
+G04 #@! TF.ProjectId,bldc-controller,626c6463-2d63-46f6-9e74-726f6c6c6572,rev?*
+G04 #@! TF.SameCoordinates,Original*
+G04 #@! TF.FileFunction,Other,Fab,Top*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.1.5-52549c5~84~ubuntu19.10.1) date 2019-12-20 00:06:15*
+G04 Created by KiCad (PCBNEW 5.1.5-52549c5~84~ubuntu19.10.1) date 2019-12-20 00:42:21*
 %MOMM*%
 %LPD*%
 G04 APERTURE LIST*
diff --git a/bldc-drivr-gerbers/bldc-controller-F_Mask.gts b/bldc-drivr-gerbers/bldc-controller-F_Mask.gts
index d295b17..1ac5dca 100644
--- a/bldc-drivr-gerbers/bldc-controller-F_Mask.gts
+++ b/bldc-drivr-gerbers/bldc-controller-F_Mask.gts
@@ -1,12 +1,12 @@
-%TF.GenerationSoftware,KiCad,Pcbnew,5.1.5-52549c5~84~ubuntu19.10.1*%
-%TF.CreationDate,2019-12-20T00:06:15-05:00*%
-%TF.ProjectId,bldc-controller,626c6463-2d63-46f6-9e74-726f6c6c6572,rev?*%
-%TF.SameCoordinates,Original*%
-%TF.FileFunction,Soldermask,Top*%
-%TF.FilePolarity,Negative*%
+G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.1.5-52549c5~84~ubuntu19.10.1*
+G04 #@! TF.CreationDate,2019-12-20T00:42:21-05:00*
+G04 #@! TF.ProjectId,bldc-controller,626c6463-2d63-46f6-9e74-726f6c6c6572,rev?*
+G04 #@! TF.SameCoordinates,Original*
+G04 #@! TF.FileFunction,Soldermask,Top*
+G04 #@! TF.FilePolarity,Negative*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.1.5-52549c5~84~ubuntu19.10.1) date 2019-12-20 00:06:15*
+G04 Created by KiCad (PCBNEW 5.1.5-52549c5~84~ubuntu19.10.1) date 2019-12-20 00:42:21*
 %MOMM*%
 %LPD*%
 G04 APERTURE LIST*
diff --git a/bldc-drivr-gerbers/bldc-controller-F_Paste.gtp b/bldc-drivr-gerbers/bldc-controller-F_Paste.gtp
index 8f99840..bbba68a 100644
--- a/bldc-drivr-gerbers/bldc-controller-F_Paste.gtp
+++ b/bldc-drivr-gerbers/bldc-controller-F_Paste.gtp
@@ -1,12 +1,12 @@
-%TF.GenerationSoftware,KiCad,Pcbnew,5.1.5-52549c5~84~ubuntu19.10.1*%
-%TF.CreationDate,2019-12-20T00:06:15-05:00*%
-%TF.ProjectId,bldc-controller,626c6463-2d63-46f6-9e74-726f6c6c6572,rev?*%
-%TF.SameCoordinates,Original*%
-%TF.FileFunction,Paste,Top*%
-%TF.FilePolarity,Positive*%
+G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.1.5-52549c5~84~ubuntu19.10.1*
+G04 #@! TF.CreationDate,2019-12-20T00:42:21-05:00*
+G04 #@! TF.ProjectId,bldc-controller,626c6463-2d63-46f6-9e74-726f6c6c6572,rev?*
+G04 #@! TF.SameCoordinates,Original*
+G04 #@! TF.FileFunction,Paste,Top*
+G04 #@! TF.FilePolarity,Positive*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.1.5-52549c5~84~ubuntu19.10.1) date 2019-12-20 00:06:15*
+G04 Created by KiCad (PCBNEW 5.1.5-52549c5~84~ubuntu19.10.1) date 2019-12-20 00:42:21*
 %MOMM*%
 %LPD*%
 G04 APERTURE LIST*
diff --git a/bldc-drivr-gerbers/bldc-controller-F_SilkS.gto b/bldc-drivr-gerbers/bldc-controller-F_SilkS.gto
index 8e35d29..0597679 100644
--- a/bldc-drivr-gerbers/bldc-controller-F_SilkS.gto
+++ b/bldc-drivr-gerbers/bldc-controller-F_SilkS.gto
@@ -1,12 +1,12 @@
-%TF.GenerationSoftware,KiCad,Pcbnew,5.1.5-52549c5~84~ubuntu19.10.1*%
-%TF.CreationDate,2019-12-20T00:06:15-05:00*%
-%TF.ProjectId,bldc-controller,626c6463-2d63-46f6-9e74-726f6c6c6572,rev?*%
-%TF.SameCoordinates,Original*%
-%TF.FileFunction,Legend,Top*%
-%TF.FilePolarity,Positive*%
+G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.1.5-52549c5~84~ubuntu19.10.1*
+G04 #@! TF.CreationDate,2019-12-20T00:42:21-05:00*
+G04 #@! TF.ProjectId,bldc-controller,626c6463-2d63-46f6-9e74-726f6c6c6572,rev?*
+G04 #@! TF.SameCoordinates,Original*
+G04 #@! TF.FileFunction,Legend,Top*
+G04 #@! TF.FilePolarity,Positive*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.1.5-52549c5~84~ubuntu19.10.1) date 2019-12-20 00:06:15*
+G04 Created by KiCad (PCBNEW 5.1.5-52549c5~84~ubuntu19.10.1) date 2019-12-20 00:42:21*
 %MOMM*%
 %LPD*%
 G04 APERTURE LIST*
diff --git a/bldc-drivr-gerbers/bldc-controller-NPTH.drl b/bldc-drivr-gerbers/bldc-controller-NPTH.drl
index 5bdfe33..e585509 100644
--- a/bldc-drivr-gerbers/bldc-controller-NPTH.drl
+++ b/bldc-drivr-gerbers/bldc-controller-NPTH.drl
@@ -1,7 +1,7 @@
 M48
-; DRILL file {KiCad 5.1.5-52549c5~84~ubuntu19.10.1} date Fri 20 Dec 2019 12:06:18 AM EST
+; DRILL file {KiCad 5.1.5-52549c5~84~ubuntu19.10.1} date Fri 20 Dec 2019 12:42:25 AM EST
 ; FORMAT={2:4/ absolute / inch / keep zeros}
-; #@! TF.CreationDate,2019-12-20T00:06:18-05:00
+; #@! TF.CreationDate,2019-12-20T00:42:25-05:00
 ; #@! TF.GenerationSoftware,Kicad,Pcbnew,5.1.5-52549c5~84~ubuntu19.10.1
 ; #@! TF.FileFunction,NonPlated,1,2,NPTH
 FMAT,2
@@ -12,9 +12,9 @@ T2C0.1260
 G90
 G05
 T1
-X010404Y-057569
-X031073Y-047638
 X027461Y-042175
+X031073Y-047638
+X010404Y-057569
 T2
 X012992Y-056693
 X029921Y-042913
diff --git a/bldc-drivr-gerbers/bldc-controller-PTH.drl b/bldc-drivr-gerbers/bldc-controller-PTH.drl
index 2eae9de..17423a2 100644
--- a/bldc-drivr-gerbers/bldc-controller-PTH.drl
+++ b/bldc-drivr-gerbers/bldc-controller-PTH.drl
@@ -1,7 +1,7 @@
 M48
-; DRILL file {KiCad 5.1.5-52549c5~84~ubuntu19.10.1} date Fri 20 Dec 2019 12:06:18 AM EST
+; DRILL file {KiCad 5.1.5-52549c5~84~ubuntu19.10.1} date Fri 20 Dec 2019 12:42:25 AM EST
 ; FORMAT={2:4/ absolute / inch / keep zeros}
-; #@! TF.CreationDate,2019-12-20T00:06:18-05:00
+; #@! TF.CreationDate,2019-12-20T00:42:25-05:00
 ; #@! TF.GenerationSoftware,Kicad,Pcbnew,5.1.5-52549c5~84~ubuntu19.10.1
 ; #@! TF.FileFunction,Plated,1,2,PTH
 FMAT,2
@@ -297,10 +297,10 @@ X008000Y-055138
 X008000Y-056138
 X008000Y-057138
 T5
-X034154Y-048370
-X034154Y-050339
 X034280Y-042461
 X034280Y-044429
+X034154Y-048370
+X034154Y-050339
 X034299Y-054181
 X034299Y-056150
 T0
diff --git a/fp-info-cache b/fp-info-cache
index 8b641b2..eb9c157 100644
--- a/fp-info-cache
+++ b/fp-info-cache
@@ -1,4 +1,4 @@
-12607631312004
+12607631572004
 bldc-parts
 Battery_Connector