added connectors

FaSTTUBe_connectors.kicad_sym

@@ -134,6 +134,29 @@
       )
     )
   )
+  (symbol "M8_4pin_vertical" (extends "M8_4pin_horizontal")
+    (property "Reference" "J" (id 0) (at 5.334 5.08 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Value" "M8_4pin_vertical" (id 1) (at 0 -6.35 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "FaSTTUBe_connectors:M8_718_4pin_vertical" (id 2) (at 0 -8.89 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 0 -11.43 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "ki_keywords" "circular connector" (id 4) (at 0 0 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "ki_description" "4-pin 718 Series connector" (id 5) (at 0 0 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "ki_fp_filters" "DIN*" (id 6) (at 0 0 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+  )
   (symbol "MMNL_2p_horizontal" (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
     (property "Reference" "J" (id 0) (at 0 2.54 0)
       (effects (font (size 1.27 1.27)))
@@ -191,6 +214,102 @@
       )
     )
   )
+  (symbol "MMNL_2p_vertical" (extends "MMNL_2p_horizontal")
+    (property "Reference" "J" (id 0) (at 0 2.54 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Value" "MMNL_2p_vertical" (id 1) (at 0 -5.08 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "FaSTTUBe_connectors:Micro_Mate-N-Lok_2p_vertical" (id 2) (at 0 5.08 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "" (id 3) (at 0 0 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "ki_keywords" "connector mate-n-lok" (id 4) (at 0 0 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "ki_description" "Micro Mate-N-Lok, single row, 2 position, SMD, horizontal" (id 5) (at 0 0 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "ki_fp_filters" "Connector*:*_1x??_*" (id 6) (at 0 0 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+  )
+  (symbol "MMNL_3p_vertical" (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
+    (property "Reference" "J" (id 0) (at 0 5.08 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Value" "MMNL_3p_vertical" (id 1) (at 0 -5.08 0)
+      (effects (font (size 1.27 1.27)))
+    )
+    (property "Footprint" "FaSTTUBe_connectors:Micro_Mate-N-Lok_3p_vertical" (id 2) (at 0 0 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 0 0 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "ki_keywords" "connector" (id 4) (at 0 0 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "ki_description" "Micro Mate-N-Lok, single row, 3 position, SMD, horizontal" (id 5) (at 0 0 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "ki_fp_filters" "Connector*:*_1x??_*" (id 6) (at 0 0 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (symbol "MMNL_3p_vertical_1_1"
+      (arc (start 0 -2.032) (mid -0.508 -2.54) (end 0 -3.048)
+        (stroke (width 0.1524) (type default) (color 0 0 0 0))
+        (fill (type none))
+      )
+      (polyline
+        (pts
+          (xy -1.27 -2.54)
+          (xy -0.508 -2.54)
+        )
+        (stroke (width 0.1524) (type default) (color 0 0 0 0))
+        (fill (type none))
+      )
+      (polyline
+        (pts
+          (xy -1.27 0)
+          (xy -0.508 0)
+        )
+        (stroke (width 0.1524) (type default) (color 0 0 0 0))
+        (fill (type none))
+      )
+      (polyline
+        (pts
+          (xy -1.27 2.54)
+          (xy -0.508 2.54)
+        )
+        (stroke (width 0.1524) (type default) (color 0 0 0 0))
+        (fill (type none))
+      )
+      (arc (start 0 0.508) (mid -0.508 0) (end 0 -0.508)
+        (stroke (width 0.1524) (type default) (color 0 0 0 0))
+        (fill (type none))
+      )
+      (arc (start 0 3.048) (mid -0.508 2.54) (end 0 2.032)
+        (stroke (width 0.1524) (type default) (color 0 0 0 0))
+        (fill (type none))
+      )
+      (pin passive line (at -5.08 2.54 0) (length 3.81)
+        (name "Pin_1" (effects (font (size 1.27 1.27))))
+        (number "1" (effects (font (size 1.27 1.27))))
+      )
+      (pin passive line (at -5.08 0 0) (length 3.81)
+        (name "Pin_2" (effects (font (size 1.27 1.27))))
+        (number "2" (effects (font (size 1.27 1.27))))
+      )
+      (pin passive line (at -5.08 -2.54 0) (length 3.81)
+        (name "Pin_3" (effects (font (size 1.27 1.27))))
+        (number "3" (effects (font (size 1.27 1.27))))
+      )
+    )
+  )
   (symbol "MMNL_4p_horizontal" (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
     (property "Reference" "J" (id 0) (at 0 5.08 0)
       (effects (font (size 1.27 1.27)))

FaSTTUBe_connectors.pretty/M8_718_4pin_horizontal.kicad_mod

@@ -1,8 +1,8 @@
 (footprint "M8_718_4pin_horizontal" (version 20211014) (generator pcbnew)
   (layer "F.Cu")
-  (tedit 62012B89)
+  (tedit 620DC698)
   (attr through_hole)
-  (fp_text reference "REF**" (at 0 3.81) (layer "F.SilkS")
+  (fp_text reference "REF**" (at 0 -4.5) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
     (tstamp b680b4a7-6cb0-40b5-a7ec-a02910a0daa4)
   )
@@ -10,6 +10,30 @@
     (effects (font (size 1 1) (thickness 0.15)))
     (tstamp c5a1761e-3391-4e74-90c9-947fd66e1fc6)
   )
+  (fp_line (start -6.5 7.5) (end -6.5 2) (layer "F.SilkS") (width 0.12) (tstamp 51320c8c-9c4a-48b8-a7b8-e2c8d1f2e5ad))
+  (fp_line (start 5 16.5) (end -5 16.5) (layer "F.SilkS") (width 0.12) (tstamp 7da6dd22-6820-4812-8b65-ceb1440c016d))
+  (fp_line (start 5 7.5) (end 5 16.5) (layer "F.SilkS") (width 0.12) (tstamp 82782dc2-cb84-4d0c-b85e-b3903aca1e13))
+  (fp_line (start -5 16.5) (end -5 7.5) (layer "F.SilkS") (width 0.12) (tstamp 9cab0c4e-2726-433f-a46f-c25156ae2489))
+  (fp_line (start 6.5 7.5) (end -6.5 7.5) (layer "F.SilkS") (width 0.12) (tstamp df1435bb-8018-455d-9925-63e774164119))
+  (fp_line (start 6.5 2) (end 6.5 7.5) (layer "F.SilkS") (width 0.12) (tstamp fd693e1b-ee8d-4a26-aae0-561ba4b09a82))
+  (fp_rect (start -8.5 -3) (end 8.5 17.5) (layer "F.CrtYd") (width 0.05) (fill none) (tstamp b7c09c15-282b-4731-8942-008851172201))
+  (fp_line (start -5 7.5) (end -6.5 7.5) (layer "F.Fab") (width 0.1) (tstamp 133bb99a-82f3-4f77-a20b-451874ac44f4))
+  (fp_line (start -5 16.5) (end 5 16.5) (layer "F.Fab") (width 0.1) (tstamp 2628b16a-8b1e-4398-be45-c147110e73bb))
+  (fp_line (start -5 15) (end 5 14.5) (layer "F.Fab") (width 0.1) (tstamp 296b967f-b7a9-453f-856a-7b874fdca3db))
+  (fp_line (start 5 7.5) (end 6.5 7.5) (layer "F.Fab") (width 0.1) (tstamp 33b48673-c959-4510-b6fa-fd3f7bdb00fd))
+  (fp_line (start -6.5 7.5) (end -6.5 -3) (layer "F.Fab") (width 0.1) (tstamp 3a362cc7-5245-4ed2-8f66-3a6d74eaba39))
+  (fp_line (start -5 8.5) (end 5 8.5) (layer "F.Fab") (width 0.1) (tstamp 3b5147db-69cc-4871-96a7-79c3437a6213))
+  (fp_line (start -5 14) (end 5 13.5) (layer "F.Fab") (width 0.1) (tstamp 430cb5a0-6865-46d0-be60-5d722d3e8d80))
+  (fp_line (start -5 13) (end 5 12.5) (layer "F.Fab") (width 0.1) (tstamp 4e944601-14c5-4478-a9d6-8d2ad19dcc43))
+  (fp_line (start -5 16) (end 5 15.5) (layer "F.Fab") (width 0.1) (tstamp 5d00cbc9-46cb-472e-b705-59da8e971192))
+  (fp_line (start -5 7.5) (end -5 16.5) (layer "F.Fab") (width 0.1) (tstamp 6a5b3eea-de35-4a54-8316-e56ea2a634e4))
+  (fp_line (start -5 10) (end 5 9.5) (layer "F.Fab") (width 0.1) (tstamp 73486422-c87a-4ad4-8fe5-a3ffc70cb20a))
+  (fp_line (start -5 9) (end 5 8.5) (layer "F.Fab") (width 0.1) (tstamp 86c73e16-9c05-4385-b59b-206056f7ac90))
+  (fp_line (start 6.5 7.5) (end 6.5 -3) (layer "F.Fab") (width 0.1) (tstamp cce13a3b-854c-49ae-8b19-551eed5c4f96))
+  (fp_line (start 5 16.5) (end 5 7.5) (layer "F.Fab") (width 0.1) (tstamp d6cc98ff-7d68-4734-afa1-c7dd225e08d3))
+  (fp_line (start 6.5 -3) (end -6.5 -3) (layer "F.Fab") (width 0.1) (tstamp e9581bdc-0c32-481f-b3ec-f590264a37c8))
+  (fp_line (start -5 12) (end 5 11.5) (layer "F.Fab") (width 0.1) (tstamp ed92ba08-98ec-48df-9584-41c899a43f78))
+  (fp_line (start -5 11) (end 5 10.5) (layer "F.Fab") (width 0.1) (tstamp f3642676-ce32-431a-adfa-a8e750bc449d))
   (pad "1" thru_hole circle (at 1.7 0) (size 1.8 1.8) (drill 1.3) (layers *.Cu *.Mask) (tstamp a1c7b1f5-f895-4192-9484-2357882c73e0))
   (pad "2" thru_hole circle (at 1.075 -1.95) (size 1.8 1.8) (drill 1.3) (layers *.Cu *.Mask) (tstamp 681bd495-c396-44ce-92bd-4b397cd48c04))
   (pad "3" thru_hole circle (at -1.7 0) (size 1.8 1.8) (drill 1.3) (layers *.Cu *.Mask) (tstamp be0953c0-632d-4dd2-85e9-4d41239f22d2))

FaSTTUBe_connectors.pretty/M8_718_4pin_vertical.kicad_mod

@@ -0,0 +1,27 @@
+(footprint "M8_718_4pin_vertical" (version 20211014) (generator pcbnew)
+  (layer "F.Cu")
+  (tedit 620DC4C4)
+  (attr through_hole)
+  (fp_text reference "REF**" (at 0 8) (layer "F.SilkS")
+    (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp b680b4a7-6cb0-40b5-a7ec-a02910a0daa4)
+  )
+  (fp_text value "M8_718_4pin" (at 0 -7.62) (layer "F.Fab")
+    (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp c5a1761e-3391-4e74-90c9-947fd66e1fc6)
+  )
+  (fp_arc (start 6 2.5) (mid 0 6.5) (end -6 2.5) (layer "F.SilkS") (width 0.12) (tstamp a7f25f41-0b4c-4430-b6cd-b2160b2db099))
+  (fp_arc (start -6 -2.5) (mid 0 -6.5) (end 6 -2.5) (layer "F.SilkS") (width 0.12) (tstamp b287f145-851e-45cc-b200-e62677b551d5))
+  (fp_circle (center 0 0) (end 8.5 0) (layer "F.CrtYd") (width 0.05) (fill none) (tstamp 422b10b9-e829-44a2-8808-05edd8cb3050))
+  (pad "1" thru_hole circle (at 1.7 0.5) (size 1.8 1.8) (drill 1.3) (layers *.Cu *.Mask) (tstamp a1c7b1f5-f895-4192-9484-2357882c73e0))
+  (pad "2" thru_hole circle (at 1.075 -1.45) (size 1.8 1.8) (drill 1.3) (layers *.Cu *.Mask) (tstamp 681bd495-c396-44ce-92bd-4b397cd48c04))
+  (pad "3" thru_hole circle (at -1.7 0.5) (size 1.8 1.8) (drill 1.3) (layers *.Cu *.Mask) (tstamp be0953c0-632d-4dd2-85e9-4d41239f22d2))
+  (pad "4" thru_hole circle (at -1.075 -1.45) (size 1.8 1.8) (drill 1.3) (layers *.Cu *.Mask) (tstamp a3668681-09b1-48f0-a7b1-f6b24183a469))
+  (pad "5" thru_hole circle (at 6.25 0) (size 4 4) (drill 3) (layers *.Cu *.Mask) (tstamp 3451168c-3c76-4628-aee4-7c231bd100c3))
+  (pad "5" thru_hole circle (at -6.25 0) (size 4 4) (drill 3) (layers *.Cu *.Mask) (tstamp 563c12e4-8f8c-446c-a11f-94f5aa93b994))
+  (model "${KIPRJMOD}/libraries/FaSTTUBe_connectors_3dmodels/M8_718_4pin_vertical.stp"
+    (offset (xyz 0 0 0.6))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 90 90 90))
+  )
+)

FaSTTUBe_connectors.pretty/Micro_Mate-N-Lok_2p_horizontal.kicad_mod

@@ -1,17 +1,42 @@
-(module "Micro Mate-N-Lok 2-Pol" (layer F.Cu) (tedit 5CE9F075)
-  (fp_text reference REF** (at 0 7.6) (layer F.SilkS)
+(footprint "Micro_Mate-N-Lok_2p_horizontal" (version 20211014) (generator pcbnew)
+  (layer "F.Cu")
+  (tedit 6216E086)
+  (attr smd)
+  (fp_text reference "REF**" (at 0 -8.25 unlocked) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 42713045-fffd-4b2d-ae1e-7232d705fb12)
   )
-  (fp_text value "Micro Mate-N-Lok 2-Pol" (at 0 -6.22) (layer F.Fab)
+  (fp_text value "Micro_Mate-N-Lok_2p_horizontal" (at 0 1 unlocked) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp c0515cd2-cdaa-467e-8354-0f6eadfa35c9)
+  )
+  (fp_text user "${REFERENCE}" (at 0 0 unlocked) (layer "F.Fab")
+    (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 1bf544e3-5940-4576-9291-2464e95c0ee2)
+  )
+  (fp_line (start -4 -4.5) (end -2.5 -4.5) (layer "F.SilkS") (width 0.12) (tstamp 2923d83c-3334-4b85-acfa-e9f2eb6f5eb5))
+  (fp_line (start 4 4.75) (end 4 1.25) (layer "F.SilkS") (width 0.12) (tstamp 3836c63d-ca60-4e8e-a339-40980bdccc31))
+  (fp_line (start -0.5 -4.5) (end 0.5 -4.5) (layer "F.SilkS") (width 0.12) (tstamp 5e066231-f8d2-43bf-bff3-80c6fb0c9c86))
+  (fp_line (start -4 4.75) (end 4 4.75) (layer "F.SilkS") (width 0.12) (tstamp 638492c1-39c4-4e69-a3a1-232b324e5b21))
+  (fp_line (start -4 -1.25) (end -4 -4.5) (layer "F.SilkS") (width 0.12) (tstamp 68d14432-223b-47bb-bd26-18873cfb3df2))
+  (fp_line (start -4 -1.25) (end -5 -1.25) (layer "F.SilkS") (width 0.12) (tstamp 721eced1-7601-448b-b032-57ae840a5bc6))
+  (fp_line (start -4 1.25) (end -4 4.75) (layer "F.SilkS") (width 0.12) (tstamp 75ada5c7-eed3-466b-a900-bb7cf3da6f9e))
+  (fp_line (start 4 1.25) (end 5 1.25) (layer "F.SilkS") (width 0.12) (tstamp 8e73e860-7df5-47ee-9d85-a51cffff4073))
+  (fp_line (start -5 1.25) (end -4 1.25) (layer "F.SilkS") (width 0.12) (tstamp 908ce94b-b837-4c84-b759-ec4fbb006eea))
+  (fp_line (start 2.5 -4.5) (end 4 -4.5) (layer "F.SilkS") (width 0.12) (tstamp ba3030b2-37eb-4eb2-b7ee-c2f135251592))
+  (fp_line (start 5 -1.25) (end 4 -1.25) (layer "F.SilkS") (width 0.12) (tstamp e7987f0c-e4c6-4aae-a5d6-e1cfea057719))
+  (fp_line (start 4 -1.25) (end 4 -4.5) (layer "F.SilkS") (width 0.12) (tstamp f1084b0d-b992-4d4c-9074-1c148a908ad5))
+  (fp_circle (center 5 -5.5) (end 5.5 -5.5) (layer "F.SilkS") (width 0.12) (fill solid) (tstamp 63489ebf-0f52-43a6-a0ab-158b1a7d4988))
+  (fp_rect (start -8.5 -7) (end 8.5 4.75) (layer "F.CrtYd") (width 0.05) (fill none) (tstamp 312474c5-a081-4cd1-b2e6-730f0718514a))
+  (fp_line (start 4.318 1.27) (end 5.08 1.27) (layer "F.Fab") (width 0.1) (tstamp c6462399-f2e4-4f1a-b34a-b49a04c8bdb9))
+  (fp_line (start 4.318 1.778) (end 4.318 1.27) (layer "F.Fab") (width 0.1) (tstamp f284b1e2-75a4-4a3f-a5f4-6f05f15fb4f5))
+  (pad "" smd roundrect (at -5.2 0) (size 3.43 1.65) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1f3003e6-dce5-420f-906b-3f1e92b67249))
+  (pad "" smd roundrect (at 5.2 0) (size 3.43 1.65) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 378af8b4-af3d-46e7-89ae-deff12ca9067))
+  (pad "1" smd roundrect (at 1.5 -5.48) (size 1.27 2.92) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ebd06df3-d52b-4cff-99a2-a771df6d3733))
+  (pad "2" smd roundrect (at -1.5 -5.48) (size 1.27 2.92) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8c0807a7-765b-4fa5-baaa-e09a2b610e6b))
+  (model "${KIPRJMOD}/libraries/FaSTTUBe_connectors_3dmodels/Micro_Mate-N-Lok_2p_horizontal.stp"
+    (offset (xyz 0 -4.6 2.5))
+    (scale (xyz 1 1 1))
+    (rotate (xyz -90 0 0))
   )
-  (fp_line (start 0 -5.4) (end 5 -5.4) (layer F.CrtYd) (width 0.15))
-  (fp_line (start 5 -5.4) (end 5 6.2) (layer F.CrtYd) (width 0.15))
-  (fp_line (start 5 6.2) (end -5 6.2) (layer F.CrtYd) (width 0.15))
-  (fp_line (start -5 6.2) (end -5 -5.4) (layer F.CrtYd) (width 0.15))
-  (fp_line (start -5 -5.4) (end 0 -5.4) (layer F.CrtYd) (width 0.15))
-  (pad 1 smd rect (at -1.5 -3.88) (size 1.27 3) (layers F.Cu F.Paste F.Mask))
-  (pad 2 smd rect (at 1.5 -3.88) (size 1.27 3) (layers F.Cu F.Paste F.Mask))
-  (pad "" smd rect (at -5.2 1.6) (size 3.43 1.65) (layers F.Cu F.Paste F.Mask))
-  (pad "" smd rect (at 5.21 1.6) (size 3.43 1.65) (layers F.Cu F.Paste F.Mask))
 )

FaSTTUBe_connectors.pretty/Micro_Mate-N-Lok_2p_vertical.kicad_mod

@@ -1,6 +1,6 @@
 (footprint "Micro_Mate-N-Lok_2p_vertical" (version 20211014) (generator pcbnew)
   (layer "F.Cu")
-  (tedit 62086176)
+  (tedit 6216DD4A)
   (attr smd)
   (fp_text reference "REF**" (at 0 3.81 unlocked) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
@@ -14,22 +14,26 @@
     (effects (font (size 1 1) (thickness 0.15)))
     (tstamp 1bf544e3-5940-4576-9291-2464e95c0ee2)
   )
-  (fp_line (start -3.81 2.54) (end 3.81 2.54) (layer "F.SilkS") (width 0.12) (tstamp 1c052668-6749-425a-9a77-35f046c8aa39))
-  (fp_line (start 3.81 2.54) (end 3.81 1.27) (layer "F.SilkS") (width 0.12) (tstamp 25ca9482-069d-43de-b77e-6f2ad77fa017))
-  (fp_line (start 3.81 -2.54) (end 3.81 -1.27) (layer "F.SilkS") (width 0.12) (tstamp 2b894b8a-c098-4d9d-be0f-2ef41dea274e))
-  (fp_line (start -3.81 -2.54) (end -2.54 -2.54) (layer "F.SilkS") (width 0.12) (tstamp 3742a313-c63e-4807-a7bf-be5a0ae2c781))
-  (fp_line (start -0.508 -3.302) (end 0.508 -3.302) (layer "F.SilkS") (width 0.12) (tstamp 4ba06b66-7669-4c70-b585-f5d4c9c33527))
-  (fp_line (start -3.81 -1.27) (end -3.81 -2.54) (layer "F.SilkS") (width 0.12) (tstamp 5e27f565-c85a-4f3b-9862-58c0accdd5e3))
-  (fp_line (start -3.81 2.54) (end -3.81 1.27) (layer "F.SilkS") (width 0.12) (tstamp d35d7027-ac1b-44b2-9664-3d8a37ee0f4e))
-  (fp_line (start 2.54 -2.54) (end 3.81 -2.54) (layer "F.SilkS") (width 0.12) (tstamp e8558fbd-ea42-43a6-966a-7bd304bdfaad))
-  (fp_circle (center -5.08 -3.81) (end -4.58 -3.81) (layer "F.SilkS") (width 0.12) (fill solid) (tstamp 63489ebf-0f52-43a6-a0ab-158b1a7d4988))
+  (fp_line (start -0.5 -3.25) (end 0.5 -3.25) (layer "F.SilkS") (width 0.12) (tstamp 16b71e23-859c-4e16-8af1-5d30a5c2b726))
+  (fp_line (start -3.75 2.54) (end 3.75 2.5) (layer "F.SilkS") (width 0.12) (tstamp 1afdd221-608b-420b-8eb2-861de263adb5))
+  (fp_line (start -3.75 -2.5) (end -2.5 -2.5) (layer "F.SilkS") (width 0.12) (tstamp 3742a313-c63e-4807-a7bf-be5a0ae2c781))
+  (fp_line (start -3.75 -1.25) (end -3.75 -2.5) (layer "F.SilkS") (width 0.12) (tstamp 5e27f565-c85a-4f3b-9862-58c0accdd5e3))
+  (fp_line (start 3.75 1.25) (end 5 1.25) (layer "F.SilkS") (width 0.12) (tstamp 5e3106c4-aefe-4ef5-8aa8-6f8a9c16fe7d))
+  (fp_line (start -3.75 1.25) (end -5 1.25) (layer "F.SilkS") (width 0.12) (tstamp 8c5a6fce-194d-4416-8856-cb66ff818319))
+  (fp_line (start 3.75 -1.25) (end 5 -1.25) (layer "F.SilkS") (width 0.12) (tstamp 917603e2-441d-4888-a037-0b830871fafd))
+  (fp_line (start 3.75 2.5) (end 3.75 1.25) (layer "F.SilkS") (width 0.12) (tstamp 9d7822b4-339e-43c0-b115-d4b16189cc93))
+  (fp_line (start -3.75 -1.25) (end -5 -1.25) (layer "F.SilkS") (width 0.12) (tstamp a6e79250-4ea1-4a1f-b168-c1d347acb43a))
+  (fp_line (start 3.75 -2.5) (end 2.5 -2.5) (layer "F.SilkS") (width 0.12) (tstamp b4e13e2a-b1f5-417e-8d80-b3e4cb5e5e55))
+  (fp_line (start 3.75 -1.25) (end 3.75 -2.5) (layer "F.SilkS") (width 0.12) (tstamp d2fb2423-7bf4-4222-994d-25a9683eab67))
+  (fp_line (start -3.75 1.25) (end -3.75 2.54) (layer "F.SilkS") (width 0.12) (tstamp ed74c2b7-a3ac-4886-84f5-377b5e1bbbfc))
+  (fp_circle (center 4.75 -3.5) (end 5.25 -3.5) (layer "F.SilkS") (width 0.12) (fill solid) (tstamp 63489ebf-0f52-43a6-a0ab-158b1a7d4988))
   (fp_rect (start -7.62 -5.08) (end 7.62 2.54) (layer "F.CrtYd") (width 0.05) (fill none) (tstamp 312474c5-a081-4cd1-b2e6-730f0718514a))
   (fp_line (start 4.318 1.27) (end 5.08 1.27) (layer "F.Fab") (width 0.1) (tstamp c6462399-f2e4-4f1a-b34a-b49a04c8bdb9))
   (fp_line (start 4.318 1.778) (end 4.318 1.27) (layer "F.Fab") (width 0.1) (tstamp f284b1e2-75a4-4a3f-a5f4-6f05f15fb4f5))
   (pad "" smd roundrect (at -5.2 0) (size 3.43 1.65) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1f3003e6-dce5-420f-906b-3f1e92b67249))
   (pad "" smd roundrect (at 5.2 0) (size 3.43 1.65) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 378af8b4-af3d-46e7-89ae-deff12ca9067))
-  (pad "1" smd roundrect (at -1.5 -3.2) (size 1.27 2.54) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ebd06df3-d52b-4cff-99a2-a771df6d3733))
-  (pad "2" smd roundrect (at 1.5 -3.2) (size 1.27 2.54) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8c0807a7-765b-4fa5-baaa-e09a2b610e6b))
+  (pad "1" smd roundrect (at 1.5 -3.2) (size 1.27 2.54) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8c0807a7-765b-4fa5-baaa-e09a2b610e6b))
+  (pad "2" smd roundrect (at -1.5 -3.2) (size 1.27 2.54) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ebd06df3-d52b-4cff-99a2-a771df6d3733))
   (model "${KIPRJMOD}/libraries/FaSTTUBe_connectors_3dmodels/Micro_Mate-N-Lok_2p_vertical.stp"
     (offset (xyz 0 0 9.24))
     (scale (xyz 1 1 1))

FaSTTUBe_connectors.pretty/Micro_Mate-N-Lok_3p_horizontal.kicad_mod

@@ -0,0 +1,44 @@
+(footprint "Micro_Mate-N-Lok_3p_horizontal" (version 20211014) (generator pcbnew)
+  (layer "F.Cu")
+  (tedit 6216DEDB)
+  (attr smd)
+  (fp_text reference "REF**" (at 0 -8.25 unlocked) (layer "F.SilkS")
+    (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 42713045-fffd-4b2d-ae1e-7232d705fb12)
+  )
+  (fp_text value "Micro_Mate-N-Lok_3p_horizontal" (at 0 1 unlocked) (layer "F.Fab")
+    (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp c0515cd2-cdaa-467e-8354-0f6eadfa35c9)
+  )
+  (fp_text user "${REFERENCE}" (at 0 0 unlocked) (layer "F.Fab")
+    (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 1bf544e3-5940-4576-9291-2464e95c0ee2)
+  )
+  (fp_line (start -5.5 -4.5) (end -4 -4.5) (layer "F.SilkS") (width 0.12) (tstamp 2923d83c-3334-4b85-acfa-e9f2eb6f5eb5))
+  (fp_line (start 5.5 4.75) (end 5.5 1.25) (layer "F.SilkS") (width 0.12) (tstamp 3836c63d-ca60-4e8e-a339-40980bdccc31))
+  (fp_line (start -5.5 -1.25) (end -5.5 -4.5) (layer "F.SilkS") (width 0.12) (tstamp 68d14432-223b-47bb-bd26-18873cfb3df2))
+  (fp_line (start -5.5 -1.25) (end -6.5 -1.25) (layer "F.SilkS") (width 0.12) (tstamp 721eced1-7601-448b-b032-57ae840a5bc6))
+  (fp_line (start -5.5 1.25) (end -5.5 4.75) (layer "F.SilkS") (width 0.12) (tstamp 75ada5c7-eed3-466b-a900-bb7cf3da6f9e))
+  (fp_line (start 1 -4.5) (end 2 -4.5) (layer "F.SilkS") (width 0.12) (tstamp 853b4aa5-bf64-4f10-b1c5-492731c47e3b))
+  (fp_line (start 5.5 1.25) (end 6.5 1.25) (layer "F.SilkS") (width 0.12) (tstamp 8e73e860-7df5-47ee-9d85-a51cffff4073))
+  (fp_line (start -6.5 1.25) (end -5.5 1.25) (layer "F.SilkS") (width 0.12) (tstamp 908ce94b-b837-4c84-b759-ec4fbb006eea))
+  (fp_line (start 4 -4.5) (end 5.5 -4.5) (layer "F.SilkS") (width 0.12) (tstamp ba3030b2-37eb-4eb2-b7ee-c2f135251592))
+  (fp_line (start -2 -4.5) (end -1 -4.5) (layer "F.SilkS") (width 0.12) (tstamp d0583253-7f1c-498c-afba-93bf9b28c781))
+  (fp_line (start -5.5 4.75) (end 5.5 4.75) (layer "F.SilkS") (width 0.12) (tstamp d9b138bc-0203-4547-9bd8-5f8e532ba1ac))
+  (fp_line (start 6.5 -1.25) (end 5.5 -1.25) (layer "F.SilkS") (width 0.12) (tstamp e7987f0c-e4c6-4aae-a5d6-e1cfea057719))
+  (fp_line (start 5.5 -1.25) (end 5.5 -4.5) (layer "F.SilkS") (width 0.12) (tstamp f1084b0d-b992-4d4c-9074-1c148a908ad5))
+  (fp_circle (center 6.25 -5.5) (end 6.75 -5.5) (layer "F.SilkS") (width 0.12) (fill solid) (tstamp 63489ebf-0f52-43a6-a0ab-158b1a7d4988))
+  (fp_rect (start -8.5 -7) (end 8.5 4.75) (layer "F.CrtYd") (width 0.05) (fill none) (tstamp 312474c5-a081-4cd1-b2e6-730f0718514a))
+  (fp_line (start 4.318 1.27) (end 5.08 1.27) (layer "F.Fab") (width 0.1) (tstamp c6462399-f2e4-4f1a-b34a-b49a04c8bdb9))
+  (fp_line (start 4.318 1.778) (end 4.318 1.27) (layer "F.Fab") (width 0.1) (tstamp f284b1e2-75a4-4a3f-a5f4-6f05f15fb4f5))
+  (pad "" smd roundrect (at -6.7 0) (size 3.43 1.65) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1f3003e6-dce5-420f-906b-3f1e92b67249))
+  (pad "" smd roundrect (at 6.7 0) (size 3.43 1.65) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 378af8b4-af3d-46e7-89ae-deff12ca9067))
+  (pad "1" smd roundrect (at 3 -5.48) (size 1.27 2.92) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ebd06df3-d52b-4cff-99a2-a771df6d3733))
+  (pad "2" smd roundrect (at 0 -5.48) (size 1.27 2.92) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8c0807a7-765b-4fa5-baaa-e09a2b610e6b))
+  (pad "3" smd roundrect (at -3 -5.48) (size 1.27 2.92) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 23e32b5c-4ca6-4614-a426-44d605a7d8fd))
+  (model "${KIPRJMOD}/libraries/FaSTTUBe_connectors_3dmodels/Micro_Mate-N-Lok_3p_horizontal.stp"
+    (offset (xyz 0 -4.6 2.5))
+    (scale (xyz 1 1 1))
+    (rotate (xyz -90 0 0))
+  )
+)

FaSTTUBe_connectors.pretty/Micro_Mate-N-Lok_3p_vertical.kicad_mod

@@ -1,6 +1,6 @@
 (footprint "Micro_Mate-N-Lok_3p_vertical" (version 20211014) (generator pcbnew)
   (layer "F.Cu")
-  (tedit 62086156)
+  (tedit 6216DD1B)
   (attr smd)
   (fp_text reference "REF**" (at 0 3.81 unlocked) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
@@ -14,26 +14,30 @@
     (effects (font (size 1 1) (thickness 0.15)))
     (tstamp 1bf544e3-5940-4576-9291-2464e95c0ee2)
   )
-  (fp_line (start 5.588 2.54) (end -5.588 2.54) (layer "F.SilkS") (width 0.12) (tstamp 12422a89-3d0c-485c-9386-f77121fd68fd))
-  (fp_line (start 5.588 1.27) (end 5.588 2.54) (layer "F.SilkS") (width 0.12) (tstamp 1d9cdadc-9036-4a95-b6db-fa7b3b74c869))
-  (fp_line (start 4.064 -2.54) (end 5.588 -2.54) (layer "F.SilkS") (width 0.12) (tstamp 31e08896-1992-4725-96d9-9d2728bca7a3))
-  (fp_line (start -5.588 -1.27) (end -5.588 -2.54) (layer "F.SilkS") (width 0.12) (tstamp 378af8b4-af3d-46e7-89ae-deff12ca9067))
-  (fp_line (start -1.016 -2.54) (end -1.016 -3.048) (layer "F.SilkS") (width 0.12) (tstamp 5114c7bf-b955-49f3-a0a8-4b954c81bde0))
-  (fp_line (start 1.016 -3.048) (end 1.016 -2.54) (layer "F.SilkS") (width 0.12) (tstamp 5ca4be1c-537e-4a4a-b344-d0c8ffde8546))
-  (fp_line (start -5.588 -2.54) (end -4.064 -2.54) (layer "F.SilkS") (width 0.12) (tstamp 6d26d68f-1ca7-4ff3-b058-272f1c399047))
-  (fp_line (start 1.016 -2.54) (end 2.032 -2.54) (layer "F.SilkS") (width 0.12) (tstamp aa2ea573-3f20-43c1-aa99-1f9c6031a9aa))
-  (fp_line (start -2.032 -2.54) (end -1.016 -2.54) (layer "F.SilkS") (width 0.12) (tstamp b7199d9b-bebb-4100-9ad3-c2bd31e21d65))
-  (fp_line (start -5.588 2.54) (end -5.588 1.27) (layer "F.SilkS") (width 0.12) (tstamp c830e3bc-dc64-4f65-8f47-3b106bae2807))
-  (fp_line (start 5.588 -2.54) (end 5.588 -1.27) (layer "F.SilkS") (width 0.12) (tstamp f2c93195-af12-4d3e-acdf-bdd0ff675c24))
-  (fp_circle (center -6.35 -3.81) (end -5.85 -3.81) (layer "F.SilkS") (width 0.12) (fill solid) (tstamp 63489ebf-0f52-43a6-a0ab-158b1a7d4988))
-  (fp_rect (start -8.89 -5.08) (end 8.89 2.54) (layer "F.CrtYd") (width 0.05) (fill none) (tstamp 312474c5-a081-4cd1-b2e6-730f0718514a))
+  (fp_line (start 5.5 -2.5) (end 4 -2.5) (layer "F.SilkS") (width 0.12) (tstamp 0239a7dc-4f11-4dd5-9564-b10e3cb51ffa))
+  (fp_line (start 1 -2.5) (end 2 -2.5) (layer "F.SilkS") (width 0.12) (tstamp 26b5b06d-6731-4f1d-a50f-a1a758285eac))
+  (fp_line (start 5.5 2.5) (end 5.5 1.25) (layer "F.SilkS") (width 0.12) (tstamp 3836c63d-ca60-4e8e-a339-40980bdccc31))
+  (fp_line (start -2 -2.5) (end -1 -2.5) (layer "F.SilkS") (width 0.12) (tstamp 466f8d1c-c448-4a97-87ec-4e94847952fc))
+  (fp_line (start 1 -3) (end 1 -2.5) (layer "F.SilkS") (width 0.12) (tstamp 4925c46f-467c-40b3-95db-ef4df267cd8b))
+  (fp_line (start -5.5 -1.25) (end -5.5 -2.5) (layer "F.SilkS") (width 0.12) (tstamp 68d14432-223b-47bb-bd26-18873cfb3df2))
+  (fp_line (start -5.5 -1.25) (end -6.5 -1.25) (layer "F.SilkS") (width 0.12) (tstamp 721eced1-7601-448b-b032-57ae840a5bc6))
+  (fp_line (start -5.5 1.25) (end -5.5 2.5) (layer "F.SilkS") (width 0.12) (tstamp 75ada5c7-eed3-466b-a900-bb7cf3da6f9e))
+  (fp_line (start 5.5 1.25) (end 6.5 1.25) (layer "F.SilkS") (width 0.12) (tstamp 8e73e860-7df5-47ee-9d85-a51cffff4073))
+  (fp_line (start -6.5 1.25) (end -5.5 1.25) (layer "F.SilkS") (width 0.12) (tstamp 908ce94b-b837-4c84-b759-ec4fbb006eea))
+  (fp_line (start -1 -2.5) (end -1 -3) (layer "F.SilkS") (width 0.12) (tstamp 947acefe-ac33-4206-9de3-25b50b4731dd))
+  (fp_line (start -5.5 2.5) (end 5.5 2.5) (layer "F.SilkS") (width 0.12) (tstamp d9b138bc-0203-4547-9bd8-5f8e532ba1ac))
+  (fp_line (start 6.5 -1.25) (end 5.5 -1.25) (layer "F.SilkS") (width 0.12) (tstamp e7987f0c-e4c6-4aae-a5d6-e1cfea057719))
+  (fp_line (start -5.5 -2.5) (end -4 -2.5) (layer "F.SilkS") (width 0.12) (tstamp ed2acee5-b6b0-4723-bb74-ad84b2a662e5))
+  (fp_line (start 5.5 -1.25) (end 5.5 -2.5) (layer "F.SilkS") (width 0.12) (tstamp f1084b0d-b992-4d4c-9074-1c148a908ad5))
+  (fp_circle (center 6.25 -3.5) (end 6.75 -3.5) (layer "F.SilkS") (width 0.12) (fill solid) (tstamp 63489ebf-0f52-43a6-a0ab-158b1a7d4988))
+  (fp_rect (start -8.5 -4.75) (end 8.5 2.75) (layer "F.CrtYd") (width 0.05) (fill none) (tstamp 312474c5-a081-4cd1-b2e6-730f0718514a))
   (fp_line (start 4.318 1.27) (end 5.08 1.27) (layer "F.Fab") (width 0.1) (tstamp c6462399-f2e4-4f1a-b34a-b49a04c8bdb9))
   (fp_line (start 4.318 1.778) (end 4.318 1.27) (layer "F.Fab") (width 0.1) (tstamp f284b1e2-75a4-4a3f-a5f4-6f05f15fb4f5))
   (pad "" smd roundrect (at -6.7 0) (size 3.43 1.65) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 1f3003e6-dce5-420f-906b-3f1e92b67249))
   (pad "" smd roundrect (at 6.7 0) (size 3.43 1.65) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 378af8b4-af3d-46e7-89ae-deff12ca9067))
-  (pad "1" smd roundrect (at -3 -3.2) (size 1.27 2.54) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ebd06df3-d52b-4cff-99a2-a771df6d3733))
+  (pad "1" smd roundrect (at 3 -3.2) (size 1.27 2.54) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 23e32b5c-4ca6-4614-a426-44d605a7d8fd))
   (pad "2" smd roundrect (at 0 -3.2) (size 1.27 2.54) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 8c0807a7-765b-4fa5-baaa-e09a2b610e6b))
-  (pad "3" smd roundrect (at 3 -3.2) (size 1.27 2.54) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp 23e32b5c-4ca6-4614-a426-44d605a7d8fd))
+  (pad "3" smd roundrect (at -3 -3.2) (size 1.27 2.54) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) (tstamp ebd06df3-d52b-4cff-99a2-a771df6d3733))
   (model "${KIPRJMOD}/libraries/FaSTTUBe_connectors_3dmodels/Micro_Mate-N-Lok_3p_vertical.stp"
     (offset (xyz 0 0 9.24))
     (scale (xyz 1 1 1))

FaSTTUBe_connectors.pretty/Micro_Mate-N-Lok_4p_horizontal.kicad_mod

@@ -1,19 +1,24 @@
-(module "Micro Mate-N-Lok 4-Pol" (layer F.Cu) (tedit 5CE9F407)
-  (fp_text reference REF** (at 0 6) (layer F.SilkS)
+(footprint "Micro_Mate-N-Lok_4p_horizontal" (version 20211014) (generator pcbnew)
+  (layer "F.Cu")
+  (tedit 5CE9F407)
+  (attr through_hole)
+  (fp_text reference "REF**" (at 0 6) (layer "F.SilkS")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 28c42959-8e72-4709-83e0-fbb99eade23c)
   )
-  (fp_text value "Micro Mate-N-Lok 4-Pol" (at 0 -8) (layer F.Fab)
+  (fp_text value "Micro Mate-N-Lok 4-Pol" (at 0 -8) (layer "F.Fab")
     (effects (font (size 1 1) (thickness 0.15)))
+    (tstamp 83616a1b-53cb-4bc4-bfc7-a340c75ffaa4)
   )
-  (fp_line (start 0 -6.6) (end 8 -6.6) (layer F.CrtYd) (width 0.15))
-  (fp_line (start 8 -6.6) (end 8 4.6) (layer F.CrtYd) (width 0.15))
-  (fp_line (start 8 4.6) (end -8 4.6) (layer F.CrtYd) (width 0.15))
-  (fp_line (start -8 4.6) (end -8 -6.6) (layer F.CrtYd) (width 0.15))
-  (fp_line (start -8 -6.6) (end 0 -6.6) (layer F.CrtYd) (width 0.15))
-  (pad "" smd rect (at -8.2 0.4) (size 3.43 1.65) (layers F.Cu F.Paste F.Mask))
-  (pad 4 smd rect (at 4.5 -5.08) (size 1.27 3) (layers F.Cu F.Paste F.Mask))
-  (pad 3 smd rect (at 1.5 -5.08) (size 1.27 3) (layers F.Cu F.Paste F.Mask))
-  (pad 2 smd rect (at -1.5 -5.08) (size 1.27 3) (layers F.Cu F.Paste F.Mask))
-  (pad 1 smd rect (at -4.5 -5.08) (size 1.27 3) (layers F.Cu F.Paste F.Mask))
-  (pad "" smd rect (at 8.21 0.4) (size 3.43 1.65) (layers F.Cu F.Paste F.Mask))
+  (fp_line (start -8 -6.6) (end 0 -6.6) (layer "F.CrtYd") (width 0.15) (tstamp 028825a5-a5a1-4471-a5f1-08090406bcd8))
+  (fp_line (start 8 4.6) (end -8 4.6) (layer "F.CrtYd") (width 0.15) (tstamp 7134724f-277a-4c58-bbec-7ceaf30b9ed0))
+  (fp_line (start -8 4.6) (end -8 -6.6) (layer "F.CrtYd") (width 0.15) (tstamp 80308ea8-7152-4634-99bf-492db3c9f37a))
+  (fp_line (start 8 -6.6) (end 8 4.6) (layer "F.CrtYd") (width 0.15) (tstamp 91fb974e-99de-4e0c-bee5-7a6f88905951))
+  (fp_line (start 0 -6.6) (end 8 -6.6) (layer "F.CrtYd") (width 0.15) (tstamp cfc25d70-2748-49fe-bb69-5196d9ea547d))
+  (pad "" smd rect (at 8.21 0.4) (size 3.43 1.65) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp b988d6e1-acde-48d5-aaac-780083f0a33d))
+  (pad "" smd rect (at -8.2 0.4) (size 3.43 1.65) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp d0e758c8-d140-4a8a-8239-760094b94ecd))
+  (pad "1" smd rect (at -4.5 -5.08) (size 1.27 3) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp cdb8e730-b927-443e-bb30-3662dd4e56b2))
+  (pad "2" smd rect (at -1.5 -5.08) (size 1.27 3) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 4c37a42c-e30e-4fbe-8a58-4d959e1e3766))
+  (pad "3" smd rect (at 1.5 -5.08) (size 1.27 3) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp 530e1c0a-bb5b-44a7-b162-4c6f9e290093))
+  (pad "4" smd rect (at 4.5 -5.08) (size 1.27 3) (layers "F.Cu" "F.Paste" "F.Mask") (tstamp b7986f62-ea7a-4dc5-91cd-26acb8e0379b))
 )