diff --git a/modules/EPS/Separation_switches.kicad_sch b/modules/EPS/Separation_switches.kicad_sch
index 68cfd90..25e0a9a 100644
--- a/modules/EPS/Separation_switches.kicad_sch
+++ b/modules/EPS/Separation_switches.kicad_sch
@@ -307,13 +307,13 @@
   (symbol (lib_id "Device:Jumper_NO_Small") (at 161.29 63.5 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 5103c2fe-be6a-4243-91e5-d95a4a167862)
-    (property "Reference" "JP3" (id 0) (at 162.4331 62.5915 90)
+    (property "Reference" "JP5" (id 0) (at 162.4331 62.5915 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
     (property "Value" "RBF_PIN" (id 1) (at 162.4331 65.3666 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "" (id 2) (at 161.29 63.5 0)
+    (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_1x03_P2.54mm_Vertical" (id 2) (at 161.29 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 161.29 63.5 0)
@@ -326,13 +326,13 @@
   (symbol (lib_id "Device:Jumper_NO_Small") (at 161.29 101.6 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 9995899c-d098-41ea-941d-2ced1e95659d)
-    (property "Reference" "JP4" (id 0) (at 162.4331 100.6915 90)
+    (property "Reference" "JP6" (id 0) (at 162.4331 100.6915 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
     (property "Value" "SW_#1" (id 1) (at 162.4331 103.4666 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "" (id 2) (at 161.29 101.6 0)
+    (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_1x03_P2.54mm_Vertical" (id 2) (at 161.29 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 161.29 101.6 0)
@@ -345,13 +345,13 @@
   (symbol (lib_id "Device:Jumper_NO_Small") (at 161.29 115.57 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 45ee22f5-6769-4d18-85de-6b6f9e805564)
-    (property "Reference" "JP5" (id 0) (at 162.4331 114.6615 90)
+    (property "Reference" "JP7" (id 0) (at 162.4331 114.6615 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
     (property "Value" "SW_#2" (id 1) (at 162.4331 117.4366 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "" (id 2) (at 161.29 115.57 0)
+    (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_1x03_P2.54mm_Vertical" (id 2) (at 161.29 115.57 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 161.29 115.57 0)
@@ -364,13 +364,13 @@
   (symbol (lib_id "Device:Jumper_NO_Small") (at 161.29 129.54 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 25264e05-2861-4b06-846c-3a0d6f16b226)
-    (property "Reference" "JP6" (id 0) (at 162.4331 128.6315 90)
+    (property "Reference" "JP8" (id 0) (at 162.4331 128.6315 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
     (property "Value" "SW_#3" (id 1) (at 162.4331 131.4066 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "" (id 2) (at 161.29 129.54 0)
+    (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_1x03_P2.54mm_Vertical" (id 2) (at 161.29 129.54 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 161.29 129.54 0)
@@ -383,13 +383,13 @@
   (symbol (lib_id "Device:Jumper_NO_Small") (at 161.29 143.51 90) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid e9fe78ae-ee81-47ce-ab90-493888d60f80)
-    (property "Reference" "JP7" (id 0) (at 162.4331 142.6015 90)
+    (property "Reference" "JP9" (id 0) (at 162.4331 142.6015 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
     (property "Value" "SW_#4" (id 1) (at 162.4331 145.3766 90)
       (effects (font (size 1.27 1.27)) (justify right))
     )
-    (property "Footprint" "" (id 2) (at 161.29 143.51 0)
+    (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_1x03_P2.54mm_Vertical" (id 2) (at 161.29 143.51 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Datasheet" "~" (id 3) (at 161.29 143.51 0)
@@ -402,7 +402,7 @@
   (symbol (lib_id "power:GND") (at 144.78 67.31 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 77eb29f0-bed4-46e0-95a3-36bdb9cad131)
-    (property "Reference" "#PWR0201" (id 0) (at 144.78 73.66 0)
+    (property "Reference" "#PWR0281" (id 0) (at 144.78 73.66 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 144.78 71.8726 0)
@@ -420,7 +420,7 @@
   (symbol (lib_id "power:GND") (at 144.78 105.41 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 0c57fa72-49ec-43d6-b4e7-242c4c54439b)
-    (property "Reference" "#PWR0202" (id 0) (at 144.78 111.76 0)
+    (property "Reference" "#PWR0282" (id 0) (at 144.78 111.76 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 144.78 109.9726 0)
@@ -438,7 +438,7 @@
   (symbol (lib_id "power:GND") (at 144.78 119.38 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 6b8139c5-d41b-4ba2-b7c8-169b28aa4d68)
-    (property "Reference" "#PWR0203" (id 0) (at 144.78 125.73 0)
+    (property "Reference" "#PWR0283" (id 0) (at 144.78 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 144.78 123.9426 0)
@@ -456,7 +456,7 @@
   (symbol (lib_id "power:GND") (at 144.78 133.35 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid e09d754f-057a-4dab-bebd-807e7d1aa0dd)
-    (property "Reference" "#PWR0204" (id 0) (at 144.78 139.7 0)
+    (property "Reference" "#PWR0284" (id 0) (at 144.78 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 144.78 137.9126 0)
@@ -474,7 +474,7 @@
   (symbol (lib_id "power:GND") (at 144.78 147.32 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid b64d01b4-3a80-4505-97f2-91e5cad2581a)
-    (property "Reference" "#PWR0205" (id 0) (at 144.78 153.67 0)
+    (property "Reference" "#PWR0285" (id 0) (at 144.78 153.67 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 144.78 151.8826 0)
@@ -492,7 +492,7 @@
   (symbol (lib_id "power:GND") (at 152.4 119.38 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid ca866f04-39e7-460b-b827-dba6be14a493)
-    (property "Reference" "#PWR0206" (id 0) (at 152.4 125.73 0)
+    (property "Reference" "#PWR0286" (id 0) (at 152.4 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 152.4 123.9426 0)
@@ -510,7 +510,7 @@
   (symbol (lib_id "power:GND") (at 152.4 133.35 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 67254609-b967-422c-bf5b-abcd9a5a95b3)
-    (property "Reference" "#PWR0207" (id 0) (at 152.4 139.7 0)
+    (property "Reference" "#PWR0287" (id 0) (at 152.4 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 152.4 137.9126 0)
@@ -528,7 +528,7 @@
   (symbol (lib_id "power:GND") (at 152.4 147.32 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 880984b6-aca8-4617-a1c7-10db3399ac78)
-    (property "Reference" "#PWR0208" (id 0) (at 152.4 153.67 0)
+    (property "Reference" "#PWR0288" (id 0) (at 152.4 153.67 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 152.4 151.8826 0)
@@ -546,7 +546,7 @@
   (symbol (lib_id "power:GND") (at 153.67 67.31 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid d81c428e-dedf-4ec6-897e-055e91ababff)
-    (property "Reference" "#PWR0209" (id 0) (at 153.67 73.66 0)
+    (property "Reference" "#PWR0289" (id 0) (at 153.67 73.66 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 153.67 71.8726 0)
@@ -564,7 +564,7 @@
   (symbol (lib_id "power:GND") (at 153.67 105.41 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid a2d5909c-5ae6-4b64-ae88-848fefe93c2d)
-    (property "Reference" "#PWR0210" (id 0) (at 153.67 111.76 0)
+    (property "Reference" "#PWR0290" (id 0) (at 153.67 111.76 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 153.67 109.9726 0)
@@ -582,7 +582,7 @@
   (symbol (lib_id "power:GND") (at 161.29 67.31 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 600aed8a-6304-434d-9035-d917bb64cc03)
-    (property "Reference" "#PWR0211" (id 0) (at 161.29 73.66 0)
+    (property "Reference" "#PWR0291" (id 0) (at 161.29 73.66 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 161.29 71.8726 0)
@@ -600,7 +600,7 @@
   (symbol (lib_id "power:GND") (at 161.29 105.41 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid fb0fbb8f-25f6-415d-ad97-dfdce3126a2f)
-    (property "Reference" "#PWR0212" (id 0) (at 161.29 111.76 0)
+    (property "Reference" "#PWR0292" (id 0) (at 161.29 111.76 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 161.29 109.9726 0)
@@ -618,7 +618,7 @@
   (symbol (lib_id "power:GND") (at 161.29 119.38 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid fbdbd72d-733d-4f02-9e94-1f5354b90934)
-    (property "Reference" "#PWR0213" (id 0) (at 161.29 125.73 0)
+    (property "Reference" "#PWR0293" (id 0) (at 161.29 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 161.29 123.9426 0)
@@ -636,7 +636,7 @@
   (symbol (lib_id "power:GND") (at 161.29 133.35 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid f1c3d5c7-ef98-44a6-b7b9-b510acd65da6)
-    (property "Reference" "#PWR0214" (id 0) (at 161.29 139.7 0)
+    (property "Reference" "#PWR0294" (id 0) (at 161.29 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 161.29 137.9126 0)
@@ -654,7 +654,7 @@
   (symbol (lib_id "power:GND") (at 161.29 147.32 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid cae52fc4-2465-49a1-9a6f-2aa4f4752b33)
-    (property "Reference" "#PWR0215" (id 0) (at 161.29 153.67 0)
+    (property "Reference" "#PWR0295" (id 0) (at 161.29 153.67 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (property "Value" "GND" (id 1) (at 161.29 151.8826 0)
@@ -672,7 +672,7 @@
   (symbol (lib_id "Connector_Generic_MountingPin:Conn_01x02_MountingPin") (at 144.78 59.69 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid c83acea2-f61c-4f33-8239-0a67b4b73c6c)
-    (property "Reference" "J18" (id 0) (at 148.082 64.6134 0))
+    (property "Reference" "J25" (id 0) (at 148.082 64.6134 0))
     (property "Value" "RBF_PIN" (id 1) (at 146.812 57.2285 0))
     (property "Footprint" "" (id 2) (at 144.78 59.69 0)
       (effects (font (size 1.27 1.27)) hide)
@@ -688,7 +688,7 @@
   (symbol (lib_id "Connector_Generic_MountingPin:Conn_01x02_MountingPin") (at 144.78 97.79 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid e85114da-ff7c-4a82-91d7-a506749bada5)
-    (property "Reference" "J19" (id 0) (at 148.082 102.7134 0))
+    (property "Reference" "J26" (id 0) (at 148.082 102.7134 0))
     (property "Value" "SEP_SW_#1" (id 1) (at 146.812 95.3285 0))
     (property "Footprint" "" (id 2) (at 144.78 97.79 0)
       (effects (font (size 1.27 1.27)) hide)
@@ -704,7 +704,7 @@
   (symbol (lib_id "Connector_Generic_MountingPin:Conn_01x02_MountingPin") (at 144.78 111.76 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid c7b9175b-b6f9-4b66-9f01-6ad4be68afc1)
-    (property "Reference" "J20" (id 0) (at 148.082 116.6834 0))
+    (property "Reference" "J27" (id 0) (at 148.082 116.6834 0))
     (property "Value" "SEP_SW_#2" (id 1) (at 146.812 109.2985 0))
     (property "Footprint" "" (id 2) (at 144.78 111.76 0)
       (effects (font (size 1.27 1.27)) hide)
@@ -720,7 +720,7 @@
   (symbol (lib_id "Connector_Generic_MountingPin:Conn_01x02_MountingPin") (at 144.78 125.73 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 4e747b55-6e10-4d87-a43e-85d325abe486)
-    (property "Reference" "J21" (id 0) (at 148.082 130.6534 0))
+    (property "Reference" "J28" (id 0) (at 148.082 130.6534 0))
     (property "Value" "SEP_SW_#3" (id 1) (at 146.812 123.2685 0))
     (property "Footprint" "" (id 2) (at 144.78 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
@@ -736,7 +736,7 @@
   (symbol (lib_id "Connector_Generic_MountingPin:Conn_01x02_MountingPin") (at 144.78 139.7 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes)
     (uuid 134203a7-de5b-4a21-91e3-a67a44463301)
-    (property "Reference" "J22" (id 0) (at 148.082 144.6234 0))
+    (property "Reference" "J29" (id 0) (at 148.082 144.6234 0))
     (property "Value" "SEP_SW_#4" (id 1) (at 146.812 137.2385 0))
     (property "Footprint" "" (id 2) (at 144.78 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
diff --git a/modules/EPS/Solar_input.kicad_sch b/modules/EPS/Solar_input.kicad_sch
index d91d327..4416232 100644
--- a/modules/EPS/Solar_input.kicad_sch
+++ b/modules/EPS/Solar_input.kicad_sch
@@ -108,317 +108,383 @@
         )
       )
     )
+    (symbol "power:PWR_FLAG" (power) (pin_numbers hide) (pin_names (offset 0) hide) (in_bom yes) (on_board yes)
+      (property "Reference" "#FLG" (id 0) (at 0 1.905 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Value" "PWR_FLAG" (id 1) (at 0 3.81 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Footprint" "" (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" "power-flag" (id 4) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "Special symbol for telling ERC where power comes from" (id 5) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "PWR_FLAG_0_0"
+        (pin power_out line (at 0 0 90) (length 0)
+          (name "pwr" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+      )
+      (symbol "PWR_FLAG_0_1"
+        (polyline
+          (pts
+            (xy 0 0)
+            (xy 0 1.27)
+            (xy -1.016 1.905)
+            (xy 0 2.54)
+            (xy 1.016 1.905)
+            (xy 0 1.27)
+          )
+          (stroke (width 0)) (fill (type none))
+        )
+      )
+    )
   )
 
-  (junction (at 96.52 40.64) (diameter 1.016) (color 0 0 0 0))
-  (junction (at 96.52 59.69) (diameter 1.016) (color 0 0 0 0))
-  (junction (at 96.52 78.74) (diameter 1.016) (color 0 0 0 0))
-  (junction (at 96.52 97.79) (diameter 1.016) (color 0 0 0 0))
-  (junction (at 96.52 116.84) (diameter 1.016) (color 0 0 0 0))
+  (junction (at 99.06 49.53) (diameter 1.016) (color 0 0 0 0))
+  (junction (at 99.06 68.58) (diameter 1.016) (color 0 0 0 0))
+  (junction (at 99.06 87.63) (diameter 1.016) (color 0 0 0 0))
+  (junction (at 99.06 106.68) (diameter 1.016) (color 0 0 0 0))
+  (junction (at 99.06 125.73) (diameter 1.016) (color 0 0 0 0))
+  (junction (at 102.87 49.53) (diameter 0.9144) (color 0 0 0 0))
 
-  (wire (pts (xy 91.44 40.64) (xy 96.52 40.64))
+  (wire (pts (xy 93.98 49.53) (xy 99.06 49.53))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 373618e9-08b6-4907-aac7-af3ae7327f8a)
   )
-  (wire (pts (xy 91.44 43.18) (xy 91.44 48.26))
+  (wire (pts (xy 93.98 52.07) (xy 93.98 57.15))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid f76596a2-f180-4de7-bea4-d7bb6dd6c450)
   )
-  (wire (pts (xy 91.44 59.69) (xy 96.52 59.69))
+  (wire (pts (xy 93.98 68.58) (xy 99.06 68.58))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid dd954ec9-c8db-4206-957d-6ce0052ab1e2)
   )
-  (wire (pts (xy 91.44 62.23) (xy 91.44 67.31))
+  (wire (pts (xy 93.98 71.12) (xy 93.98 76.2))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 8f1b322d-c769-404a-abe4-9440818c0c33)
   )
-  (wire (pts (xy 91.44 78.74) (xy 96.52 78.74))
+  (wire (pts (xy 93.98 87.63) (xy 99.06 87.63))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid eb2b8644-6248-4bcc-bd38-939cffc7f979)
   )
-  (wire (pts (xy 91.44 81.28) (xy 91.44 86.36))
+  (wire (pts (xy 93.98 90.17) (xy 93.98 95.25))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 9c727ac7-c33d-4578-aa16-b4b5c0402428)
   )
-  (wire (pts (xy 91.44 97.79) (xy 96.52 97.79))
+  (wire (pts (xy 93.98 106.68) (xy 99.06 106.68))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid d9bac12d-8321-408d-8adb-85fa9ed2eeed)
   )
-  (wire (pts (xy 91.44 100.33) (xy 91.44 105.41))
+  (wire (pts (xy 93.98 109.22) (xy 93.98 114.3))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid f0296ddf-ce3f-4263-831c-f44316d884f9)
   )
-  (wire (pts (xy 91.44 116.84) (xy 96.52 116.84))
+  (wire (pts (xy 93.98 125.73) (xy 99.06 125.73))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 7eafa09e-7bca-4f56-959a-879107b3fe6b)
   )
-  (wire (pts (xy 91.44 119.38) (xy 91.44 124.46))
+  (wire (pts (xy 93.98 128.27) (xy 93.98 133.35))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid f422c277-f814-4f19-ae5c-e9d2a2cab0e1)
   )
-  (wire (pts (xy 91.44 138.43) (xy 91.44 143.51))
+  (wire (pts (xy 93.98 147.32) (xy 93.98 152.4))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 1f2c3562-3f3c-472f-a484-18c249c84d41)
   )
-  (wire (pts (xy 96.52 40.64) (xy 96.52 59.69))
+  (wire (pts (xy 99.06 49.53) (xy 99.06 68.58))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 373618e9-08b6-4907-aac7-af3ae7327f8a)
   )
-  (wire (pts (xy 96.52 40.64) (xy 104.14 40.64))
+  (wire (pts (xy 99.06 49.53) (xy 102.87 49.53))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid be22c9c2-8d74-4cbc-8ae7-40f988e15cf0)
   )
-  (wire (pts (xy 96.52 59.69) (xy 96.52 78.74))
+  (wire (pts (xy 99.06 68.58) (xy 99.06 87.63))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 373618e9-08b6-4907-aac7-af3ae7327f8a)
   )
-  (wire (pts (xy 96.52 78.74) (xy 96.52 97.79))
+  (wire (pts (xy 99.06 87.63) (xy 99.06 106.68))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 373618e9-08b6-4907-aac7-af3ae7327f8a)
   )
-  (wire (pts (xy 96.52 97.79) (xy 96.52 116.84))
+  (wire (pts (xy 99.06 106.68) (xy 99.06 125.73))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 373618e9-08b6-4907-aac7-af3ae7327f8a)
   )
-  (wire (pts (xy 96.52 116.84) (xy 96.52 135.89))
+  (wire (pts (xy 99.06 125.73) (xy 99.06 144.78))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 373618e9-08b6-4907-aac7-af3ae7327f8a)
   )
-  (wire (pts (xy 96.52 135.89) (xy 91.44 135.89))
+  (wire (pts (xy 99.06 144.78) (xy 93.98 144.78))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid 373618e9-08b6-4907-aac7-af3ae7327f8a)
   )
+  (wire (pts (xy 102.87 49.53) (xy 106.68 49.53))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid be22c9c2-8d74-4cbc-8ae7-40f988e15cf0)
+  )
+
+  (text "Connection to nne half of every solar module.\nProtection agains reverse current flow\n	should be implented of panels."
+    (at 135.89 46.99 0)
+    (effects (font (size 1.27 1.27)) (justify left bottom))
+    (uuid 54263196-cae6-4b35-b11c-4925248adc36)
+  )
 
-  (hierarchical_label "SOLAR_OUT" (shape input) (at 104.14 40.64 0)
+  (hierarchical_label "SOLAR_OUT" (shape input) (at 106.68 49.53 0)
     (effects (font (size 1.27 1.27)) (justify left))
     (uuid 27b2cde5-c9c0-4877-afdb-277ca5eb1b2f)
   )
 
-  (symbol (lib_id "power:GND") (at 86.36 48.26 0)
+  (symbol (lib_id "power:PWR_FLAG") (at 102.87 49.53 0)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid afe2dd24-9acf-428c-8603-b260bc75b79c)
+    (property "Reference" "#FLG06" (id 0) (at 102.87 47.625 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "PWR_FLAG" (id 1) (at 102.87 45.9254 0))
+    (property "Footprint" "" (id 2) (at 102.87 49.53 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 102.87 49.53 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 72f7e5ab-e70f-4549-a485-598a1d5c1346))
+  )
+
+  (symbol (lib_id "power:GND") (at 88.9 57.15 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 6ebe803f-5eb6-49de-94b4-9951fce61f79)
-    (property "Reference" "#PWR05" (id 0) (at 86.36 54.61 0)
+    (property "Reference" "#PWR0103" (id 0) (at 88.9 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 86.36 52.8226 0)
+    (property "Value" "GND" (id 1) (at 88.9 61.7126 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "" (id 2) (at 86.36 48.26 0)
+    (property "Footprint" "" (id 2) (at 88.9 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 86.36 48.26 0)
+    (property "Datasheet" "" (id 3) (at 88.9 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid b1d590b1-1d7d-4622-911d-357dc49143e6))
   )
 
-  (symbol (lib_id "power:GND") (at 86.36 67.31 0)
+  (symbol (lib_id "power:GND") (at 88.9 76.2 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 383420f2-56fd-4a2d-bbf3-76ceb60f62a6)
-    (property "Reference" "#PWR06" (id 0) (at 86.36 73.66 0)
+    (property "Reference" "#PWR0104" (id 0) (at 88.9 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 86.36 71.8726 0)
+    (property "Value" "GND" (id 1) (at 88.9 80.7626 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "" (id 2) (at 86.36 67.31 0)
+    (property "Footprint" "" (id 2) (at 88.9 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 86.36 67.31 0)
+    (property "Datasheet" "" (id 3) (at 88.9 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 389c7052-550f-4dba-9396-87acc4193603))
   )
 
-  (symbol (lib_id "power:GND") (at 86.36 86.36 0)
+  (symbol (lib_id "power:GND") (at 88.9 95.25 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 65420468-2b5a-4e8d-8139-4ff930ea4cb4)
-    (property "Reference" "#PWR07" (id 0) (at 86.36 92.71 0)
+    (property "Reference" "#PWR0105" (id 0) (at 88.9 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 86.36 90.9226 0)
+    (property "Value" "GND" (id 1) (at 88.9 99.8126 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "" (id 2) (at 86.36 86.36 0)
+    (property "Footprint" "" (id 2) (at 88.9 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 86.36 86.36 0)
+    (property "Datasheet" "" (id 3) (at 88.9 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 36a4d356-803d-4e5a-bb66-95bff736b920))
   )
 
-  (symbol (lib_id "power:GND") (at 86.36 105.41 0)
+  (symbol (lib_id "power:GND") (at 88.9 114.3 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 65a61411-1205-40aa-902e-07e546492efb)
-    (property "Reference" "#PWR08" (id 0) (at 86.36 111.76 0)
+    (property "Reference" "#PWR0106" (id 0) (at 88.9 120.65 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 86.36 109.9726 0)
+    (property "Value" "GND" (id 1) (at 88.9 118.8626 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "" (id 2) (at 86.36 105.41 0)
+    (property "Footprint" "" (id 2) (at 88.9 114.3 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 86.36 105.41 0)
+    (property "Datasheet" "" (id 3) (at 88.9 114.3 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 3a69ff45-ccac-4ab1-8e5c-465dcd70abd5))
   )
 
-  (symbol (lib_id "power:GND") (at 86.36 124.46 0)
+  (symbol (lib_id "power:GND") (at 88.9 133.35 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid e4ccc808-02ca-4386-b889-ffcb5a12309f)
-    (property "Reference" "#PWR09" (id 0) (at 86.36 130.81 0)
+    (property "Reference" "#PWR0107" (id 0) (at 88.9 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 86.36 129.0226 0)
+    (property "Value" "GND" (id 1) (at 88.9 137.9126 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "" (id 2) (at 86.36 124.46 0)
+    (property "Footprint" "" (id 2) (at 88.9 133.35 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 86.36 124.46 0)
+    (property "Datasheet" "" (id 3) (at 88.9 133.35 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 9400b559-0c9b-453f-ad48-eeb0a2008e37))
   )
 
-  (symbol (lib_id "power:GND") (at 86.36 143.51 0)
+  (symbol (lib_id "power:GND") (at 88.9 152.4 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid bf5a0034-d362-42b0-a742-3b6168bd38d9)
-    (property "Reference" "#PWR010" (id 0) (at 86.36 149.86 0)
+    (property "Reference" "#PWR0108" (id 0) (at 88.9 158.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 86.36 148.0726 0)
+    (property "Value" "GND" (id 1) (at 88.9 156.9626 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "" (id 2) (at 86.36 143.51 0)
+    (property "Footprint" "" (id 2) (at 88.9 152.4 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 86.36 143.51 0)
+    (property "Datasheet" "" (id 3) (at 88.9 152.4 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid eaa80885-628a-4197-a46b-a868a812b573))
   )
 
-  (symbol (lib_id "power:GND") (at 91.44 48.26 0)
+  (symbol (lib_id "power:GND") (at 93.98 57.15 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid a6eb18b5-181c-4f39-88f4-53201523a268)
-    (property "Reference" "#PWR011" (id 0) (at 91.44 54.61 0)
+    (property "Reference" "#PWR0109" (id 0) (at 93.98 63.5 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 91.44 52.8226 0)
+    (property "Value" "GND" (id 1) (at 93.98 61.7126 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "" (id 2) (at 91.44 48.26 0)
+    (property "Footprint" "" (id 2) (at 93.98 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 91.44 48.26 0)
+    (property "Datasheet" "" (id 3) (at 93.98 57.15 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 089f4701-e13a-4b12-9f6f-87ae84600125))
   )
 
-  (symbol (lib_id "power:GND") (at 91.44 67.31 0)
+  (symbol (lib_id "power:GND") (at 93.98 76.2 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 131ee275-1b63-49a5-9072-f19d2aa24ff9)
-    (property "Reference" "#PWR012" (id 0) (at 91.44 73.66 0)
+    (property "Reference" "#PWR0110" (id 0) (at 93.98 82.55 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 91.44 71.8726 0)
+    (property "Value" "GND" (id 1) (at 93.98 80.7626 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "" (id 2) (at 91.44 67.31 0)
+    (property "Footprint" "" (id 2) (at 93.98 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 91.44 67.31 0)
+    (property "Datasheet" "" (id 3) (at 93.98 76.2 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 003fdbb4-ff3d-4ab1-9c72-e1d9923ab526))
   )
 
-  (symbol (lib_id "power:GND") (at 91.44 86.36 0)
+  (symbol (lib_id "power:GND") (at 93.98 95.25 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 8a2183dc-0a0d-4feb-8c29-bd745679d7b8)
-    (property "Reference" "#PWR013" (id 0) (at 91.44 92.71 0)
+    (property "Reference" "#PWR0111" (id 0) (at 93.98 101.6 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 91.44 90.9226 0)
+    (property "Value" "GND" (id 1) (at 93.98 99.8126 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "" (id 2) (at 91.44 86.36 0)
+    (property "Footprint" "" (id 2) (at 93.98 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 91.44 86.36 0)
+    (property "Datasheet" "" (id 3) (at 93.98 95.25 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid e967034b-33ac-435f-a2ae-90fb1d0feb4b))
   )
 
-  (symbol (lib_id "power:GND") (at 91.44 105.41 0)
+  (symbol (lib_id "power:GND") (at 93.98 114.3 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid c32eb7e5-57fe-4d8a-ba99-96b946d7b6e7)
-    (property "Reference" "#PWR014" (id 0) (at 91.44 111.76 0)
+    (property "Reference" "#PWR0112" (id 0) (at 93.98 120.65 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 91.44 109.9726 0)
+    (property "Value" "GND" (id 1) (at 93.98 118.8626 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "" (id 2) (at 91.44 105.41 0)
+    (property "Footprint" "" (id 2) (at 93.98 114.3 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 91.44 105.41 0)
+    (property "Datasheet" "" (id 3) (at 93.98 114.3 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid aa8586c1-2d8d-48e5-90f7-c46685011dde))
   )
 
-  (symbol (lib_id "power:GND") (at 91.44 124.46 0)
+  (symbol (lib_id "power:GND") (at 93.98 133.35 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 42fadd57-ec9b-41c1-b934-01ce21b42ca6)
-    (property "Reference" "#PWR015" (id 0) (at 91.44 130.81 0)
+    (property "Reference" "#PWR0113" (id 0) (at 93.98 139.7 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 91.44 129.0226 0)
+    (property "Value" "GND" (id 1) (at 93.98 137.9126 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "" (id 2) (at 91.44 124.46 0)
+    (property "Footprint" "" (id 2) (at 93.98 133.35 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 91.44 124.46 0)
+    (property "Datasheet" "" (id 3) (at 93.98 133.35 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 164b75a4-1cf4-43b2-8d68-7feb6ec5a466))
   )
 
-  (symbol (lib_id "power:GND") (at 91.44 143.51 0)
+  (symbol (lib_id "power:GND") (at 93.98 152.4 0)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid 77e17651-ed39-4d52-85b9-a3878d64988a)
-    (property "Reference" "#PWR016" (id 0) (at 91.44 149.86 0)
+    (property "Reference" "#PWR0114" (id 0) (at 93.98 158.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 91.44 148.0726 0)
+    (property "Value" "GND" (id 1) (at 93.98 156.9626 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "" (id 2) (at 91.44 143.51 0)
+    (property "Footprint" "" (id 2) (at 93.98 152.4 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 91.44 143.51 0)
+    (property "Datasheet" "" (id 3) (at 93.98 152.4 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 24defd9b-c05f-4fdb-babd-8ceaae456fd8))
   )
 
-  (symbol (lib_id "Connector_Generic_MountingPin:Conn_01x02_MountingPin") (at 86.36 40.64 0) (mirror y)
+  (symbol (lib_id "Connector_Generic_MountingPin:Conn_01x02_MountingPin") (at 88.9 49.53 0) (mirror y)
     (in_bom yes) (on_board yes)
     (uuid 4c6d1bf1-6b05-46e1-bcde-fe7eaff4737b)
-    (property "Reference" "J1" (id 0) (at 87.122 34.1334 0))
-    (property "Value" "Solar_X1" (id 1) (at 87.122 36.9085 0))
-    (property "Footprint" "TCY_connectors:Amphenol_10114830-11102LF_1x02_P1.25mm_Horizontal" (id 2) (at 86.36 40.64 0)
+    (property "Reference" "J13" (id 0) (at 89.662 43.0234 0))
+    (property "Value" "Solar_X1" (id 1) (at 89.662 45.7985 0))
+    (property "Footprint" "TCY_connectors:Amphenol_10114830-11102LF_1x02_P1.25mm_Horizontal" (id 2) (at 88.9 49.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 86.36 40.64 0)
+    (property "Datasheet" "~" (id 3) (at 88.9 49.53 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 0014eb04-2e26-4540-8bf1-1d4166e5015e))
@@ -426,15 +492,15 @@
     (pin "MP" (uuid 912aa31c-5de8-4941-a1bf-50a8c6e9bd79))
   )
 
-  (symbol (lib_id "Connector_Generic_MountingPin:Conn_01x02_MountingPin") (at 86.36 59.69 0) (mirror y)
+  (symbol (lib_id "Connector_Generic_MountingPin:Conn_01x02_MountingPin") (at 88.9 68.58 0) (mirror y)
     (in_bom yes) (on_board yes)
     (uuid 126d2402-ba66-45fa-9faa-d3f2186094fc)
-    (property "Reference" "J2" (id 0) (at 87.122 53.1834 0))
-    (property "Value" "Solar_X2" (id 1) (at 87.122 55.9585 0))
-    (property "Footprint" "TCY_connectors:Amphenol_10114830-11102LF_1x02_P1.25mm_Horizontal" (id 2) (at 86.36 59.69 0)
+    (property "Reference" "J14" (id 0) (at 89.662 62.0734 0))
+    (property "Value" "Solar_X2" (id 1) (at 89.662 64.8485 0))
+    (property "Footprint" "TCY_connectors:Amphenol_10114830-11102LF_1x02_P1.25mm_Horizontal" (id 2) (at 88.9 68.58 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 86.36 59.69 0)
+    (property "Datasheet" "~" (id 3) (at 88.9 68.58 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 237b6190-6fa0-452a-89c7-75cdea91c733))
@@ -442,15 +508,15 @@
     (pin "MP" (uuid 7683e116-dba8-4b25-842a-4e93548ad4f2))
   )
 
-  (symbol (lib_id "Connector_Generic_MountingPin:Conn_01x02_MountingPin") (at 86.36 78.74 0) (mirror y)
+  (symbol (lib_id "Connector_Generic_MountingPin:Conn_01x02_MountingPin") (at 88.9 87.63 0) (mirror y)
     (in_bom yes) (on_board yes)
     (uuid 0f33af7e-9621-4131-ada6-4e82b8efcc3d)
-    (property "Reference" "J3" (id 0) (at 87.122 72.2334 0))
-    (property "Value" "Solar_Y1" (id 1) (at 87.122 75.0085 0))
-    (property "Footprint" "TCY_connectors:Amphenol_10114830-11102LF_1x02_P1.25mm_Horizontal" (id 2) (at 86.36 78.74 0)
+    (property "Reference" "J15" (id 0) (at 89.662 81.1234 0))
+    (property "Value" "Solar_Y1" (id 1) (at 89.662 83.8985 0))
+    (property "Footprint" "TCY_connectors:Amphenol_10114830-11102LF_1x02_P1.25mm_Horizontal" (id 2) (at 88.9 87.63 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 86.36 78.74 0)
+    (property "Datasheet" "~" (id 3) (at 88.9 87.63 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid f2b14758-b8dc-4a95-bc15-d1112f3dd9c2))
@@ -458,15 +524,15 @@
     (pin "MP" (uuid b784bad4-5f8d-4240-b5cf-cd24ff0a3218))
   )
 
-  (symbol (lib_id "Connector_Generic_MountingPin:Conn_01x02_MountingPin") (at 86.36 97.79 0) (mirror y)
+  (symbol (lib_id "Connector_Generic_MountingPin:Conn_01x02_MountingPin") (at 88.9 106.68 0) (mirror y)
     (in_bom yes) (on_board yes)
     (uuid cb7ebcef-6b64-47cc-8b45-da62d01ccabe)
-    (property "Reference" "J4" (id 0) (at 87.122 91.2834 0))
-    (property "Value" "Solar_Y2" (id 1) (at 87.122 94.0585 0))
-    (property "Footprint" "TCY_connectors:Amphenol_10114830-11102LF_1x02_P1.25mm_Horizontal" (id 2) (at 86.36 97.79 0)
+    (property "Reference" "J16" (id 0) (at 89.662 100.1734 0))
+    (property "Value" "Solar_Y2" (id 1) (at 89.662 102.9485 0))
+    (property "Footprint" "TCY_connectors:Amphenol_10114830-11102LF_1x02_P1.25mm_Horizontal" (id 2) (at 88.9 106.68 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 86.36 97.79 0)
+    (property "Datasheet" "~" (id 3) (at 88.9 106.68 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid a581301b-0168-4a84-a132-9f019c55416c))
@@ -474,15 +540,15 @@
     (pin "MP" (uuid 5c4f0f91-e0ee-4dfd-8a85-f811d3cd1509))
   )
 
-  (symbol (lib_id "Connector_Generic_MountingPin:Conn_01x02_MountingPin") (at 86.36 116.84 0) (mirror y)
+  (symbol (lib_id "Connector_Generic_MountingPin:Conn_01x02_MountingPin") (at 88.9 125.73 0) (mirror y)
     (in_bom yes) (on_board yes)
     (uuid fc0f55cf-4820-4bbb-9d16-bdf2b58b514a)
-    (property "Reference" "J5" (id 0) (at 87.122 110.3334 0))
-    (property "Value" "Solar_Z1" (id 1) (at 87.122 113.1085 0))
-    (property "Footprint" "TCY_connectors:Amphenol_10114830-11102LF_1x02_P1.25mm_Horizontal" (id 2) (at 86.36 116.84 0)
+    (property "Reference" "J17" (id 0) (at 89.662 119.2234 0))
+    (property "Value" "Solar_Z1" (id 1) (at 89.662 121.9985 0))
+    (property "Footprint" "TCY_connectors:Amphenol_10114830-11102LF_1x02_P1.25mm_Horizontal" (id 2) (at 88.9 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 86.36 116.84 0)
+    (property "Datasheet" "~" (id 3) (at 88.9 125.73 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 8e7cde04-52a0-453b-aeac-7a6b134ad98d))
@@ -490,15 +556,15 @@
     (pin "MP" (uuid 988fb79b-4eb8-48aa-9009-e44db46a9199))
   )
 
-  (symbol (lib_id "Connector_Generic_MountingPin:Conn_01x02_MountingPin") (at 86.36 135.89 0) (mirror y)
+  (symbol (lib_id "Connector_Generic_MountingPin:Conn_01x02_MountingPin") (at 88.9 144.78 0) (mirror y)
     (in_bom yes) (on_board yes)
     (uuid e3bcf0a8-5a27-4bdf-a634-030a1252b6fd)
-    (property "Reference" "J6" (id 0) (at 87.122 129.3834 0))
-    (property "Value" "Solar_Z2" (id 1) (at 87.122 132.1585 0))
-    (property "Footprint" "TCY_connectors:Amphenol_10114830-11102LF_1x02_P1.25mm_Horizontal" (id 2) (at 86.36 135.89 0)
+    (property "Reference" "J18" (id 0) (at 89.662 138.2734 0))
+    (property "Value" "Solar_Z2" (id 1) (at 89.662 141.0485 0))
+    (property "Footprint" "TCY_connectors:Amphenol_10114830-11102LF_1x02_P1.25mm_Horizontal" (id 2) (at 88.9 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 86.36 135.89 0)
+    (property "Datasheet" "~" (id 3) (at 88.9 144.78 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 7677bc6d-09fa-4dc5-a7dd-ad9edb5aceac))
diff --git a/modules/EPS/USB_power.kicad_sch b/modules/EPS/USB_power.kicad_sch
index 94d1569..463c456 100644
--- a/modules/EPS/USB_power.kicad_sch
+++ b/modules/EPS/USB_power.kicad_sch
@@ -13,11 +13,11 @@
   )
 
   (lib_symbols
-    (symbol "Connector_Generic_MountingPin:Conn_01x02_MountingPin" (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes)
-      (property "Reference" "J" (id 0) (at 0 2.54 0)
+    (symbol "Connector_Generic_MountingPin:Conn_01x04_MountingPin" (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" "Conn_01x02_MountingPin" (id 1) (at 1.27 -5.08 0)
+      (property "Value" "Conn_01x04_MountingPin" (id 1) (at 1.27 -7.62 0)
         (effects (font (size 1.27 1.27)) (justify left))
       )
       (property "Footprint" "" (id 2) (at 0 0 0)
@@ -29,41 +29,55 @@
       (property "ki_keywords" "connector" (id 4) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (property "ki_description" "Generic connectable mounting pin connector, single row, 01x02, script generated (kicad-library-utils/schlib/autogen/connector/)" (id 5) (at 0 0 0)
+      (property "ki_description" "Generic connectable mounting pin connector, single row, 01x04, script generated (kicad-library-utils/schlib/autogen/connector/)" (id 5) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
       (property "ki_fp_filters" "Connector*:*_1x??-1MP*" (id 6) (at 0 0 0)
         (effects (font (size 1.27 1.27)) hide)
       )
-      (symbol "Conn_01x02_MountingPin_1_1"
-        (text "Mounting" (at 0 -4.191 0)
+      (symbol "Conn_01x04_MountingPin_1_1"
+        (text "Mounting" (at 0 -6.731 0)
           (effects (font (size 0.381 0.381)))
         )
+        (rectangle (start -1.27 -4.953) (end 0 -5.207)
+          (stroke (width 0.1524)) (fill (type none))
+        )
         (rectangle (start -1.27 -2.413) (end 0 -2.667)
           (stroke (width 0.1524)) (fill (type none))
         )
         (rectangle (start -1.27 0.127) (end 0 -0.127)
           (stroke (width 0.1524)) (fill (type none))
         )
-        (rectangle (start -1.27 1.27) (end 1.27 -3.81)
+        (rectangle (start -1.27 2.667) (end 0 2.413)
+          (stroke (width 0.1524)) (fill (type none))
+        )
+        (rectangle (start -1.27 3.81) (end 1.27 -6.35)
           (stroke (width 0.254)) (fill (type background))
         )
         (polyline
           (pts
-            (xy -1.016 -4.572)
-            (xy 1.016 -4.572)
+            (xy -1.016 -7.112)
+            (xy 1.016 -7.112)
           )
           (stroke (width 0.1524)) (fill (type none))
         )
-        (pin passive line (at -5.08 0 0) (length 3.81)
+        (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 -2.54 0) (length 3.81)
+        (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 0 -7.62 90) (length 3.048)
+        (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))))
+        )
+        (pin passive line (at -5.08 -5.08 0) (length 3.81)
+          (name "Pin_4" (effects (font (size 1.27 1.27))))
+          (number "4" (effects (font (size 1.27 1.27))))
+        )
+        (pin passive line (at 0 -10.16 90) (length 3.048)
           (name "MountPin" (effects (font (size 1.27 1.27))))
           (number "MP" (effects (font (size 1.27 1.27))))
         )
@@ -108,21 +122,87 @@
         )
       )
     )
+    (symbol "power:PWR_FLAG" (power) (pin_numbers hide) (pin_names (offset 0) hide) (in_bom yes) (on_board yes)
+      (property "Reference" "#FLG" (id 0) (at 0 1.905 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "Value" "PWR_FLAG" (id 1) (at 0 3.81 0)
+        (effects (font (size 1.27 1.27)))
+      )
+      (property "Footprint" "" (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" "power-flag" (id 4) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (property "ki_description" "Special symbol for telling ERC where power comes from" (id 5) (at 0 0 0)
+        (effects (font (size 1.27 1.27)) hide)
+      )
+      (symbol "PWR_FLAG_0_0"
+        (pin power_out line (at 0 0 90) (length 0)
+          (name "pwr" (effects (font (size 1.27 1.27))))
+          (number "1" (effects (font (size 1.27 1.27))))
+        )
+      )
+      (symbol "PWR_FLAG_0_1"
+        (polyline
+          (pts
+            (xy 0 0)
+            (xy 0 1.27)
+            (xy -1.016 1.905)
+            (xy 0 2.54)
+            (xy 1.016 1.905)
+            (xy 0 1.27)
+          )
+          (stroke (width 0)) (fill (type none))
+        )
+      )
+    )
   )
 
+  (junction (at 177.8 93.98) (diameter 0.9144) (color 0 0 0 0))
+  (junction (at 177.8 101.6) (diameter 0.9144) (color 0 0 0 0))
+  (junction (at 182.88 93.98) (diameter 0.9144) (color 0 0 0 0))
 
-  (wire (pts (xy 171.45 93.98) (xy 182.88 93.98))
+  (wire (pts (xy 175.26 93.98) (xy 177.8 93.98))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid d5b2ee10-ee5c-4056-9f9b-0c39a2f4dd0f)
   )
-  (wire (pts (xy 171.45 96.52) (xy 173.99 96.52))
+  (wire (pts (xy 175.26 96.52) (xy 177.8 96.52))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid 3ab91a1b-068a-44f4-ba91-26f03726c35a)
+  )
+  (wire (pts (xy 175.26 99.06) (xy 177.8 99.06))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid c2479a62-d903-451c-80d5-548b0cfca283)
+  )
+  (wire (pts (xy 175.26 101.6) (xy 177.8 101.6))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid eb4ee143-5352-4afd-bfe9-fb6e9c1230b0)
   )
-  (wire (pts (xy 173.99 96.52) (xy 173.99 99.06))
+  (wire (pts (xy 177.8 93.98) (xy 182.88 93.98))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid d5b2ee10-ee5c-4056-9f9b-0c39a2f4dd0f)
+  )
+  (wire (pts (xy 177.8 96.52) (xy 177.8 93.98))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid 3ab91a1b-068a-44f4-ba91-26f03726c35a)
+  )
+  (wire (pts (xy 177.8 99.06) (xy 177.8 101.6))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid c2479a62-d903-451c-80d5-548b0cfca283)
+  )
+  (wire (pts (xy 177.8 101.6) (xy 177.8 104.14))
     (stroke (width 0) (type solid) (color 0 0 0 0))
     (uuid eb4ee143-5352-4afd-bfe9-fb6e9c1230b0)
   )
+  (wire (pts (xy 182.88 93.98) (xy 186.69 93.98))
+    (stroke (width 0) (type solid) (color 0 0 0 0))
+    (uuid d5b2ee10-ee5c-4056-9f9b-0c39a2f4dd0f)
+  )
 
   (text "Protection and CC line configuration\nis part of Access port module"
     (at 163.83 85.09 0)
@@ -130,60 +210,78 @@
     (uuid 8bf22bb7-fb45-45aa-a207-b549e0f937a7)
   )
 
-  (hierarchical_label "USB_POWER" (shape input) (at 182.88 93.98 0)
+  (hierarchical_label "USB_POWER" (shape input) (at 186.69 93.98 0)
     (effects (font (size 1.27 1.27) (thickness 0.254)) (justify left))
     (uuid d94df75d-11e8-4075-95d1-64fd8e96579c)
   )
 
-  (symbol (lib_id "power:GND") (at 166.37 101.6 0) (unit 1)
+  (symbol (lib_id "power:PWR_FLAG") (at 182.88 93.98 0) (unit 1)
+    (in_bom yes) (on_board yes) (fields_autoplaced)
+    (uuid 23bac90a-67ec-4f39-afbb-36799cd25092)
+    (property "Reference" "#FLG017" (id 0) (at 182.88 92.075 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Value" "PWR_FLAG" (id 1) (at 182.88 90.3754 0))
+    (property "Footprint" "" (id 2) (at 182.88 93.98 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (property "Datasheet" "~" (id 3) (at 182.88 93.98 0)
+      (effects (font (size 1.27 1.27)) hide)
+    )
+    (pin "1" (uuid 081d3d27-811c-4998-b28c-3b4f32509769))
+  )
+
+  (symbol (lib_id "power:GND") (at 170.18 106.68 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid 88708268-94e6-44ea-b3df-b6ed97390a62)
-    (property "Reference" "#PWR0288" (id 0) (at 166.37 107.95 0)
+    (uuid f3179a51-ce67-4f96-9a0f-40ef7668e229)
+    (property "Reference" "#PWR0279" (id 0) (at 170.18 113.03 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 166.37 106.1626 0)
+    (property "Value" "GND" (id 1) (at 170.18 111.2426 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "" (id 2) (at 166.37 101.6 0)
+    (property "Footprint" "" (id 2) (at 170.18 106.68 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 166.37 101.6 0)
+    (property "Datasheet" "" (id 3) (at 170.18 106.68 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid 5a989c00-1762-4cd2-8dd6-238a81cd7f0f))
+    (pin "1" (uuid 12787b8a-9625-4d08-b355-7188b8d6818d))
   )
 
-  (symbol (lib_id "power:GND") (at 173.99 99.06 0) (unit 1)
+  (symbol (lib_id "power:GND") (at 177.8 104.14 0) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
     (uuid dae00e47-3713-4b7a-82c5-13bba541887c)
-    (property "Reference" "#PWR0289" (id 0) (at 173.99 105.41 0)
+    (property "Reference" "#PWR0280" (id 0) (at 177.8 110.49 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "GND" (id 1) (at 173.99 103.6226 0)
+    (property "Value" "GND" (id 1) (at 177.8 108.7026 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "" (id 2) (at 173.99 99.06 0)
+    (property "Footprint" "" (id 2) (at 177.8 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "" (id 3) (at 173.99 99.06 0)
+    (property "Datasheet" "" (id 3) (at 177.8 104.14 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid d42ea072-b16d-4f01-a873-ab2e591e1af5))
   )
 
-  (symbol (lib_id "Connector_Generic_MountingPin:Conn_01x02_MountingPin") (at 166.37 93.98 0) (mirror y) (unit 1)
+  (symbol (lib_id "Connector_Generic_MountingPin:Conn_01x04_MountingPin") (at 170.18 96.52 0) (mirror y) (unit 1)
     (in_bom yes) (on_board yes) (fields_autoplaced)
-    (uuid a5dbaa49-5970-41cd-b838-13cd32a76980)
-    (property "Reference" "J?" (id 0) (at 168.402 88.7434 0))
-    (property "Value" "USB_POWER" (id 1) (at 168.402 91.5185 0))
-    (property "Footprint" "" (id 2) (at 166.37 93.98 0)
+    (uuid 54e74f5e-f1ac-457c-a393-65946b8321d6)
+    (property "Reference" "J24" (id 0) (at 172.212 88.7434 0))
+    (property "Value" "USB_POWER" (id 1) (at 172.212 91.5185 0))
+    (property "Footprint" "" (id 2) (at 170.18 96.52 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (id 3) (at 166.37 93.98 0)
+    (property "Datasheet" "~" (id 3) (at 170.18 96.52 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "1" (uuid e037c510-c0ae-44fa-8da1-1082c1f10b4d))
-    (pin "2" (uuid 60970112-9ece-42ba-941e-926202b258e7))
-    (pin "MP" (uuid 4d08a513-c369-4943-b726-7bf838cd9e35))
+    (pin "1" (uuid eacac5e0-8bcb-4fb2-ace0-72cd94d357e0))
+    (pin "2" (uuid a2de5d41-f640-45e4-bb90-1c06a17adc14))
+    (pin "3" (uuid 0069f29f-ed04-4799-91ba-a9a36ab9b8ec))
+    (pin "4" (uuid 6c96bbbc-f03e-446d-a398-cdb5b3e6142d))
+    (pin "MP" (uuid ce36b827-8cad-4e9c-98f5-5d4d5aa634f1))
   )
 )