diff --git a/kicad6/gammaray2usb.kicad_sch b/kicad6/gammaray2usb.kicad_sch
index 05b0e42..cf6c218 100644
--- a/kicad6/gammaray2usb.kicad_sch
+++ b/kicad6/gammaray2usb.kicad_sch
@@ -1030,6 +1030,7 @@
     )
   )
 
+
   (junction (at 251.46 134.62) (diameter 0) (color 0 0 0 0)
     (uuid 0691e0cb-5f4d-4ed8-930c-ce0ef7704375)
   )
@@ -1042,18 +1043,12 @@
   (junction (at 153.67 57.15) (diameter 0) (color 0 0 0 0)
     (uuid 1e22edd0-71b2-458b-bb6f-40f7e4fe1c7a)
   )
-  (junction (at 181.61 85.09) (diameter 0) (color 0 0 0 0)
-    (uuid 262ab98e-e573-4a00-8149-c8273b388f2e)
-  )
   (junction (at 48.26 95.25) (diameter 0) (color 0 0 0 0)
     (uuid 2a4b6fc5-71b0-4bcf-8d96-4b85719ca6c3)
   )
   (junction (at 125.73 31.75) (diameter 0) (color 0 0 0 0)
     (uuid 430ddd3d-3fa9-4bf0-8075-55f6a0017a33)
   )
-  (junction (at 218.44 95.25) (diameter 0) (color 0 0 0 0)
-    (uuid 439a301d-3d61-409f-aede-7a7af7c5e139)
-  )
   (junction (at 74.93 87.63) (diameter 0) (color 0 0 0 0)
     (uuid 4b4f1e32-3169-4d85-8bdf-fdf881bc6b10)
   )
@@ -1061,7 +1056,13 @@
     (uuid 5cf43895-6dba-4ed0-bcfe-073409525be1)
   )
   (junction (at 232.41 95.25) (diameter 0) (color 0 0 0 0)
-    (uuid 6c2c9ec2-1f8b-4e88-ba72-a1c40647db64)
+    (uuid 6b13851e-db7a-4f9e-8c2d-322db467deb7)
+  )
+  (junction (at 181.61 85.09) (diameter 0) (color 0 0 0 0)
+    (uuid 6b98ff3b-668f-4246-94b3-521f0c8d555a)
+  )
+  (junction (at 193.04 124.46) (diameter 0) (color 0 0 0 0)
+    (uuid 9fbd4caf-e3b0-4466-ab3a-e81016f502ae)
   )
   (junction (at 100.33 31.75) (diameter 0) (color 0 0 0 0)
     (uuid a9f635d2-aa06-4e9e-9d14-9c8b7321f20f)
@@ -1069,9 +1070,6 @@
   (junction (at 74.93 69.85) (diameter 0) (color 0 0 0 0)
     (uuid ba389667-cb7b-4f01-8223-77cf99e2bc5d)
   )
-  (junction (at 193.04 124.46) (diameter 0) (color 0 0 0 0)
-    (uuid bae02bb3-8d74-430f-80e7-1f8e3c60e566)
-  )
   (junction (at 137.16 66.04) (diameter 0) (color 0 0 0 0)
     (uuid c7c57f9b-871a-4100-9a6a-8d43d3efc6ce)
   )
@@ -1079,6 +1077,13 @@
     (uuid ecd0c1ef-c372-4991-afa4-f46f61b65db5)
   )
 
+  (no_connect (at 204.47 85.09) (uuid 063ecfe4-d77a-4c57-b627-ba1d02bf91e7))
+
+  (bus_entry (at 229.87 121.92) (size 2.54 2.54)
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid fe890506-bfc9-406a-9257-7c813c0c14ef)
+  )
+
   (wire (pts (xy 251.46 134.62) (xy 254 134.62))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 0078eba6-adde-45bf-bfbc-0d0941e4269b)
@@ -1087,6 +1092,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 027f01d2-824a-48ec-8dad-01946f65eee2)
   )
+  (wire (pts (xy 181.61 85.09) (xy 201.93 85.09))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 056e377b-c70a-4fa8-8b51-f025ea8fd601)
+  )
   (wire (pts (xy 156.21 82.55) (xy 153.67 82.55))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 05de424c-a29e-4b2b-b1ee-3b1707c5240d)
@@ -1135,6 +1144,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 2b4d1772-b039-4ac7-8929-fac446d04229)
   )
+  (wire (pts (xy 193.04 124.46) (xy 193.04 95.25))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 2f83ed68-f4cf-4356-b8b2-4c6a4e990e87)
+  )
   (wire (pts (xy 242.57 134.62) (xy 251.46 134.62))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 30456d00-8d11-434e-8b7e-acf5db54280d)
@@ -1151,13 +1164,9 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 3e6c70ac-53cb-4ee0-b002-686053f8975d)
   )
-  (wire (pts (xy 181.61 85.09) (xy 207.01 85.09))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 47c8ef43-2fb0-45d4-91a2-d70d4db60499)
-  )
-  (wire (pts (xy 232.41 95.25) (xy 218.44 95.25))
+  (wire (pts (xy 223.52 104.14) (xy 223.52 95.25))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 4acb486e-c4a5-4ae0-80d9-a824fdd9843e)
+    (uuid 482a703e-a052-4aa0-a8f5-cb36f561f9b4)
   )
   (wire (pts (xy 48.26 95.25) (xy 48.26 102.87))
     (stroke (width 0) (type default) (color 0 0 0 0))
@@ -1171,6 +1180,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 52a16511-97e4-402f-8f2d-96c0e70da453)
   )
+  (wire (pts (xy 193.04 95.25) (xy 194.31 95.25))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 5590c7a7-ec94-47dc-b7e4-4cc72c958781)
+  )
   (wire (pts (xy 74.93 83.82) (xy 74.93 87.63))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 55be0233-b1c9-434f-8339-b4d1f52c00a1)
@@ -1211,6 +1224,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 695fd45d-2642-4a07-b11f-27bf6953be04)
   )
+  (wire (pts (xy 201.93 104.14) (xy 223.52 104.14))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid 6ae21a78-5edc-4db4-9ed4-00f2043d7418)
+  )
   (wire (pts (xy 64.77 69.85) (xy 74.93 69.85))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 6fdccdf4-aa41-4c2d-a9b7-c57664e009ff)
@@ -1235,10 +1252,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7b613d7b-dd4d-4126-9ca2-60d81412edbd)
   )
-  (wire (pts (xy 199.39 95.25) (xy 193.04 95.25))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 7b773ff9-f927-493c-a4b0-3fea42432464)
-  )
   (wire (pts (xy 125.73 66.04) (xy 137.16 66.04))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 7fefefd3-5bc3-4096-a07f-09c127329dcb)
@@ -1263,13 +1276,13 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid 8e02fecc-0880-47c8-82c0-d82d27fd30de)
   )
-  (wire (pts (xy 63.5 110.49) (xy 74.93 110.49))
+  (wire (pts (xy 223.52 95.25) (xy 232.41 95.25))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 9a10910f-fb9e-408c-9a9a-25feb7460e75)
+    (uuid 8eb3498b-25c1-488e-9e51-09ed45929e07)
   )
-  (wire (pts (xy 193.04 95.25) (xy 193.04 124.46))
+  (wire (pts (xy 63.5 110.49) (xy 74.93 110.49))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid 9b359c57-c37e-4feb-b1cd-fb8004640a90)
+    (uuid 9a10910f-fb9e-408c-9a9a-25feb7460e75)
   )
   (wire (pts (xy 74.93 100.33) (xy 74.93 110.49))
     (stroke (width 0) (type default) (color 0 0 0 0))
@@ -1279,9 +1292,9 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid a92a3d4d-1f9c-41fb-a0b0-e7b7a4a5b0f5)
   )
-  (wire (pts (xy 218.44 95.25) (xy 218.44 102.87))
+  (wire (pts (xy 209.55 95.25) (xy 213.36 95.25))
     (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid b5017f49-b3a3-4ee9-8a1c-dda7d473814b)
+    (uuid ad022c23-e948-43cf-98c6-94dadad4efc7)
   )
   (wire (pts (xy 21.59 69.85) (xy 31.75 69.85))
     (stroke (width 0) (type default) (color 0 0 0 0))
@@ -1291,10 +1304,6 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid b9ee212e-9b99-484c-b87b-4dd323941e1a)
   )
-  (wire (pts (xy 214.63 95.25) (xy 218.44 95.25))
-    (stroke (width 0) (type default) (color 0 0 0 0))
-    (uuid bda8e7df-5232-4637-bbc5-4e5b4277f1a0)
-  )
   (wire (pts (xy 153.67 82.55) (xy 153.67 57.15))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid bff40844-d919-4ae6-983d-924cc5aae826)
@@ -1319,6 +1328,10 @@
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid ddb81492-b685-4381-8c55-883274c096c2)
   )
+  (wire (pts (xy 201.93 100.33) (xy 201.93 104.14))
+    (stroke (width 0) (type default) (color 0 0 0 0))
+    (uuid dfdbdff5-ce69-45b7-9ed0-94ebb31bb947)
+  )
   (wire (pts (xy 194.31 36.83) (xy 204.47 36.83))
     (stroke (width 0) (type default) (color 0 0 0 0))
     (uuid e317f4e9-3719-4c07-97f6-788d468ed91f)
@@ -1382,35 +1395,19 @@
     (pin "2" (uuid c6d6ee17-dcd7-404b-b0e4-8c052fd7e577))
   )
 
-  (symbol (lib_id "Analog_Switch:TS5A3166DBVR") (at 207.01 92.71 90) (mirror x) (unit 1)
-    (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 11cf1a40-af1b-4238-a25c-b3a776212b1e)
-    (property "Reference" "SW1" (id 0) (at 215.9 88.6712 90))
-    (property "Value" "SPST" (id 1) (at 215.9 91.2112 90))
-    (property "Footprint" "Package_TO_SOT_SMD:SOT-23-5" (id 2) (at 210.82 91.44 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" " http://www.ti.com/lit/ds/symlink/ts5a3166.pdf" (id 3) (at 204.47 92.71 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 991a302d-b434-42c5-8409-30bbaefb5660))
-    (pin "2" (uuid 3f2b4854-712e-4532-a12b-2f6f18d33f65))
-    (pin "3" (uuid a68aa6bd-0b2c-47bd-bc6d-d9d3a0028418))
-    (pin "4" (uuid c3afd5fa-ddfa-41c9-a4e8-ec109ebe707c))
-    (pin "5" (uuid 8ef24399-2db2-40f6-af7a-12aa6fedc549))
-  )
-
-  (symbol (lib_id "power:GND") (at 218.44 102.87 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 213.36 95.25 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 161193c9-4081-447e-86a3-c2b19f750d46)
-    (property "Reference" "#PWR08" (id 0) (at 218.44 109.22 0)
+    (property "Reference" "#PWR08" (id 0) (at 219.71 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 218.44 107.95 0))
-    (property "Footprint" "" (id 2) (at 218.44 102.87 0)
+    (property "Value" "GND" (id 1) (at 217.17 95.2499 90)
+      (effects (font (size 1.27 1.27)) (justify right))
+    )
+    (property "Footprint" "" (id 2) (at 213.36 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 218.44 102.87 0)
+    (property "Datasheet" "" (id 3) (at 213.36 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 4ca49740-b544-4439-ad96-200c0db7c0e4))
@@ -1643,6 +1640,24 @@
     (pin "2" (uuid 875c8b9e-f10c-4f13-83d3-52d23541749b))
   )
 
+  (symbol (lib_id "Analog_Switch:TS5A3166DBVR") (at 201.93 92.71 90) (mirror x) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid acc0fc43-a19a-4c36-8278-2ffa0aaa57c9)
+    (property "Reference" "SW1" (id 0) (at 215.9 88.6712 90))
+    (property "Value" "TS5A3166DBVR" (id 1) (at 215.9 91.2112 90))
+    (property "Footprint" "Package_TO_SOT_SMD:SOT-23-5" (id 2) (at 205.74 91.44 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" " http://www.ti.com/lit/ds/symlink/ts5a3166.pdf" (id 3) (at 199.39 92.71 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 71a375c2-2836-4cd1-b226-d85a08736001))
+    (pin "2" (uuid 476cee13-bbf0-41c7-930b-5753956bb03c))
+    (pin "3" (uuid c1c54e2f-79f9-4eb6-a164-d9cb4b3b1782))
+    (pin "4" (uuid ae2bb3a2-93ae-4407-b30b-2a416dd55c6e))
+    (pin "5" (uuid 2ea4576a-0343-46f7-a12a-16c9233e3895))
+  )
+
   (symbol (lib_id "Sensor_Optical:BPW34") (at 48.26 87.63 270) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid b10a43fe-d13a-4fb1-a50c-7b1f30f48d03)
@@ -1947,8 +1962,8 @@
     (path "/fc08777f-d678-4bc4-8021-8a14b6505c88"
       (reference "RV1") (unit 1) (value "250kΩ") (footprint "Potentiometer_THT:Potentiometer_Vishay_T7-YA_Single_Vertical")
     )
-    (path "/11cf1a40-af1b-4238-a25c-b3a776212b1e"
-      (reference "SW1") (unit 1) (value "SPST") (footprint "Package_TO_SOT_SMD:SOT-23-5")
+    (path "/acc0fc43-a19a-4c36-8278-2ffa0aaa57c9"
+      (reference "SW1") (unit 1) (value "TS5A3166DBVR") (footprint "Package_TO_SOT_SMD:SOT-23-5")
     )
     (path "/c3212f85-cf66-4f7f-8b36-26a0c66bbcc2"
       (reference "U1") (unit 1) (value "LM358") (footprint "Package_DIP:DIP-8_W7.62mm")