diff --git a/src/test/resources/dig/test/switch/relayFullAdder2.dig b/src/test/resources/dig/test/switch/relayFullAdder2.dig
index 026ed59d7..e2c749ede 100644
--- a/src/test/resources/dig/test/switch/relayFullAdder2.dig
+++ b/src/test/resources/dig/test/switch/relayFullAdder2.dig
@@ -15,7 +15,7 @@
           <int>4</int>
         </entry>
       </elementAttributes>
-      <pos x="200" y="40"/>
+      <pos x="180" y="40"/>
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
@@ -29,7 +29,7 @@
           <int>4</int>
         </entry>
       </elementAttributes>
-      <pos x="200" y="180"/>
+      <pos x="180" y="180"/>
     </visualElement>
     <visualElement>
       <elementName>Testcase</elementName>
@@ -50,7 +50,7 @@ end loop
           </testData>
         </entry>
       </elementAttributes>
-      <pos x="200" y="860"/>
+      <pos x="960" y="800"/>
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
@@ -60,7 +60,7 @@ end loop
           <string>C_in</string>
         </entry>
       </elementAttributes>
-      <pos x="740" y="220"/>
+      <pos x="180" y="-60"/>
     </visualElement>
     <visualElement>
       <elementName>RelayDT</elementName>
@@ -113,7 +113,7 @@ end loop
           <rotation rotation="2"/>
         </entry>
       </elementAttributes>
-      <pos x="820" y="160"/>
+      <pos x="820" y="20"/>
     </visualElement>
     <visualElement>
       <elementName>RelayDT</elementName>
@@ -123,22 +123,22 @@ end loop
           <int>2</int>
         </entry>
       </elementAttributes>
-      <pos x="680" y="140"/>
+      <pos x="680" y="0"/>
     </visualElement>
     <visualElement>
       <elementName>Ground</elementName>
       <elementAttributes/>
-      <pos x="740" y="100"/>
+      <pos x="740" y="-40"/>
     </visualElement>
     <visualElement>
       <elementName>Ground</elementName>
       <elementAttributes/>
-      <pos x="840" y="240"/>
+      <pos x="840" y="100"/>
     </visualElement>
     <visualElement>
       <elementName>VDD</elementName>
       <elementAttributes/>
-      <pos x="660" y="120"/>
+      <pos x="660" y="-20"/>
     </visualElement>
     <visualElement>
       <elementName>RelayDT</elementName>
@@ -191,7 +191,7 @@ end loop
           <rotation rotation="2"/>
         </entry>
       </elementAttributes>
-      <pos x="820" y="380"/>
+      <pos x="820" y="240"/>
     </visualElement>
     <visualElement>
       <elementName>RelayDT</elementName>
@@ -201,22 +201,22 @@ end loop
           <int>2</int>
         </entry>
       </elementAttributes>
-      <pos x="680" y="360"/>
+      <pos x="680" y="220"/>
     </visualElement>
     <visualElement>
       <elementName>Ground</elementName>
       <elementAttributes/>
-      <pos x="740" y="320"/>
+      <pos x="740" y="180"/>
     </visualElement>
     <visualElement>
       <elementName>Ground</elementName>
       <elementAttributes/>
-      <pos x="840" y="460"/>
+      <pos x="840" y="320"/>
     </visualElement>
     <visualElement>
       <elementName>VDD</elementName>
       <elementAttributes/>
-      <pos x="660" y="340"/>
+      <pos x="660" y="200"/>
     </visualElement>
     <visualElement>
       <elementName>Splitter</elementName>
@@ -230,7 +230,7 @@ end loop
           <string>1*4</string>
         </entry>
       </elementAttributes>
-      <pos x="240" y="40"/>
+      <pos x="220" y="40"/>
     </visualElement>
     <visualElement>
       <elementName>Splitter</elementName>
@@ -244,7 +244,7 @@ end loop
           <string>1*4</string>
         </entry>
       </elementAttributes>
-      <pos x="240" y="180"/>
+      <pos x="220" y="180"/>
     </visualElement>
     <visualElement>
       <elementName>Splitter</elementName>
@@ -258,7 +258,7 @@ end loop
           <string>4</string>
         </entry>
       </elementAttributes>
-      <pos x="940" y="120"/>
+      <pos x="960" y="-20"/>
     </visualElement>
     <visualElement>
       <elementName>Out</elementName>
@@ -272,7 +272,7 @@ end loop
           <int>4</int>
         </entry>
       </elementAttributes>
-      <pos x="1000" y="120"/>
+      <pos x="1020" y="-20"/>
     </visualElement>
     <visualElement>
       <elementName>PullDown</elementName>
@@ -282,7 +282,7 @@ end loop
           <int>4</int>
         </entry>
       </elementAttributes>
-      <pos x="980" y="140"/>
+      <pos x="1000" y="0"/>
     </visualElement>
     <visualElement>
       <elementName>RelayDT</elementName>
@@ -335,7 +335,7 @@ end loop
           <rotation rotation="2"/>
         </entry>
       </elementAttributes>
-      <pos x="820" y="600"/>
+      <pos x="820" y="460"/>
     </visualElement>
     <visualElement>
       <elementName>RelayDT</elementName>
@@ -345,22 +345,22 @@ end loop
           <int>2</int>
         </entry>
       </elementAttributes>
-      <pos x="680" y="580"/>
+      <pos x="680" y="440"/>
     </visualElement>
     <visualElement>
       <elementName>Ground</elementName>
       <elementAttributes/>
-      <pos x="740" y="540"/>
+      <pos x="740" y="400"/>
     </visualElement>
     <visualElement>
       <elementName>Ground</elementName>
       <elementAttributes/>
-      <pos x="840" y="680"/>
+      <pos x="840" y="540"/>
     </visualElement>
     <visualElement>
       <elementName>VDD</elementName>
       <elementAttributes/>
-      <pos x="660" y="560"/>
+      <pos x="660" y="420"/>
     </visualElement>
     <visualElement>
       <elementName>RelayDT</elementName>
@@ -409,7 +409,7 @@ end loop
           <string>C_out</string>
         </entry>
       </elementAttributes>
-      <pos x="1000" y="820"/>
+      <pos x="1020" y="680"/>
     </visualElement>
     <visualElement>
       <elementName>RelayDT</elementName>
@@ -423,7 +423,7 @@ end loop
           <rotation rotation="2"/>
         </entry>
       </elementAttributes>
-      <pos x="820" y="820"/>
+      <pos x="820" y="680"/>
     </visualElement>
     <visualElement>
       <elementName>RelayDT</elementName>
@@ -433,27 +433,27 @@ end loop
           <int>2</int>
         </entry>
       </elementAttributes>
-      <pos x="680" y="800"/>
+      <pos x="680" y="660"/>
     </visualElement>
     <visualElement>
       <elementName>Ground</elementName>
       <elementAttributes/>
-      <pos x="740" y="760"/>
+      <pos x="740" y="620"/>
     </visualElement>
     <visualElement>
       <elementName>Ground</elementName>
       <elementAttributes/>
-      <pos x="840" y="900"/>
+      <pos x="840" y="760"/>
     </visualElement>
     <visualElement>
       <elementName>VDD</elementName>
       <elementAttributes/>
-      <pos x="660" y="780"/>
+      <pos x="660" y="640"/>
     </visualElement>
     <visualElement>
       <elementName>PullDown</elementName>
       <elementAttributes/>
-      <pos x="980" y="840"/>
+      <pos x="1000" y="700"/>
     </visualElement>
   </visualElements>
   <wires>
@@ -466,28 +466,28 @@ end loop
       <p2 x="500" y="360"/>
     </wire>
     <wire>
-      <p1 x="760" y="160"/>
-      <p2 x="740" y="180"/>
+      <p1 x="760" y="20"/>
+      <p2 x="740" y="40"/>
     </wire>
     <wire>
-      <p1 x="760" y="380"/>
-      <p2 x="740" y="400"/>
+      <p1 x="760" y="240"/>
+      <p2 x="740" y="260"/>
     </wire>
     <wire>
       <p1 x="520" y="560"/>
       <p2 x="500" y="580"/>
     </wire>
     <wire>
-      <p1 x="760" y="600"/>
-      <p2 x="740" y="620"/>
+      <p1 x="760" y="460"/>
+      <p2 x="740" y="480"/>
     </wire>
     <wire>
       <p1 x="520" y="780"/>
       <p2 x="500" y="800"/>
     </wire>
     <wire>
-      <p1 x="760" y="820"/>
-      <p2 x="740" y="840"/>
+      <p1 x="760" y="680"/>
+      <p2 x="740" y="700"/>
     </wire>
     <wire>
       <p1 x="480" y="320"/>
@@ -498,17 +498,45 @@ end loop
       <p2 x="440" y="320"/>
     </wire>
     <wire>
-      <p1 x="640" y="260"/>
-      <p2 x="860" y="260"/>
+      <p1 x="820" y="640"/>
+      <p2 x="940" y="640"/>
+    </wire>
+    <wire>
+      <p1 x="720" y="640"/>
+      <p2 x="780" y="640"/>
+    </wire>
+    <wire>
+      <p1 x="720" y="0"/>
+      <p2 x="780" y="0"/>
+    </wire>
+    <wire>
+      <p1 x="660" y="0"/>
+      <p2 x="680" y="0"/>
+    </wire>
+    <wire>
+      <p1 x="900" y="0"/>
+      <p2 x="960" y="0"/>
     </wire>
     <wire>
       <p1 x="480" y="260"/>
       <p2 x="500" y="260"/>
     </wire>
     <wire>
-      <p1 x="380" y="260"/>
+      <p1 x="360" y="260"/>
       <p2 x="440" y="260"/>
     </wire>
+    <wire>
+      <p1 x="720" y="260"/>
+      <p2 x="740" y="260"/>
+    </wire>
+    <wire>
+      <p1 x="760" y="260"/>
+      <p2 x="780" y="260"/>
+    </wire>
+    <wire>
+      <p1 x="660" y="260"/>
+      <p2 x="680" y="260"/>
+    </wire>
     <wire>
       <p1 x="480" y="580"/>
       <p2 x="500" y="580"/>
@@ -521,50 +549,50 @@ end loop
       <p1 x="420" y="580"/>
       <p2 x="440" y="580"/>
     </wire>
-    <wire>
-      <p1 x="720" y="580"/>
-      <p2 x="780" y="580"/>
-    </wire>
-    <wire>
-      <p1 x="660" y="580"/>
-      <p2 x="680" y="580"/>
-    </wire>
-    <wire>
-      <p1 x="260" y="200"/>
-      <p2 x="360" y="200"/>
-    </wire>
     <wire>
       <p1 x="580" y="520"/>
-      <p2 x="680" y="520"/>
+      <p2 x="780" y="520"/>
     </wire>
     <wire>
       <p1 x="480" y="520"/>
       <p2 x="540" y="520"/>
     </wire>
     <wire>
-      <p1 x="720" y="520"/>
-      <p2 x="740" y="520"/>
+      <p1 x="820" y="520"/>
+      <p2 x="840" y="520"/>
+    </wire>
+    <wire>
+      <p1 x="240" y="200"/>
+      <p2 x="340" y="200"/>
+    </wire>
+    <wire>
+      <p1 x="820" y="200"/>
+      <p2 x="900" y="200"/>
+    </wire>
+    <wire>
+      <p1 x="720" y="200"/>
+      <p2 x="780" y="200"/>
     </wire>
     <wire>
       <p1 x="580" y="840"/>
       <p2 x="600" y="840"/>
     </wire>
     <wire>
-      <p1 x="720" y="840"/>
-      <p2 x="740" y="840"/>
-    </wire>
-    <wire>
-      <p1 x="760" y="840"/>
-      <p2 x="780" y="840"/>
-    </wire>
-    <wire>
-      <p1 x="660" y="840"/>
-      <p2 x="680" y="840"/>
-    </wire>
-    <wire>
-      <p1 x="280" y="840"/>
+      <p1 x="260" y="840"/>
       <p2 x="540" y="840"/>
     </wire>
+    <wire>
+      <p1 x="580" y="780"/>
+      <p2 x="860" y="780"/>
+    </wire>
+    <wire>
+      <p1 x="480" y="780"/>
+      <p2 x="500" y="780"/>
+    </wire>
+    <wire>
+      <p1 x="520" y="780"/>
+      <p2 x="540" y="780"/>
+    </wire>
     <wire>
       <p1 x="480" y="140"/>
       <p2 x="500" y="140"/>
@@ -578,39 +606,35 @@ end loop
       <p2 x="440" y="140"/>
     </wire>
     <wire>
-      <p1 x="720" y="140"/>
-      <p2 x="780" y="140"/>
+      <p1 x="720" y="460"/>
+      <p2 x="740" y="460"/>
     </wire>
     <wire>
-      <p1 x="660" y="140"/>
-      <p2 x="680" y="140"/>
+      <p1 x="760" y="460"/>
+      <p2 x="780" y="460"/>
     </wire>
     <wire>
-      <p1 x="880" y="140"/>
-      <p2 x="940" y="140"/>
+      <p1 x="820" y="460"/>
+      <p2 x="860" y="460"/>
     </wire>
     <wire>
-      <p1 x="580" y="780"/>
-      <p2 x="620" y="780"/>
+      <p1 x="580" y="80"/>
+      <p2 x="780" y="80"/>
     </wire>
     <wire>
-      <p1 x="480" y="780"/>
-      <p2 x="500" y="780"/>
+      <p1 x="480" y="80"/>
+      <p2 x="540" y="80"/>
     </wire>
     <wire>
-      <p1 x="520" y="780"/>
-      <p2 x="540" y="780"/>
+      <p1 x="240" y="80"/>
+      <p2 x="320" y="80"/>
     </wire>
     <wire>
-      <p1 x="820" y="780"/>
-      <p2 x="920" y="780"/>
+      <p1 x="820" y="80"/>
+      <p2 x="840" y="80"/>
     </wire>
     <wire>
-      <p1 x="720" y="780"/>
-      <p2 x="780" y="780"/>
-    </wire>
-    <wire>
-      <p1 x="360" y="400"/>
+      <p1 x="340" y="400"/>
       <p2 x="540" y="400"/>
     </wire>
     <wire>
@@ -618,36 +642,24 @@ end loop
       <p2 x="600" y="400"/>
     </wire>
     <wire>
-      <p1 x="720" y="400"/>
-      <p2 x="740" y="400"/>
+      <p1 x="820" y="-20"/>
+      <p2 x="960" y="-20"/>
     </wire>
     <wire>
-      <p1 x="760" y="400"/>
-      <p2 x="780" y="400"/>
+      <p1 x="720" y="-20"/>
+      <p2 x="780" y="-20"/>
     </wire>
     <wire>
-      <p1 x="660" y="400"/>
-      <p2 x="680" y="400"/>
+      <p1 x="980" y="-20"/>
+      <p2 x="1000" y="-20"/>
     </wire>
     <wire>
-      <p1 x="580" y="80"/>
-      <p2 x="680" y="80"/>
-    </wire>
-    <wire>
-      <p1 x="480" y="80"/>
-      <p2 x="540" y="80"/>
-    </wire>
-    <wire>
-      <p1 x="720" y="80"/>
-      <p2 x="740" y="80"/>
-    </wire>
-    <wire>
-      <p1 x="260" y="80"/>
-      <p2 x="340" y="80"/>
+      <p1 x="1000" y="-20"/>
+      <p2 x="1020" y="-20"/>
     </wire>
     <wire>
       <p1 x="580" y="340"/>
-      <p2 x="620" y="340"/>
+      <p2 x="660" y="340"/>
     </wire>
     <wire>
       <p1 x="480" y="340"/>
@@ -658,36 +670,52 @@ end loop
       <p2 x="540" y="340"/>
     </wire>
     <wire>
-      <p1 x="820" y="340"/>
-      <p2 x="880" y="340"/>
+      <p1 x="660" y="340"/>
+      <p2 x="860" y="340"/>
     </wire>
     <wire>
-      <p1 x="720" y="340"/>
-      <p2 x="780" y="340"/>
+      <p1 x="820" y="20"/>
+      <p2 x="860" y="20"/>
     </wire>
     <wire>
-      <p1 x="820" y="660"/>
-      <p2 x="840" y="660"/>
+      <p1 x="720" y="20"/>
+      <p2 x="740" y="20"/>
     </wire>
     <wire>
-      <p1 x="640" y="660"/>
+      <p1 x="760" y="20"/>
+      <p2 x="780" y="20"/>
+    </wire>
+    <wire>
+      <p1 x="920" y="20"/>
+      <p2 x="960" y="20"/>
+    </wire>
+    <wire>
+      <p1 x="720" y="660"/>
       <p2 x="780" y="660"/>
     </wire>
     <wire>
-      <p1 x="620" y="920"/>
-      <p2 x="860" y="920"/>
+      <p1 x="660" y="660"/>
+      <p2 x="680" y="660"/>
     </wire>
     <wire>
       <p1 x="720" y="600"/>
       <p2 x="740" y="600"/>
     </wire>
     <wire>
-      <p1 x="760" y="600"/>
-      <p2 x="780" y="600"/>
+      <p1 x="660" y="600"/>
+      <p2 x="680" y="600"/>
     </wire>
     <wire>
-      <p1 x="820" y="600"/>
-      <p2 x="860" y="600"/>
+      <p1 x="720" y="220"/>
+      <p2 x="780" y="220"/>
+    </wire>
+    <wire>
+      <p1 x="660" y="220"/>
+      <p2 x="680" y="220"/>
+    </wire>
+    <wire>
+      <p1 x="240" y="220"/>
+      <p2 x="300" y="220"/>
     </wire>
     <wire>
       <p1 x="480" y="540"/>
@@ -698,16 +726,32 @@ end loop
       <p2 x="440" y="540"/>
     </wire>
     <wire>
-      <p1 x="740" y="220"/>
-      <p2 x="780" y="220"/>
+      <p1 x="720" y="480"/>
+      <p2 x="740" y="480"/>
     </wire>
     <wire>
-      <p1 x="820" y="220"/>
-      <p2 x="840" y="220"/>
+      <p1 x="760" y="480"/>
+      <p2 x="780" y="480"/>
     </wire>
     <wire>
-      <p1 x="260" y="220"/>
-      <p2 x="320" y="220"/>
+      <p1 x="660" y="480"/>
+      <p2 x="680" y="480"/>
+    </wire>
+    <wire>
+      <p1 x="480" y="480"/>
+      <p2 x="500" y="480"/>
+    </wire>
+    <wire>
+      <p1 x="320" y="480"/>
+      <p2 x="440" y="480"/>
+    </wire>
+    <wire>
+      <p1 x="720" y="160"/>
+      <p2 x="740" y="160"/>
+    </wire>
+    <wire>
+      <p1 x="660" y="160"/>
+      <p2 x="680" y="160"/>
     </wire>
     <wire>
       <p1 x="480" y="800"/>
@@ -721,57 +765,25 @@ end loop
       <p1 x="420" y="800"/>
       <p2 x="440" y="800"/>
     </wire>
-    <wire>
-      <p1 x="720" y="800"/>
-      <p2 x="780" y="800"/>
-    </wire>
-    <wire>
-      <p1 x="660" y="800"/>
-      <p2 x="680" y="800"/>
-    </wire>
-    <wire>
-      <p1 x="480" y="480"/>
-      <p2 x="500" y="480"/>
-    </wire>
-    <wire>
-      <p1 x="340" y="480"/>
-      <p2 x="440" y="480"/>
-    </wire>
-    <wire>
-      <p1 x="620" y="480"/>
-      <p2 x="640" y="480"/>
-    </wire>
-    <wire>
-      <p1 x="640" y="480"/>
-      <p2 x="860" y="480"/>
-    </wire>
-    <wire>
-      <p1 x="820" y="160"/>
-      <p2 x="860" y="160"/>
-    </wire>
-    <wire>
-      <p1 x="720" y="160"/>
-      <p2 x="740" y="160"/>
-    </wire>
-    <wire>
-      <p1 x="760" y="160"/>
-      <p2 x="780" y="160"/>
-    </wire>
-    <wire>
-      <p1 x="900" y="160"/>
-      <p2 x="940" y="160"/>
-    </wire>
     <wire>
       <p1 x="580" y="740"/>
-      <p2 x="680" y="740"/>
+      <p2 x="780" y="740"/>
+    </wire>
+    <wire>
+      <p1 x="820" y="740"/>
+      <p2 x="840" y="740"/>
     </wire>
     <wire>
       <p1 x="480" y="740"/>
       <p2 x="540" y="740"/>
     </wire>
     <wire>
-      <p1 x="720" y="740"/>
-      <p2 x="740" y="740"/>
+      <p1 x="820" y="420"/>
+      <p2 x="920" y="420"/>
+    </wire>
+    <wire>
+      <p1 x="720" y="420"/>
+      <p2 x="780" y="420"/>
     </wire>
     <wire>
       <p1 x="480" y="100"/>
@@ -782,20 +794,56 @@ end loop
       <p2 x="440" y="100"/>
     </wire>
     <wire>
-      <p1 x="260" y="100"/>
-      <p2 x="300" y="100"/>
+      <p1 x="240" y="100"/>
+      <p2 x="280" y="100"/>
+    </wire>
+    <wire>
+      <p1 x="720" y="40"/>
+      <p2 x="740" y="40"/>
+    </wire>
+    <wire>
+      <p1 x="760" y="40"/>
+      <p2 x="780" y="40"/>
+    </wire>
+    <wire>
+      <p1 x="660" y="40"/>
+      <p2 x="680" y="40"/>
+    </wire>
+    <wire>
+      <p1 x="940" y="40"/>
+      <p2 x="960" y="40"/>
     </wire>
     <wire>
       <p1 x="480" y="40"/>
       <p2 x="500" y="40"/>
     </wire>
     <wire>
-      <p1 x="260" y="40"/>
+      <p1 x="240" y="40"/>
       <p2 x="440" y="40"/>
     </wire>
     <wire>
-      <p1 x="200" y="40"/>
-      <p2 x="240" y="40"/>
+      <p1 x="180" y="40"/>
+      <p2 x="220" y="40"/>
+    </wire>
+    <wire>
+      <p1 x="720" y="680"/>
+      <p2 x="740" y="680"/>
+    </wire>
+    <wire>
+      <p1 x="760" y="680"/>
+      <p2 x="780" y="680"/>
+    </wire>
+    <wire>
+      <p1 x="820" y="680"/>
+      <p2 x="860" y="680"/>
+    </wire>
+    <wire>
+      <p1 x="1000" y="680"/>
+      <p2 x="1020" y="680"/>
+    </wire>
+    <wire>
+      <p1 x="860" y="680"/>
+      <p2 x="1000" y="680"/>
     </wire>
     <wire>
       <p1 x="480" y="360"/>
@@ -809,57 +857,29 @@ end loop
       <p1 x="420" y="360"/>
       <p2 x="440" y="360"/>
     </wire>
-    <wire>
-      <p1 x="720" y="360"/>
-      <p2 x="780" y="360"/>
-    </wire>
-    <wire>
-      <p1 x="660" y="360"/>
-      <p2 x="680" y="360"/>
-    </wire>
-    <wire>
-      <p1 x="580" y="620"/>
-      <p2 x="600" y="620"/>
-    </wire>
-    <wire>
-      <p1 x="720" y="620"/>
-      <p2 x="740" y="620"/>
-    </wire>
-    <wire>
-      <p1 x="760" y="620"/>
-      <p2 x="780" y="620"/>
-    </wire>
-    <wire>
-      <p1 x="660" y="620"/>
-      <p2 x="680" y="620"/>
-    </wire>
-    <wire>
-      <p1 x="320" y="620"/>
-      <p2 x="540" y="620"/>
-    </wire>
     <wire>
       <p1 x="580" y="300"/>
-      <p2 x="680" y="300"/>
+      <p2 x="780" y="300"/>
+    </wire>
+    <wire>
+      <p1 x="820" y="300"/>
+      <p2 x="840" y="300"/>
     </wire>
     <wire>
       <p1 x="480" y="300"/>
       <p2 x="540" y="300"/>
     </wire>
     <wire>
-      <p1 x="720" y="300"/>
-      <p2 x="740" y="300"/>
+      <p1 x="580" y="620"/>
+      <p2 x="600" y="620"/>
     </wire>
     <wire>
-      <p1 x="820" y="880"/>
-      <p2 x="840" y="880"/>
-    </wire>
-    <wire>
-      <p1 x="640" y="880"/>
-      <p2 x="780" y="880"/>
+      <p1 x="300" y="620"/>
+      <p2 x="540" y="620"/>
     </wire>
     <wire>
       <p1 x="580" y="560"/>
-      <p2 x="620" y="560"/>
+      <p2 x="660" y="560"/>
     </wire>
     <wire>
       <p1 x="480" y="560"/>
@@ -870,39 +890,27 @@ end loop
       <p2 x="540" y="560"/>
     </wire>
     <wire>
-      <p1 x="820" y="560"/>
-      <p2 x="900" y="560"/>
+      <p1 x="660" y="560"/>
+      <p2 x="860" y="560"/>
     </wire>
     <wire>
-      <p1 x="720" y="560"/>
-      <p2 x="780" y="560"/>
+      <p1 x="820" y="240"/>
+      <p2 x="860" y="240"/>
     </wire>
     <wire>
-      <p1 x="260" y="240"/>
-      <p2 x="280" y="240"/>
+      <p1 x="720" y="240"/>
+      <p2 x="740" y="240"/>
     </wire>
     <wire>
-      <p1 x="720" y="820"/>
-      <p2 x="740" y="820"/>
+      <p1 x="760" y="240"/>
+      <p2 x="780" y="240"/>
     </wire>
     <wire>
-      <p1 x="760" y="820"/>
-      <p2 x="780" y="820"/>
+      <p1 x="240" y="240"/>
+      <p2 x="260" y="240"/>
     </wire>
     <wire>
-      <p1 x="820" y="820"/>
-      <p2 x="860" y="820"/>
-    </wire>
-    <wire>
-      <p1 x="860" y="820"/>
-      <p2 x="980" y="820"/>
-    </wire>
-    <wire>
-      <p1 x="980" y="820"/>
-      <p2 x="1000" y="820"/>
-    </wire>
-    <wire>
-      <p1 x="260" y="180"/>
+      <p1 x="240" y="180"/>
       <p2 x="540" y="180"/>
     </wire>
     <wire>
@@ -910,44 +918,12 @@ end loop
       <p2 x="600" y="180"/>
     </wire>
     <wire>
-      <p1 x="720" y="180"/>
-      <p2 x="740" y="180"/>
-    </wire>
-    <wire>
-      <p1 x="760" y="180"/>
-      <p2 x="780" y="180"/>
-    </wire>
-    <wire>
-      <p1 x="660" y="180"/>
-      <p2 x="680" y="180"/>
-    </wire>
-    <wire>
-      <p1 x="200" y="180"/>
-      <p2 x="240" y="180"/>
-    </wire>
-    <wire>
-      <p1 x="920" y="180"/>
-      <p2 x="940" y="180"/>
-    </wire>
-    <wire>
-      <p1 x="480" y="760"/>
-      <p2 x="540" y="760"/>
-    </wire>
-    <wire>
-      <p1 x="420" y="760"/>
-      <p2 x="440" y="760"/>
-    </wire>
-    <wire>
-      <p1 x="820" y="440"/>
-      <p2 x="840" y="440"/>
-    </wire>
-    <wire>
-      <p1 x="640" y="440"/>
-      <p2 x="780" y="440"/>
+      <p1 x="180" y="180"/>
+      <p2 x="220" y="180"/>
     </wire>
     <wire>
       <p1 x="580" y="120"/>
-      <p2 x="640" y="120"/>
+      <p2 x="660" y="120"/>
     </wire>
     <wire>
       <p1 x="480" y="120"/>
@@ -958,88 +934,68 @@ end loop
       <p2 x="540" y="120"/>
     </wire>
     <wire>
-      <p1 x="820" y="120"/>
-      <p2 x="940" y="120"/>
+      <p1 x="660" y="120"/>
+      <p2 x="860" y="120"/>
     </wire>
     <wire>
-      <p1 x="720" y="120"/>
-      <p2 x="780" y="120"/>
+      <p1 x="720" y="440"/>
+      <p2 x="780" y="440"/>
     </wire>
     <wire>
-      <p1 x="960" y="120"/>
-      <p2 x="980" y="120"/>
+      <p1 x="660" y="440"/>
+      <p2 x="680" y="440"/>
     </wire>
     <wire>
-      <p1 x="980" y="120"/>
-      <p2 x="1000" y="120"/>
+      <p1 x="480" y="760"/>
+      <p2 x="540" y="760"/>
+    </wire>
+    <wire>
+      <p1 x="420" y="760"/>
+      <p2 x="440" y="760"/>
+    </wire>
+    <wire>
+      <p1 x="180" y="-60"/>
+      <p2 x="680" y="-60"/>
+    </wire>
+    <wire>
+      <p1 x="720" y="-60"/>
+      <p2 x="740" y="-60"/>
+    </wire>
+    <wire>
+      <p1 x="720" y="700"/>
+      <p2 x="740" y="700"/>
+    </wire>
+    <wire>
+      <p1 x="760" y="700"/>
+      <p2 x="780" y="700"/>
+    </wire>
+    <wire>
+      <p1 x="660" y="700"/>
+      <p2 x="680" y="700"/>
     </wire>
     <wire>
       <p1 x="480" y="700"/>
       <p2 x="500" y="700"/>
     </wire>
     <wire>
-      <p1 x="300" y="700"/>
+      <p1 x="280" y="700"/>
       <p2 x="440" y="700"/>
     </wire>
-    <wire>
-      <p1 x="620" y="700"/>
-      <p2 x="640" y="700"/>
-    </wire>
-    <wire>
-      <p1 x="640" y="700"/>
-      <p2 x="860" y="700"/>
-    </wire>
-    <wire>
-      <p1 x="820" y="380"/>
-      <p2 x="860" y="380"/>
-    </wire>
     <wire>
       <p1 x="720" y="380"/>
       <p2 x="740" y="380"/>
     </wire>
     <wire>
-      <p1 x="760" y="380"/>
-      <p2 x="780" y="380"/>
+      <p1 x="660" y="380"/>
+      <p2 x="680" y="380"/>
     </wire>
     <wire>
-      <p1 x="260" y="60"/>
-      <p2 x="380" y="60"/>
+      <p1 x="240" y="60"/>
+      <p2 x="360" y="60"/>
     </wire>
     <wire>
-      <p1 x="640" y="700"/>
-      <p2 x="640" y="880"/>
-    </wire>
-    <wire>
-      <p1 x="640" y="480"/>
-      <p2 x="640" y="660"/>
-    </wire>
-    <wire>
-      <p1 x="640" y="120"/>
-      <p2 x="640" y="260"/>
-    </wire>
-    <wire>
-      <p1 x="640" y="260"/>
-      <p2 x="640" y="440"/>
-    </wire>
-    <wire>
-      <p1 x="320" y="220"/>
-      <p2 x="320" y="620"/>
-    </wire>
-    <wire>
-      <p1 x="740" y="80"/>
-      <p2 x="740" y="100"/>
-    </wire>
-    <wire>
-      <p1 x="740" y="300"/>
-      <p2 x="740" y="320"/>
-    </wire>
-    <wire>
-      <p1 x="740" y="520"/>
-      <p2 x="740" y="540"/>
-    </wire>
-    <wire>
-      <p1 x="740" y="740"/>
-      <p2 x="740" y="760"/>
+      <p1 x="320" y="80"/>
+      <p2 x="320" y="480"/>
     </wire>
     <wire>
       <p1 x="420" y="80"/>
@@ -1074,56 +1030,112 @@ end loop
       <p2 x="420" y="800"/>
     </wire>
     <wire>
-      <p1 x="900" y="160"/>
-      <p2 x="900" y="560"/>
+      <p1 x="740" y="-60"/>
+      <p2 x="740" y="-40"/>
     </wire>
     <wire>
-      <p1 x="840" y="220"/>
-      <p2 x="840" y="240"/>
+      <p1 x="740" y="160"/>
+      <p2 x="740" y="180"/>
     </wire>
     <wire>
-      <p1 x="840" y="440"/>
-      <p2 x="840" y="460"/>
+      <p1 x="740" y="380"/>
+      <p2 x="740" y="400"/>
     </wire>
     <wire>
-      <p1 x="840" y="660"/>
-      <p2 x="840" y="680"/>
+      <p1 x="740" y="600"/>
+      <p2 x="740" y="620"/>
     </wire>
     <wire>
-      <p1 x="840" y="880"/>
-      <p2 x="840" y="900"/>
+      <p1 x="900" y="0"/>
+      <p2 x="900" y="200"/>
     </wire>
     <wire>
-      <p1 x="360" y="200"/>
-      <p2 x="360" y="400"/>
+      <p1 x="260" y="240"/>
+      <p2 x="260" y="840"/>
     </wire>
     <wire>
-      <p1 x="620" y="340"/>
-      <p2 x="620" y="480"/>
+      <p1 x="1000" y="-20"/>
+      <p2 x="1000" y="0"/>
     </wire>
     <wire>
-      <p1 x="620" y="560"/>
-      <p2 x="620" y="700"/>
+      <p1 x="1000" y="680"/>
+      <p2 x="1000" y="700"/>
     </wire>
     <wire>
-      <p1 x="620" y="780"/>
-      <p2 x="620" y="920"/>
+      <p1 x="840" y="80"/>
+      <p2 x="840" y="100"/>
     </wire>
     <wire>
-      <p1 x="300" y="100"/>
-      <p2 x="300" y="700"/>
+      <p1 x="840" y="300"/>
+      <p2 x="840" y="320"/>
     </wire>
     <wire>
-      <p1 x="880" y="140"/>
-      <p2 x="880" y="340"/>
+      <p1 x="840" y="520"/>
+      <p2 x="840" y="540"/>
     </wire>
     <wire>
-      <p1 x="980" y="120"/>
-      <p2 x="980" y="140"/>
+      <p1 x="840" y="740"/>
+      <p2 x="840" y="760"/>
     </wire>
     <wire>
-      <p1 x="980" y="820"/>
-      <p2 x="980" y="840"/>
+      <p1 x="360" y="60"/>
+      <p2 x="360" y="260"/>
+    </wire>
+    <wire>
+      <p1 x="300" y="220"/>
+      <p2 x="300" y="620"/>
+    </wire>
+    <wire>
+      <p1 x="940" y="40"/>
+      <p2 x="940" y="640"/>
+    </wire>
+    <wire>
+      <p1 x="340" y="200"/>
+      <p2 x="340" y="400"/>
+    </wire>
+    <wire>
+      <p1 x="660" y="560"/>
+      <p2 x="660" y="600"/>
+    </wire>
+    <wire>
+      <p1 x="660" y="340"/>
+      <p2 x="660" y="380"/>
+    </wire>
+    <wire>
+      <p1 x="660" y="120"/>
+      <p2 x="660" y="160"/>
+    </wire>
+    <wire>
+      <p1 x="660" y="-20"/>
+      <p2 x="660" y="0"/>
+    </wire>
+    <wire>
+      <p1 x="660" y="200"/>
+      <p2 x="660" y="220"/>
+    </wire>
+    <wire>
+      <p1 x="660" y="420"/>
+      <p2 x="660" y="440"/>
+    </wire>
+    <wire>
+      <p1 x="660" y="640"/>
+      <p2 x="660" y="660"/>
+    </wire>
+    <wire>
+      <p1 x="660" y="660"/>
+      <p2 x="660" y="700"/>
+    </wire>
+    <wire>
+      <p1 x="660" y="220"/>
+      <p2 x="660" y="260"/>
+    </wire>
+    <wire>
+      <p1 x="660" y="440"/>
+      <p2 x="660" y="480"/>
+    </wire>
+    <wire>
+      <p1 x="660" y="0"/>
+      <p2 x="660" y="40"/>
     </wire>
     <wire>
       <p1 x="500" y="40"/>
@@ -1142,40 +1154,12 @@ end loop
       <p2 x="500" y="720"/>
     </wire>
     <wire>
-      <p1 x="660" y="120"/>
-      <p2 x="660" y="140"/>
+      <p1 x="280" y="100"/>
+      <p2 x="280" y="700"/>
     </wire>
     <wire>
-      <p1 x="660" y="340"/>
-      <p2 x="660" y="360"/>
-    </wire>
-    <wire>
-      <p1 x="660" y="560"/>
-      <p2 x="660" y="580"/>
-    </wire>
-    <wire>
-      <p1 x="660" y="780"/>
-      <p2 x="660" y="800"/>
-    </wire>
-    <wire>
-      <p1 x="660" y="580"/>
-      <p2 x="660" y="620"/>
-    </wire>
-    <wire>
-      <p1 x="660" y="140"/>
-      <p2 x="660" y="180"/>
-    </wire>
-    <wire>
-      <p1 x="660" y="800"/>
-      <p2 x="660" y="840"/>
-    </wire>
-    <wire>
-      <p1 x="660" y="360"/>
-      <p2 x="660" y="400"/>
-    </wire>
-    <wire>
-      <p1 x="340" y="80"/>
-      <p2 x="340" y="480"/>
+      <p1 x="920" y="20"/>
+      <p2 x="920" y="420"/>
     </wire>
     <wire>
       <p1 x="600" y="180"/>
@@ -1194,32 +1178,21 @@ end loop
       <p2 x="600" y="860"/>
     </wire>
     <wire>
-      <p1 x="280" y="240"/>
-      <p2 x="280" y="840"/>
+      <p1 x="860" y="460"/>
+      <p2 x="860" y="560"/>
     </wire>
     <wire>
-      <p1 x="920" y="180"/>
-      <p2 x="920" y="780"/>
+      <p1 x="860" y="20"/>
+      <p2 x="860" y="120"/>
     </wire>
     <wire>
-      <p1 x="860" y="600"/>
-      <p2 x="860" y="700"/>
+      <p1 x="860" y="240"/>
+      <p2 x="860" y="340"/>
     </wire>
     <wire>
-      <p1 x="860" y="160"/>
-      <p2 x="860" y="260"/>
-    </wire>
-    <wire>
-      <p1 x="860" y="380"/>
-      <p2 x="860" y="480"/>
-    </wire>
-    <wire>
-      <p1 x="860" y="820"/>
-      <p2 x="860" y="920"/>
-    </wire>
-    <wire>
-      <p1 x="380" y="60"/>
-      <p2 x="380" y="260"/>
+      <p1 x="860" y="680"/>
+      <p2 x="860" y="780"/>
     </wire>
   </wires>
+  <measurementOrdering/>
 </circuit>
\ No newline at end of file