From a57deccd4ef94072196bd8557e707fd2a1b54429 Mon Sep 17 00:00:00 2001
From: Alessandro Mauri <alemauri001@gmail.com>
Date: Sun, 30 Oct 2022 23:34:31 +0100
Subject: [PATCH] Sun Oct 30 11:34:31 PM CET 2022

---
 alu.dig | 1151 +++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 913 insertions(+), 238 deletions(-)

diff --git a/alu.dig b/alu.dig
index c1ced12..d580757 100644
--- a/alu.dig
+++ b/alu.dig
@@ -6,7 +6,7 @@
     <visualElement>
       <elementName>shifter.dig</elementName>
       <elementAttributes/>
-      <pos x="420" y="660"/>
+      <pos x="480" y="660"/>
     </visualElement>
     <visualElement>
       <elementName>Sub</elementName>
@@ -37,7 +37,7 @@
       <elementAttributes>
         <entry>
           <string>Bits</string>
-          <int>32</int>
+          <int>16</int>
         </entry>
         <entry>
           <string>wideShape</string>
@@ -51,7 +51,7 @@
       <elementAttributes>
         <entry>
           <string>Bits</string>
-          <int>32</int>
+          <int>16</int>
         </entry>
         <entry>
           <string>wideShape</string>
@@ -67,8 +67,12 @@
           <string>Label</string>
           <string>a</string>
         </entry>
+        <entry>
+          <string>Bits</string>
+          <int>16</int>
+        </entry>
       </elementAttributes>
-      <pos x="260" y="300"/>
+      <pos x="-40" y="240"/>
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
@@ -77,8 +81,12 @@
           <string>Label</string>
           <string>b</string>
         </entry>
+        <entry>
+          <string>Bits</string>
+          <int>16</int>
+        </entry>
       </elementAttributes>
-      <pos x="260" y="340"/>
+      <pos x="-40" y="300"/>
     </visualElement>
     <visualElement>
       <elementName>multiply-add.dig</elementName>
@@ -97,11 +105,16 @@
           <int>16</int>
         </entry>
       </elementAttributes>
-      <pos x="260" y="380"/>
+      <pos x="-40" y="380"/>
     </visualElement>
     <visualElement>
       <elementName>Neg</elementName>
-      <elementAttributes/>
+      <elementAttributes>
+        <entry>
+          <string>Bits</string>
+          <int>16</int>
+        </entry>
+      </elementAttributes>
       <pos x="420" y="800"/>
     </visualElement>
     <visualElement>
@@ -116,7 +129,7 @@
           <string>1*16</string>
         </entry>
       </elementAttributes>
-      <pos x="1160" y="1200"/>
+      <pos x="980" y="840"/>
     </visualElement>
     <visualElement>
       <elementName>Splitter</elementName>
@@ -130,7 +143,7 @@
           <string>1*16</string>
         </entry>
       </elementAttributes>
-      <pos x="1160" y="800"/>
+      <pos x="980" y="440"/>
     </visualElement>
     <visualElement>
       <elementName>NOr</elementName>
@@ -144,7 +157,7 @@
           <int>16</int>
         </entry>
       </elementAttributes>
-      <pos x="1360" y="800"/>
+      <pos x="1180" y="440"/>
     </visualElement>
     <visualElement>
       <elementName>NOr</elementName>
@@ -158,17 +171,7 @@
           <int>16</int>
         </entry>
       </elementAttributes>
-      <pos x="1360" y="1200"/>
-    </visualElement>
-    <visualElement>
-      <elementName>NAnd</elementName>
-      <elementAttributes>
-        <entry>
-          <string>wideShape</string>
-          <boolean>true</boolean>
-        </entry>
-      </elementAttributes>
-      <pos x="1520" y="1140"/>
+      <pos x="1180" y="840"/>
     </visualElement>
     <visualElement>
       <elementName>Out</elementName>
@@ -178,7 +181,7 @@
           <string>LZ</string>
         </entry>
       </elementAttributes>
-      <pos x="1640" y="1160"/>
+      <pos x="1460" y="800"/>
     </visualElement>
     <visualElement>
       <elementName>Out</elementName>
@@ -188,21 +191,21 @@
           <string>Z</string>
         </entry>
       </elementAttributes>
-      <pos x="1640" y="1360"/>
+      <pos x="1460" y="1000"/>
     </visualElement>
     <visualElement>
       <elementName>Splitter</elementName>
       <elementAttributes>
         <entry>
           <string>Input Splitting</string>
-          <string>32</string>
+          <string>16</string>
         </entry>
         <entry>
           <string>Output Splitting</string>
-          <string>31,1</string>
+          <string>15,1</string>
         </entry>
       </elementAttributes>
-      <pos x="1540" y="1580"/>
+      <pos x="1060" y="1220"/>
     </visualElement>
     <visualElement>
       <elementName>Out</elementName>
@@ -212,7 +215,7 @@
           <string>N</string>
         </entry>
       </elementAttributes>
-      <pos x="1640" y="1600"/>
+      <pos x="1460" y="1240"/>
     </visualElement>
     <visualElement>
       <elementName>Add</elementName>
@@ -224,59 +227,411 @@
       </elementAttributes>
       <pos x="420" y="460"/>
     </visualElement>
+    <visualElement>
+      <elementName>XOr</elementName>
+      <elementAttributes>
+        <entry>
+          <string>wideShape</string>
+          <boolean>true</boolean>
+        </entry>
+      </elementAttributes>
+      <pos x="1140" y="1320"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Out</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Label</string>
+          <string>V</string>
+        </entry>
+      </elementAttributes>
+      <pos x="1460" y="1360"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Multiplexer</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Bits</string>
+          <int>16</int>
+        </entry>
+        <entry>
+          <string>Selector Bits</string>
+          <int>3</int>
+        </entry>
+      </elementAttributes>
+      <pos x="860" y="1460"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Multiplexer</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Selector Bits</string>
+          <int>3</int>
+        </entry>
+      </elementAttributes>
+      <pos x="860" y="1680"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Const</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Value</string>
+          <long>0</long>
+        </entry>
+      </elementAttributes>
+      <pos x="820" y="1820"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Out</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Label</string>
+          <string>u0</string>
+        </entry>
+        <entry>
+          <string>Bits</string>
+          <int>16</int>
+        </entry>
+      </elementAttributes>
+      <pos x="1460" y="1540"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Out</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Label</string>
+          <string>u1</string>
+        </entry>
+        <entry>
+          <string>Bits</string>
+          <int>16</int>
+        </entry>
+      </elementAttributes>
+      <pos x="1460" y="340"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Out</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Label</string>
+          <string>C_o</string>
+        </entry>
+      </elementAttributes>
+      <pos x="1460" y="1760"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>NetName</string>
+          <string>s</string>
+        </entry>
+      </elementAttributes>
+      <pos x="920" y="1660"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>NetName</string>
+          <string>s</string>
+        </entry>
+      </elementAttributes>
+      <pos x="920" y="1880"/>
+    </visualElement>
+    <visualElement>
+      <elementName>In</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Label</string>
+          <string>C_i</string>
+        </entry>
+      </elementAttributes>
+      <pos x="-40" y="180"/>
+    </visualElement>
+    <visualElement>
+      <elementName>In</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Label</string>
+          <string>Op</string>
+        </entry>
+        <entry>
+          <string>Bits</string>
+          <int>4</int>
+        </entry>
+      </elementAttributes>
+      <pos x="-40" y="0"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Splitter</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="3"/>
+        </entry>
+        <entry>
+          <string>Input Splitting</string>
+          <string>16</string>
+        </entry>
+        <entry>
+          <string>Output Splitting</string>
+          <string>15,1</string>
+        </entry>
+      </elementAttributes>
+      <pos x="380" y="1160"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Splitter</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="3"/>
+        </entry>
+        <entry>
+          <string>Input Splitting</string>
+          <string>16</string>
+        </entry>
+        <entry>
+          <string>Output Splitting</string>
+          <string>15,1</string>
+        </entry>
+      </elementAttributes>
+      <pos x="340" y="1160"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>NetName</string>
+          <string>s</string>
+        </entry>
+      </elementAttributes>
+      <pos x="580" y="0"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Splitter</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Input Splitting</string>
+          <string>1*3</string>
+        </entry>
+        <entry>
+          <string>Output Splitting</string>
+          <string>3</string>
+        </entry>
+      </elementAttributes>
+      <pos x="520" y="0"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Splitter</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Input Splitting</string>
+          <string>4</string>
+        </entry>
+        <entry>
+          <string>Output Splitting</string>
+          <string>1*4</string>
+        </entry>
+      </elementAttributes>
+      <pos x="60" y="0"/>
+    </visualElement>
+    <visualElement>
+      <elementName>And</elementName>
+      <elementAttributes>
+        <entry>
+          <string>wideShape</string>
+          <boolean>true</boolean>
+        </entry>
+      </elementAttributes>
+      <pos x="180" y="100"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Splitter</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Input Splitting</string>
+          <string>16</string>
+        </entry>
+        <entry>
+          <string>Output Splitting</string>
+          <string>4</string>
+        </entry>
+      </elementAttributes>
+      <pos x="420" y="700"/>
+    </visualElement>
+    <visualElement>
+      <elementName>And</elementName>
+      <elementAttributes>
+        <entry>
+          <string>wideShape</string>
+          <boolean>true</boolean>
+        </entry>
+        <entry>
+          <string>inverterConfig</string>
+          <inverterConfig>
+            <string>In_2</string>
+          </inverterConfig>
+        </entry>
+      </elementAttributes>
+      <pos x="380" y="80"/>
+    </visualElement>
+    <visualElement>
+      <elementName>And</elementName>
+      <elementAttributes>
+        <entry>
+          <string>wideShape</string>
+          <boolean>true</boolean>
+        </entry>
+      </elementAttributes>
+      <pos x="1260" y="1340"/>
+    </visualElement>
+    <visualElement>
+      <elementName>XNOr</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="3"/>
+        </entry>
+        <entry>
+          <string>wideShape</string>
+          <boolean>true</boolean>
+        </entry>
+      </elementAttributes>
+      <pos x="360" y="1260"/>
+    </visualElement>
+    <visualElement>
+      <elementName>And</elementName>
+      <elementAttributes>
+        <entry>
+          <string>wideShape</string>
+          <boolean>true</boolean>
+        </entry>
+      </elementAttributes>
+      <pos x="1340" y="780"/>
+    </visualElement>
   </visualElements>
   <wires>
     <wire>
-      <p1 x="1180" y="1280"/>
-      <p2 x="1360" y="1280"/>
+      <p1 x="1000" y="640"/>
+      <p2 x="1120" y="640"/>
+    </wire>
+    <wire>
+      <p1 x="1140" y="640"/>
+      <p2 x="1180" y="640"/>
+    </wire>
+    <wire>
+      <p1 x="80" y="0"/>
+      <p2 x="520" y="0"/>
+    </wire>
+    <wire>
+      <p1 x="-40" y="0"/>
+      <p2 x="60" y="0"/>
+    </wire>
+    <wire>
+      <p1 x="540" y="0"/>
+      <p2 x="580" y="0"/>
+    </wire>
+    <wire>
+      <p1 x="360" y="900"/>
+      <p2 x="420" y="900"/>
+    </wire>
+    <wire>
+      <p1 x="1000" y="900"/>
+      <p2 x="1180" y="900"/>
+    </wire>
+    <wire>
+      <p1 x="580" y="1540"/>
+      <p2 x="860" y="1540"/>
+    </wire>
+    <wire>
+      <p1 x="900" y="1540"/>
+      <p2 x="920" y="1540"/>
+    </wire>
+    <wire>
+      <p1 x="920" y="1540"/>
+      <p2 x="1460" y="1540"/>
+    </wire>
+    <wire>
+      <p1 x="840" y="1800"/>
+      <p2 x="860" y="1800"/>
+    </wire>
+    <wire>
+      <p1 x="1020" y="1160"/>
+      <p2 x="1180" y="1160"/>
+    </wire>
+    <wire>
+      <p1 x="1000" y="520"/>
+      <p2 x="1180" y="520"/>
+    </wire>
+    <wire>
+      <p1 x="1300" y="780"/>
+      <p2 x="1340" y="780"/>
+    </wire>
+    <wire>
+      <p1 x="120" y="140"/>
+      <p2 x="180" y="140"/>
     </wire>
     <wire>
-      <p1 x="360" y="900"/>
-      <p2 x="420" y="900"/>
+      <p1 x="780" y="1680"/>
+      <p2 x="860" y="1680"/>
     </wire>
     <wire>
-      <p1 x="1180" y="900"/>
-      <p2 x="1360" y="900"/>
+      <p1 x="1000" y="1040"/>
+      <p2 x="1120" y="1040"/>
     </wire>
     <wire>
-      <p1 x="1620" y="1160"/>
-      <p2 x="1640" y="1160"/>
+      <p1 x="1140" y="1040"/>
+      <p2 x="1180" y="1040"/>
     </wire>
     <wire>
-      <p1 x="1180" y="1420"/>
-      <p2 x="1280" y="1420"/>
+      <p1 x="340" y="400"/>
+      <p2 x="420" y="400"/>
     </wire>
     <wire>
-      <p1 x="1300" y="1420"/>
-      <p2 x="1360" y="1420"/>
+      <p1 x="380" y="660"/>
+      <p2 x="480" y="660"/>
     </wire>
     <wire>
-      <p1 x="1180" y="1040"/>
-      <p2 x="1260" y="1040"/>
+      <p1 x="540" y="660"/>
+      <p2 x="600" y="660"/>
     </wire>
     <wire>
-      <p1 x="1280" y="1040"/>
-      <p2 x="1360" y="1040"/>
+      <p1 x="1000" y="660"/>
+      <p2 x="1100" y="660"/>
     </wire>
     <wire>
-      <p1 x="380" y="660"/>
-      <p2 x="420" y="660"/>
+      <p1 x="1120" y="660"/>
+      <p2 x="1180" y="660"/>
     </wire>
     <wire>
-      <p1 x="480" y="660"/>
-      <p2 x="600" y="660"/>
+      <p1 x="80" y="20"/>
+      <p2 x="520" y="20"/>
+    </wire>
+    <wire>
+      <p1 x="1000" y="920"/>
+      <p2 x="1180" y="920"/>
+    </wire>
+    <wire>
+      <p1 x="560" y="1560"/>
+      <p2 x="860" y="1560"/>
+    </wire>
+    <wire>
+      <p1 x="1000" y="540"/>
+      <p2 x="1180" y="540"/>
     </wire>
     <wire>
-      <p1 x="1180" y="1300"/>
-      <p2 x="1360" y="1300"/>
+      <p1 x="820" y="1820"/>
+      <p2 x="840" y="1820"/>
     </wire>
     <wire>
-      <p1 x="1180" y="920"/>
-      <p2 x="1360" y="920"/>
+      <p1 x="840" y="1820"/>
+      <p2 x="860" y="1820"/>
     </wire>
     <wire>
-      <p1 x="1480" y="1180"/>
-      <p2 x="1520" y="1180"/>
+      <p1 x="1420" y="800"/>
+      <p2 x="1460" y="800"/>
     </wire>
     <wire>
       <p1 x="380" y="800"/>
@@ -287,48 +642,68 @@
       <p2 x="580" y="800"/>
     </wire>
     <wire>
-      <p1 x="1180" y="800"/>
-      <p2 x="1360" y="800"/>
-    </wire>
-    <wire>
-      <p1 x="1180" y="1440"/>
-      <p2 x="1260" y="1440"/>
+      <p1 x="1000" y="1060"/>
+      <p2 x="1100" y="1060"/>
     </wire>
     <wire>
-      <p1 x="1280" y="1440"/>
-      <p2 x="1360" y="1440"/>
+      <p1 x="1120" y="1060"/>
+      <p2 x="1180" y="1060"/>
     </wire>
     <wire>
       <p1 x="380" y="1060"/>
       <p2 x="420" y="1060"/>
     </wire>
     <wire>
-      <p1 x="1180" y="1060"/>
-      <p2 x="1240" y="1060"/>
+      <p1 x="760" y="1700"/>
+      <p2 x="860" y="1700"/>
+    </wire>
+    <wire>
+      <p1 x="1000" y="680"/>
+      <p2 x="1080" y="680"/>
     </wire>
     <wire>
-      <p1 x="1260" y="1060"/>
-      <p2 x="1360" y="1060"/>
+      <p1 x="1100" y="680"/>
+      <p2 x="1180" y="680"/>
     </wire>
     <wire>
-      <p1 x="480" y="680"/>
+      <p1 x="540" y="680"/>
       <p2 x="720" y="680"/>
     </wire>
     <wire>
-      <p1 x="1180" y="1320"/>
-      <p2 x="1360" y="1320"/>
+      <p1 x="340" y="680"/>
+      <p2 x="480" y="680"/>
+    </wire>
+    <wire>
+      <p1 x="1120" y="1320"/>
+      <p2 x="1140" y="1320"/>
+    </wire>
+    <wire>
+      <p1 x="80" y="40"/>
+      <p2 x="140" y="40"/>
+    </wire>
+    <wire>
+      <p1 x="500" y="40"/>
+      <p2 x="520" y="40"/>
+    </wire>
+    <wire>
+      <p1 x="140" y="40"/>
+      <p2 x="340" y="40"/>
+    </wire>
+    <wire>
+      <p1 x="1000" y="940"/>
+      <p2 x="1180" y="940"/>
     </wire>
     <wire>
-      <p1 x="260" y="300"/>
-      <p2 x="380" y="300"/>
+      <p1 x="540" y="1580"/>
+      <p2 x="860" y="1580"/>
     </wire>
     <wire>
-      <p1 x="1180" y="940"/>
-      <p2 x="1360" y="940"/>
+      <p1 x="-40" y="300"/>
+      <p2 x="360" y="300"/>
     </wire>
     <wire>
-      <p1 x="1140" y="1580"/>
-      <p2 x="1540" y="1580"/>
+      <p1 x="1000" y="560"/>
+      <p2 x="1180" y="560"/>
     </wire>
     <wire>
       <p1 x="380" y="560"/>
@@ -339,60 +714,92 @@
       <p2 x="620" y="560"/>
     </wire>
     <wire>
-      <p1 x="1180" y="1200"/>
-      <p2 x="1360" y="1200"/>
+      <p1 x="-40" y="180"/>
+      <p2 x="340" y="180"/>
+    </wire>
+    <wire>
+      <p1 x="1300" y="820"/>
+      <p2 x="1340" y="820"/>
+    </wire>
+    <wire>
+      <p1 x="660" y="1460"/>
+      <p2 x="860" y="1460"/>
+    </wire>
+    <wire>
+      <p1 x="1000" y="440"/>
+      <p2 x="1180" y="440"/>
     </wire>
     <wire>
-      <p1 x="1180" y="820"/>
-      <p2 x="1360" y="820"/>
+      <p1 x="800" y="440"/>
+      <p2 x="980" y="440"/>
     </wire>
     <wire>
-      <p1 x="1180" y="1460"/>
-      <p2 x="1240" y="1460"/>
+      <p1 x="1000" y="1080"/>
+      <p2 x="1080" y="1080"/>
     </wire>
     <wire>
-      <p1 x="1260" y="1460"/>
-      <p2 x="1360" y="1460"/>
+      <p1 x="1100" y="1080"/>
+      <p2 x="1180" y="1080"/>
     </wire>
     <wire>
       <p1 x="500" y="1080"/>
       <p2 x="520" y="1080"/>
     </wire>
     <wire>
-      <p1 x="1180" y="1080"/>
-      <p2 x="1220" y="1080"/>
+      <p1 x="740" y="1720"/>
+      <p2 x="860" y="1720"/>
+    </wire>
+    <wire>
+      <p1 x="1220" y="1340"/>
+      <p2 x="1260" y="1340"/>
+    </wire>
+    <wire>
+      <p1 x="80" y="60"/>
+      <p2 x="120" y="60"/>
+    </wire>
+    <wire>
+      <p1 x="120" y="60"/>
+      <p2 x="320" y="60"/>
+    </wire>
+    <wire>
+      <p1 x="1000" y="700"/>
+      <p2 x="1060" y="700"/>
+    </wire>
+    <wire>
+      <p1 x="1080" y="700"/>
+      <p2 x="1180" y="700"/>
     </wire>
     <wire>
-      <p1 x="1240" y="1080"/>
-      <p2 x="1360" y="1080"/>
+      <p1 x="440" y="700"/>
+      <p2 x="480" y="700"/>
     </wire>
     <wire>
       <p1 x="360" y="700"/>
       <p2 x="420" y="700"/>
     </wire>
     <wire>
-      <p1 x="1180" y="1340"/>
-      <p2 x="1360" y="1340"/>
+      <p1 x="1000" y="960"/>
+      <p2 x="1180" y="960"/>
     </wire>
     <wire>
       <p1 x="380" y="960"/>
       <p2 x="420" y="960"/>
     </wire>
     <wire>
-      <p1 x="1180" y="960"/>
-      <p2 x="1340" y="960"/>
-    </wire>
-    <wire>
-      <p1 x="1460" y="960"/>
-      <p2 x="1480" y="960"/>
+      <p1 x="520" y="1600"/>
+      <p2 x="860" y="1600"/>
     </wire>
     <wire>
       <p1 x="480" y="320"/>
       <p2 x="660" y="320"/>
     </wire>
     <wire>
-      <p1 x="1560" y="1600"/>
-      <p2 x="1640" y="1600"/>
+      <p1 x="320" y="320"/>
+      <p2 x="420" y="320"/>
+    </wire>
+    <wire>
+      <p1 x="1000" y="580"/>
+      <p2 x="1180" y="580"/>
     </wire>
     <wire>
       <p1 x="360" y="580"/>
@@ -403,32 +810,40 @@
       <p2 x="740" y="580"/>
     </wire>
     <wire>
-      <p1 x="1180" y="1220"/>
-      <p2 x="1360" y="1220"/>
+      <p1 x="920" y="1220"/>
+      <p2 x="1060" y="1220"/>
     </wire>
     <wire>
-      <p1 x="1180" y="840"/>
-      <p2 x="1360" y="840"/>
+      <p1 x="1000" y="840"/>
+      <p2 x="1180" y="840"/>
     </wire>
     <wire>
-      <p1 x="1180" y="1480"/>
-      <p2 x="1220" y="1480"/>
+      <p1 x="920" y="840"/>
+      <p2 x="980" y="840"/>
     </wire>
     <wire>
-      <p1 x="1240" y="1480"/>
-      <p2 x="1360" y="1480"/>
+      <p1 x="640" y="1480"/>
+      <p2 x="860" y="1480"/>
     </wire>
     <wire>
-      <p1 x="360" y="1100"/>
-      <p2 x="420" y="1100"/>
+      <p1 x="1000" y="1100"/>
+      <p2 x="1060" y="1100"/>
+    </wire>
+    <wire>
+      <p1 x="1080" y="1100"/>
+      <p2 x="1180" y="1100"/>
+    </wire>
+    <wire>
+      <p1 x="340" y="1100"/>
+      <p2 x="360" y="1100"/>
     </wire>
     <wire>
-      <p1 x="1180" y="1100"/>
-      <p2 x="1200" y="1100"/>
+      <p1 x="360" y="1100"/>
+      <p2 x="420" y="1100"/>
     </wire>
     <wire>
-      <p1 x="1220" y="1100"/>
-      <p2 x="1360" y="1100"/>
+      <p1 x="1000" y="460"/>
+      <p2 x="1180" y="460"/>
     </wire>
     <wire>
       <p1 x="380" y="460"/>
@@ -439,60 +854,104 @@
       <p2 x="640" y="460"/>
     </wire>
     <wire>
-      <p1 x="1180" y="1360"/>
-      <p2 x="1340" y="1360"/>
+      <p1 x="720" y="1740"/>
+      <p2 x="860" y="1740"/>
     </wire>
     <wire>
-      <p1 x="1460" y="1360"/>
-      <p2 x="1480" y="1360"/>
+      <p1 x="1340" y="1360"/>
+      <p2 x="1460" y="1360"/>
     </wire>
     <wire>
-      <p1 x="1480" y="1360"/>
-      <p2 x="1640" y="1360"/>
+      <p1 x="400" y="1360"/>
+      <p2 x="1140" y="1360"/>
     </wire>
     <wire>
-      <p1 x="500" y="980"/>
-      <p2 x="540" y="980"/>
+      <p1 x="340" y="80"/>
+      <p2 x="380" y="80"/>
+    </wire>
+    <wire>
+      <p1 x="1000" y="720"/>
+      <p2 x="1040" y="720"/>
+    </wire>
+    <wire>
+      <p1 x="1060" y="720"/>
+      <p2 x="1180" y="720"/>
     </wire>
     <wire>
-      <p1 x="1180" y="980"/>
-      <p2 x="1320" y="980"/>
+      <p1 x="320" y="720"/>
+      <p2 x="480" y="720"/>
     </wire>
     <wire>
-      <p1 x="1340" y="980"/>
-      <p2 x="1360" y="980"/>
+      <p1 x="1000" y="980"/>
+      <p2 x="1180" y="980"/>
     </wire>
     <wire>
-      <p1 x="260" y="340"/>
-      <p2 x="360" y="340"/>
+      <p1 x="500" y="980"/>
+      <p2 x="540" y="980"/>
     </wire>
     <wire>
       <p1 x="380" y="340"/>
       <p2 x="420" y="340"/>
     </wire>
     <wire>
-      <p1 x="1180" y="1240"/>
-      <p2 x="1360" y="1240"/>
+      <p1 x="480" y="340"/>
+      <p2 x="800" y="340"/>
+    </wire>
+    <wire>
+      <p1 x="800" y="340"/>
+      <p2 x="1460" y="340"/>
+    </wire>
+    <wire>
+      <p1 x="1080" y="1240"/>
+      <p2 x="1120" y="1240"/>
+    </wire>
+    <wire>
+      <p1 x="360" y="1240"/>
+      <p2 x="400" y="1240"/>
+    </wire>
+    <wire>
+      <p1 x="1120" y="1240"/>
+      <p2 x="1460" y="1240"/>
+    </wire>
+    <wire>
+      <p1 x="1000" y="600"/>
+      <p2 x="1160" y="600"/>
+    </wire>
+    <wire>
+      <p1 x="1280" y="600"/>
+      <p2 x="1300" y="600"/>
+    </wire>
+    <wire>
+      <p1 x="340" y="600"/>
+      <p2 x="420" y="600"/>
+    </wire>
+    <wire>
+      <p1 x="880" y="1880"/>
+      <p2 x="920" y="1880"/>
+    </wire>
+    <wire>
+      <p1 x="620" y="1500"/>
+      <p2 x="860" y="1500"/>
     </wire>
     <wire>
-      <p1 x="1180" y="860"/>
-      <p2 x="1360" y="860"/>
+      <p1 x="1000" y="860"/>
+      <p2 x="1180" y="860"/>
     </wire>
     <wire>
       <p1 x="380" y="860"/>
       <p2 x="420" y="860"/>
     </wire>
     <wire>
-      <p1 x="1180" y="1500"/>
-      <p2 x="1200" y="1500"/>
+      <p1 x="1000" y="1120"/>
+      <p2 x="1040" y="1120"/>
     </wire>
     <wire>
-      <p1 x="1220" y="1500"/>
-      <p2 x="1360" y="1500"/>
+      <p1 x="1060" y="1120"/>
+      <p2 x="1180" y="1120"/>
     </wire>
     <wire>
-      <p1 x="1200" y="1120"/>
-      <p2 x="1360" y="1120"/>
+      <p1 x="1000" y="480"/>
+      <p2 x="1180" y="480"/>
     </wire>
     <wire>
       <p1 x="360" y="480"/>
@@ -503,25 +962,53 @@
       <p2 x="760" y="480"/>
     </wire>
     <wire>
-      <p1 x="1180" y="1380"/>
-      <p2 x="1320" y="1380"/>
+      <p1 x="840" y="1760"/>
+      <p2 x="860" y="1760"/>
     </wire>
     <wire>
-      <p1 x="1340" y="1380"/>
-      <p2 x="1360" y="1380"/>
+      <p1 x="900" y="1760"/>
+      <p2 x="1460" y="1760"/>
     </wire>
     <wire>
-      <p1 x="1180" y="1000"/>
-      <p2 x="1300" y="1000"/>
+      <p1 x="140" y="100"/>
+      <p2 x="180" y="100"/>
+    </wire>
+    <wire>
+      <p1 x="460" y="100"/>
+      <p2 x="500" y="100"/>
+    </wire>
+    <wire>
+      <p1 x="1000" y="740"/>
+      <p2 x="1020" y="740"/>
+    </wire>
+    <wire>
+      <p1 x="1040" y="740"/>
+      <p2 x="1180" y="740"/>
+    </wire>
+    <wire>
+      <p1 x="300" y="740"/>
+      <p2 x="480" y="740"/>
+    </wire>
+    <wire>
+      <p1 x="340" y="1380"/>
+      <p2 x="1260" y="1380"/>
+    </wire>
+    <wire>
+      <p1 x="1000" y="1000"/>
+      <p2 x="1160" y="1000"/>
     </wire>
     <wire>
-      <p1 x="1320" y="1000"/>
-      <p2 x="1360" y="1000"/>
+      <p1 x="1280" y="1000"/>
+      <p2 x="1300" y="1000"/>
     </wire>
     <wire>
       <p1 x="360" y="1000"/>
       <p2 x="420" y="1000"/>
     </wire>
+    <wire>
+      <p1 x="1300" y="1000"/>
+      <p2 x="1460" y="1000"/>
+    </wire>
     <wire>
       <p1 x="360" y="360"/>
       <p2 x="420" y="360"/>
@@ -531,201 +1018,397 @@
       <p2 x="780" y="360"/>
     </wire>
     <wire>
-      <p1 x="1180" y="1260"/>
-      <p2 x="1360" y="1260"/>
+      <p1 x="1000" y="620"/>
+      <p2 x="1140" y="620"/>
     </wire>
     <wire>
-      <p1 x="1200" y="1520"/>
-      <p2 x="1360" y="1520"/>
+      <p1 x="1160" y="620"/>
+      <p2 x="1180" y="620"/>
     </wire>
     <wire>
-      <p1 x="1180" y="880"/>
-      <p2 x="1360" y="880"/>
+      <p1 x="-40" y="240"/>
+      <p2 x="380" y="240"/>
+    </wire>
+    <wire>
+      <p1 x="1000" y="880"/>
+      <p2 x="1180" y="880"/>
     </wire>
     <wire>
       <p1 x="500" y="880"/>
       <p2 x="560" y="880"/>
     </wire>
     <wire>
-      <p1 x="1480" y="1140"/>
-      <p2 x="1520" y="1140"/>
+      <p1 x="600" y="1520"/>
+      <p2 x="860" y="1520"/>
     </wire>
     <wire>
-      <p1 x="1180" y="1400"/>
-      <p2 x="1300" y="1400"/>
+      <p1 x="1000" y="1140"/>
+      <p2 x="1020" y="1140"/>
     </wire>
     <wire>
-      <p1 x="1320" y="1400"/>
-      <p2 x="1360" y="1400"/>
+      <p1 x="1040" y="1140"/>
+      <p2 x="1180" y="1140"/>
     </wire>
     <wire>
-      <p1 x="1180" y="1020"/>
-      <p2 x="1280" y="1020"/>
+      <p1 x="1000" y="500"/>
+      <p2 x="1180" y="500"/>
     </wire>
     <wire>
-      <p1 x="1300" y="1020"/>
-      <p2 x="1360" y="1020"/>
+      <p1 x="340" y="500"/>
+      <p2 x="420" y="500"/>
     </wire>
     <wire>
-      <p1 x="260" y="380"/>
-      <p2 x="420" y="380"/>
+      <p1 x="840" y="1780"/>
+      <p2 x="860" y="1780"/>
     </wire>
     <wire>
-      <p1 x="640" y="460"/>
-      <p2 x="640" y="1300"/>
+      <p1 x="260" y="120"/>
+      <p2 x="300" y="120"/>
     </wire>
     <wire>
-      <p1 x="1280" y="1420"/>
-      <p2 x="1280" y="1440"/>
+      <p1 x="300" y="120"/>
+      <p2 x="360" y="120"/>
     </wire>
     <wire>
-      <p1 x="1280" y="1020"/>
-      <p2 x="1280" y="1040"/>
+      <p1 x="1020" y="760"/>
+      <p2 x="1180" y="760"/>
     </wire>
     <wire>
-      <p1 x="580" y="800"/>
-      <p2 x="580" y="1300"/>
+      <p1 x="1000" y="1020"/>
+      <p2 x="1140" y="1020"/>
     </wire>
     <wire>
-      <p1 x="740" y="580"/>
-      <p2 x="740" y="1300"/>
+      <p1 x="1160" y="1020"/>
+      <p2 x="1180" y="1020"/>
     </wire>
     <wire>
-      <p1 x="1220" y="1480"/>
-      <p2 x="1220" y="1500"/>
+      <p1 x="-40" y="380"/>
+      <p2 x="420" y="380"/>
     </wire>
     <wire>
-      <p1 x="1220" y="1080"/>
-      <p2 x="1220" y="1100"/>
+      <p1 x="880" y="1660"/>
+      <p2 x="920" y="1660"/>
     </wire>
     <wire>
-      <p1 x="360" y="340"/>
-      <p2 x="360" y="360"/>
+      <p1 x="320" y="60"/>
+      <p2 x="320" y="320"/>
     </wire>
     <wire>
-      <p1 x="360" y="360"/>
-      <p2 x="360" y="480"/>
+      <p1 x="320" y="1180"/>
+      <p2 x="320" y="1260"/>
     </wire>
     <wire>
-      <p1 x="360" y="900"/>
-      <p2 x="360" y="1000"/>
+      <p1 x="320" y="320"/>
+      <p2 x="320" y="720"/>
     </wire>
     <wire>
-      <p1 x="360" y="700"/>
-      <p2 x="360" y="900"/>
+      <p1 x="640" y="460"/>
+      <p2 x="640" y="1480"/>
     </wire>
     <wire>
-      <p1 x="360" y="480"/>
-      <p2 x="360" y="580"/>
+      <p1 x="640" y="1480"/>
+      <p2 x="640" y="1840"/>
     </wire>
     <wire>
-      <p1 x="360" y="1000"/>
-      <p2 x="360" y="1100"/>
+      <p1 x="580" y="800"/>
+      <p2 x="580" y="1540"/>
     </wire>
     <wire>
-      <p1 x="360" y="580"/>
-      <p2 x="360" y="700"/>
+      <p1 x="580" y="1540"/>
+      <p2 x="580" y="1840"/>
     </wire>
     <wire>
       <p1 x="520" y="1080"/>
-      <p2 x="520" y="1300"/>
+      <p2 x="520" y="1600"/>
     </wire>
     <wire>
-      <p1 x="1320" y="1380"/>
-      <p2 x="1320" y="1400"/>
+      <p1 x="520" y="1600"/>
+      <p2 x="520" y="1840"/>
     </wire>
     <wire>
-      <p1 x="1320" y="980"/>
-      <p2 x="1320" y="1000"/>
+      <p1 x="840" y="1760"/>
+      <p2 x="840" y="1780"/>
     </wire>
     <wire>
-      <p1 x="1480" y="1180"/>
-      <p2 x="1480" y="1360"/>
+      <p1 x="840" y="1780"/>
+      <p2 x="840" y="1800"/>
     </wire>
     <wire>
-      <p1 x="1480" y="960"/>
-      <p2 x="1480" y="1140"/>
+      <p1 x="840" y="1800"/>
+      <p2 x="840" y="1820"/>
     </wire>
     <wire>
-      <p1 x="620" y="560"/>
-      <p2 x="620" y="1300"/>
+      <p1 x="1160" y="1000"/>
+      <p2 x="1160" y="1020"/>
+    </wire>
+    <wire>
+      <p1 x="1160" y="600"/>
+      <p2 x="1160" y="620"/>
     </wire>
     <wire>
       <p1 x="780" y="360"/>
-      <p2 x="780" y="1300"/>
+      <p2 x="780" y="1680"/>
     </wire>
     <wire>
-      <p1 x="1260" y="1440"/>
-      <p2 x="1260" y="1460"/>
+      <p1 x="780" y="1680"/>
+      <p2 x="780" y="1840"/>
     </wire>
     <wire>
-      <p1 x="1260" y="1040"/>
-      <p2 x="1260" y="1060"/>
+      <p1 x="1100" y="1060"/>
+      <p2 x="1100" y="1080"/>
     </wire>
     <wire>
-      <p1 x="560" y="880"/>
-      <p2 x="560" y="1300"/>
+      <p1 x="1100" y="660"/>
+      <p2 x="1100" y="680"/>
+    </wire>
+    <wire>
+      <p1 x="140" y="40"/>
+      <p2 x="140" y="100"/>
+    </wire>
+    <wire>
+      <p1 x="1040" y="1120"/>
+      <p2 x="1040" y="1140"/>
+    </wire>
+    <wire>
+      <p1 x="1040" y="720"/>
+      <p2 x="1040" y="740"/>
     </wire>
     <wire>
       <p1 x="720" y="680"/>
-      <p2 x="720" y="1300"/>
+      <p2 x="720" y="1740"/>
     </wire>
     <wire>
-      <p1 x="1200" y="1500"/>
-      <p2 x="1200" y="1520"/>
+      <p1 x="720" y="1740"/>
+      <p2 x="720" y="1840"/>
     </wire>
     <wire>
-      <p1 x="1200" y="1100"/>
-      <p2 x="1200" y="1120"/>
+      <p1 x="400" y="1240"/>
+      <p2 x="400" y="1360"/>
     </wire>
     <wire>
-      <p1 x="660" y="320"/>
-      <p2 x="660" y="1300"/>
+      <p1 x="340" y="1100"/>
+      <p2 x="340" y="1160"/>
     </wire>
     <wire>
-      <p1 x="1300" y="1400"/>
-      <p2 x="1300" y="1420"/>
+      <p1 x="340" y="180"/>
+      <p2 x="340" y="400"/>
     </wire>
     <wire>
-      <p1 x="1300" y="1000"/>
-      <p2 x="1300" y="1020"/>
+      <p1 x="340" y="40"/>
+      <p2 x="340" y="80"/>
+    </wire>
+    <wire>
+      <p1 x="340" y="1360"/>
+      <p2 x="340" y="1380"/>
+    </wire>
+    <wire>
+      <p1 x="340" y="400"/>
+      <p2 x="340" y="500"/>
+    </wire>
+    <wire>
+      <p1 x="340" y="500"/>
+      <p2 x="340" y="600"/>
+    </wire>
+    <wire>
+      <p1 x="340" y="600"/>
+      <p2 x="340" y="680"/>
+    </wire>
+    <wire>
+      <p1 x="1300" y="820"/>
+      <p2 x="1300" y="1000"/>
+    </wire>
+    <wire>
+      <p1 x="1300" y="600"/>
+      <p2 x="1300" y="780"/>
     </wire>
     <wire>
-      <p1 x="1240" y="1460"/>
-      <p2 x="1240" y="1480"/>
+      <p1 x="660" y="320"/>
+      <p2 x="660" y="1460"/>
     </wire>
     <wire>
-      <p1 x="1240" y="1060"/>
-      <p2 x="1240" y="1080"/>
+      <p1 x="660" y="1460"/>
+      <p2 x="660" y="1840"/>
     </wire>
     <wire>
       <p1 x="600" y="660"/>
-      <p2 x="600" y="1300"/>
+      <p2 x="600" y="1520"/>
+    </wire>
+    <wire>
+      <p1 x="600" y="1520"/>
+      <p2 x="600" y="1840"/>
+    </wire>
+    <wire>
+      <p1 x="920" y="840"/>
+      <p2 x="920" y="1220"/>
+    </wire>
+    <wire>
+      <p1 x="920" y="1220"/>
+      <p2 x="920" y="1540"/>
+    </wire>
+    <wire>
+      <p1 x="540" y="980"/>
+      <p2 x="540" y="1580"/>
+    </wire>
+    <wire>
+      <p1 x="540" y="1580"/>
+      <p2 x="540" y="1840"/>
+    </wire>
+    <wire>
+      <p1 x="1120" y="1240"/>
+      <p2 x="1120" y="1320"/>
+    </wire>
+    <wire>
+      <p1 x="1120" y="1040"/>
+      <p2 x="1120" y="1060"/>
+    </wire>
+    <wire>
+      <p1 x="1120" y="640"/>
+      <p2 x="1120" y="660"/>
+    </wire>
+    <wire>
+      <p1 x="800" y="340"/>
+      <p2 x="800" y="440"/>
+    </wire>
+    <wire>
+      <p1 x="1060" y="1100"/>
+      <p2 x="1060" y="1120"/>
+    </wire>
+    <wire>
+      <p1 x="1060" y="700"/>
+      <p2 x="1060" y="720"/>
+    </wire>
+    <wire>
+      <p1 x="740" y="580"/>
+      <p2 x="740" y="1720"/>
+    </wire>
+    <wire>
+      <p1 x="740" y="1720"/>
+      <p2 x="740" y="1840"/>
+    </wire>
+    <wire>
+      <p1 x="360" y="1180"/>
+      <p2 x="360" y="1240"/>
+    </wire>
+    <wire>
+      <p1 x="360" y="300"/>
+      <p2 x="360" y="360"/>
+    </wire>
+    <wire>
+      <p1 x="360" y="700"/>
+      <p2 x="360" y="900"/>
+    </wire>
+    <wire>
+      <p1 x="360" y="1240"/>
+      <p2 x="360" y="1260"/>
+    </wire>
+    <wire>
+      <p1 x="360" y="360"/>
+      <p2 x="360" y="480"/>
+    </wire>
+    <wire>
+      <p1 x="360" y="900"/>
+      <p2 x="360" y="1000"/>
+    </wire>
+    <wire>
+      <p1 x="360" y="480"/>
+      <p2 x="360" y="580"/>
+    </wire>
+    <wire>
+      <p1 x="360" y="1000"/>
+      <p2 x="360" y="1100"/>
+    </wire>
+    <wire>
+      <p1 x="360" y="580"/>
+      <p2 x="360" y="700"/>
+    </wire>
+    <wire>
+      <p1 x="620" y="560"/>
+      <p2 x="620" y="1500"/>
+    </wire>
+    <wire>
+      <p1 x="620" y="1500"/>
+      <p2 x="620" y="1840"/>
+    </wire>
+    <wire>
+      <p1 x="300" y="120"/>
+      <p2 x="300" y="740"/>
+    </wire>
+    <wire>
+      <p1 x="560" y="880"/>
+      <p2 x="560" y="1560"/>
+    </wire>
+    <wire>
+      <p1 x="560" y="1560"/>
+      <p2 x="560" y="1840"/>
+    </wire>
+    <wire>
+      <p1 x="880" y="1620"/>
+      <p2 x="880" y="1660"/>
+    </wire>
+    <wire>
+      <p1 x="880" y="1840"/>
+      <p2 x="880" y="1880"/>
+    </wire>
+    <wire>
+      <p1 x="1140" y="1020"/>
+      <p2 x="1140" y="1040"/>
+    </wire>
+    <wire>
+      <p1 x="1140" y="620"/>
+      <p2 x="1140" y="640"/>
+    </wire>
+    <wire>
+      <p1 x="500" y="40"/>
+      <p2 x="500" y="100"/>
+    </wire>
+    <wire>
+      <p1 x="120" y="60"/>
+      <p2 x="120" y="140"/>
+    </wire>
+    <wire>
+      <p1 x="1080" y="1080"/>
+      <p2 x="1080" y="1100"/>
+    </wire>
+    <wire>
+      <p1 x="1080" y="680"/>
+      <p2 x="1080" y="700"/>
     </wire>
     <wire>
       <p1 x="760" y="480"/>
-      <p2 x="760" y="1300"/>
+      <p2 x="760" y="1700"/>
     </wire>
     <wire>
-      <p1 x="1340" y="1360"/>
-      <p2 x="1340" y="1380"/>
+      <p1 x="760" y="1700"/>
+      <p2 x="760" y="1840"/>
     </wire>
     <wire>
-      <p1 x="1340" y="960"/>
-      <p2 x="1340" y="980"/>
+      <p1 x="1020" y="1140"/>
+      <p2 x="1020" y="1160"/>
     </wire>
     <wire>
-      <p1 x="380" y="300"/>
+      <p1 x="1020" y="740"/>
+      <p2 x="1020" y="760"/>
+    </wire>
+    <wire>
+      <p1 x="380" y="240"/>
       <p2 x="380" y="340"/>
     </wire>
     <wire>
-      <p1 x="380" y="800"/>
-      <p2 x="380" y="860"/>
+      <p1 x="380" y="1060"/>
+      <p2 x="380" y="1160"/>
     </wire>
     <wire>
       <p1 x="380" y="560"/>
       <p2 x="380" y="660"/>
     </wire>
+    <wire>
+      <p1 x="380" y="660"/>
+      <p2 x="380" y="800"/>
+    </wire>
+    <wire>
+      <p1 x="380" y="800"/>
+      <p2 x="380" y="860"/>
+    </wire>
     <wire>
       <p1 x="380" y="340"/>
       <p2 x="380" y="460"/>
@@ -734,10 +1417,6 @@
       <p1 x="380" y="860"/>
       <p2 x="380" y="960"/>
     </wire>
-    <wire>
-      <p1 x="380" y="660"/>
-      <p2 x="380" y="800"/>
-    </wire>
     <wire>
       <p1 x="380" y="960"/>
       <p2 x="380" y="1060"/>
@@ -746,10 +1425,6 @@
       <p1 x="380" y="460"/>
       <p2 x="380" y="560"/>
     </wire>
-    <wire>
-      <p1 x="540" y="980"/>
-      <p2 x="540" y="1300"/>
-    </wire>
   </wires>
   <measurementOrdering/>
 </circuit>
\ No newline at end of file