Remake ALU

1 files changed, 575 insertions, 449 deletions

diff --git a/digital/atk16.dig b/digital/atk16.dig
index 15912d7..2716409 100644
--- a/digital/atk16.dig
+++ b/digital/atk16.dig
@@ -3,6 +3,12 @@
   <version>2</version>
   <attributes>
     <entry>
+      <string>romContent</string>
+      <romList>
+        <roms/>
+      </romList>
+    </entry>
+    <entry>
       <string>view1</string>
       <transform>
         <matrix>
@@ -41,6 +47,10 @@
         </matrix>
       </transform>
     </entry>
+    <entry>
+      <string>showDataTable</string>
+      <boolean>true</boolean>
+    </entry>
   </attributes>
   <visualElements>
     <visualElement>
@@ -146,36 +156,6 @@
       <pos x="-40" y="-200"/>
     </visualElement>
     <visualElement>
-      <elementName>EEPROM</elementName>
-      <elementAttributes>
-        <entry>
-          <string>AddrBits</string>
-          <int>8</int>
-        </entry>
-        <entry>
-          <string>Label</string>
-          <string>UCODE</string>
-        </entry>
-        <entry>
-          <string>Bits</string>
-          <int>16</int>
-        </entry>
-        <entry>
-          <string>Data</string>
-          <data>c,221,3040,8000,4*0,c,221,3040,8000,4*0,c,221,3040,8000,4*0,c
-,221,3040,8000,4*0,c,221,88,60,8000,0,0,0,c,221,88,60,8000,0,0,0
-,c,221,88,110,8000,0,0,0,c,221,88,110,8000,0,0,0,c,221,440,8000
-,4*0,c,221,440,8000,4*0,c,221,82,8000,4*0,c,221,82,8000,4*0,c
-,221,8000,5*0,c,221,102,8000,4*0,c,221,8000,5*0,c,221,8000,5*0
-,c,221,8000,5*0,c,221,8000,5*0,c,221,8000,5*0,c,221,8000,5*0,c
-,221,8000,5*0,c,221,8000,5*0,c,221,8000,5*0,c,221,8000,5*0,c,221
-,8000,5*0,c,221,8000,5*0,c,221,8000,5*0,c,221,8000,5*0,c,221,8000
-,5*0,c,221,8000,5*0,c,221,4000,5*0,c,221,4000</data>
-        </entry>
-      </elementAttributes>
-      <pos x="620" y="280"/>
-    </visualElement>
-    <visualElement>
       <elementName>Splitter</elementName>
       <elementAttributes>
         <entry>
@@ -186,16 +166,6 @@
       <pos x="540" y="280"/>
     </visualElement>
     <visualElement>
-      <elementName>VDD</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="1"/>
-        </entry>
-      </elementAttributes>
-      <pos x="600" y="300"/>
-    </visualElement>
-    <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
@@ -210,16 +180,6 @@
       <pos x="540" y="320"/>
     </visualElement>
     <visualElement>
-      <elementName>Ground</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="1"/>
-        </entry>
-      </elementAttributes>
-      <pos x="600" y="340"/>
-    </visualElement>
-    <visualElement>
       <elementName>BitSelector</elementName>
       <elementAttributes>
         <entry>
@@ -262,34 +222,6 @@
       <pos x="420" y="360"/>
     </visualElement>
     <visualElement>
-      <elementName>VDD</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="1"/>
-        </entry>
-      </elementAttributes>
-      <pos x="580" y="360"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Splitter</elementName>
-      <elementAttributes>
-        <entry>
-          <string>mirror</string>
-          <boolean>true</boolean>
-        </entry>
-        <entry>
-          <string>Input Splitting</string>
-          <string>16</string>
-        </entry>
-        <entry>
-          <string>Output Splitting</string>
-          <string>1*16</string>
-        </entry>
-      </elementAttributes>
-      <pos x="700" y="320"/>
-    </visualElement>
-    <visualElement>
       <elementName>CounterPreset</elementName>
       <elementAttributes>
         <entry>
@@ -326,7 +258,7 @@
       <elementAttributes>
         <entry>
           <string>rotation</string>
-          <rotation reference="../../../../visualElement[19]/elementAttributes/entry/rotation"/>
+          <rotation reference="../../../../visualElement[14]/elementAttributes/entry/rotation"/>
         </entry>
       </elementAttributes>
       <pos x="0" y="-180"/>
@@ -346,162 +278,183 @@
       <pos x="-40" y="-280"/>
     </visualElement>
     <visualElement>
-      <elementName>Tunnel</elementName>
+      <elementName>Clock</elementName>
       <elementAttributes>
         <entry>
-          <string>NetName</string>
-          <string>PC_CO</string>
+          <string>small</string>
+          <boolean>true</boolean>
         </entry>
-      </elementAttributes>
-      <pos x="740" y="320"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
         <entry>
-          <string>NetName</string>
-          <string>PC_IE</string>
+          <string>runRealTime</string>
+          <boolean>true</boolean>
         </entry>
-      </elementAttributes>
-      <pos x="740" y="300"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
         <entry>
-          <string>NetName</string>
-          <string>PC_OE</string>
+          <string>Frequency</string>
+          <int>10</int>
         </entry>
       </elementAttributes>
-      <pos x="740" y="280"/>
+      <pos x="-320" y="-360"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
           <string>NetName</string>
-          <string>MAR_IE</string>
+          <string>CLK</string>
         </entry>
       </elementAttributes>
-      <pos x="740" y="260"/>
+      <pos x="-300" y="-360"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
+          <string>rotation</string>
+          <rotation rotation="2"/>
+        </entry>
+        <entry>
           <string>NetName</string>
-          <string>MEM_IE</string>
+          <string>CLK</string>
         </entry>
       </elementAttributes>
-      <pos x="740" y="240"/>
+      <pos x="400" y="-220"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
+          <string>rotation</string>
+          <rotation rotation="2"/>
+        </entry>
+        <entry>
           <string>NetName</string>
-          <string>MEM_OE</string>
+          <string>CLK</string>
         </entry>
       </elementAttributes>
-      <pos x="740" y="220"/>
+      <pos x="0" y="-260"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
+          <string>rotation</string>
+          <rotation rotation="2"/>
+        </entry>
+        <entry>
           <string>NetName</string>
-          <string>R1_OE</string>
+          <string>CLK</string>
         </entry>
       </elementAttributes>
-      <pos x="740" y="180"/>
+      <pos x="280" y="300"/>
     </visualElement>
     <visualElement>
-      <elementName>Tunnel</elementName>
+      <elementName>Probe</elementName>
       <elementAttributes>
         <entry>
-          <string>NetName</string>
-          <string>R2_OE</string>
+          <string>Label</string>
+          <string>Bus</string>
         </entry>
       </elementAttributes>
-      <pos x="740" y="160"/>
+      <pos x="200" y="-280"/>
+    </visualElement>
+    <visualElement>
+      <elementName>atk16_mem.dig</elementName>
+      <elementAttributes/>
+      <pos x="580" y="-220"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
+          <string>rotation</string>
+          <rotation rotation="2"/>
+        </entry>
+        <entry>
           <string>NetName</string>
-          <string>IR_IE</string>
+          <string>MEM_IE</string>
         </entry>
       </elementAttributes>
-      <pos x="740" y="140"/>
+      <pos x="580" y="-180"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
+          <string>rotation</string>
+          <rotation rotation="2"/>
+        </entry>
+        <entry>
           <string>NetName</string>
-          <string>JA_OE</string>
+          <string>MEM_OE</string>
         </entry>
       </elementAttributes>
-      <pos x="740" y="120"/>
+      <pos x="580" y="-160"/>
     </visualElement>
     <visualElement>
-      <elementName>Tunnel</elementName>
+      <elementName>Break</elementName>
+      <elementAttributes/>
+      <pos x="-300" y="-400"/>
+    </visualElement>
+    <visualElement>
+      <elementName>atk16_decoder.dig</elementName>
       <elementAttributes>
         <entry>
-          <string>NetName</string>
-          <string>ALU_OE</string>
+          <string>shapeType</string>
+          <shapeType>CUSTOM</shapeType>
         </entry>
       </elementAttributes>
-      <pos x="740" y="80"/>
+      <pos x="-40" y="-80"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
+          <string>rotation</string>
+          <rotation rotation="2"/>
+        </entry>
+        <entry>
           <string>NetName</string>
-          <string>US_RS</string>
+          <string>RW_IE</string>
         </entry>
       </elementAttributes>
-      <pos x="740" y="20"/>
+      <pos x="280" y="-60"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
+          <string>rotation</string>
+          <rotation rotation="2"/>
+        </entry>
+        <entry>
           <string>NetName</string>
-          <string>FR_IE</string>
+          <string>CLK</string>
         </entry>
       </elementAttributes>
-      <pos x="740" y="60"/>
+      <pos x="260" y="-20"/>
     </visualElement>
     <visualElement>
-      <elementName>Clock</elementName>
+      <elementName>atk16_regbank.dig</elementName>
+      <elementAttributes/>
+      <pos x="280" y="-80"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Counter</elementName>
       <elementAttributes>
         <entry>
-          <string>small</string>
-          <boolean>true</boolean>
-        </entry>
-        <entry>
-          <string>runRealTime</string>
+          <string>valueIsProbe</string>
           <boolean>true</boolean>
         </entry>
         <entry>
-          <string>Frequency</string>
-          <int>10</int>
+          <string>Label</string>
+          <string>Microsequencer</string>
         </entry>
-      </elementAttributes>
-      <pos x="-320" y="-360"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
         <entry>
-          <string>NetName</string>
-          <string>CLK</string>
+          <string>Bits</string>
+          <int>3</int>
         </entry>
       </elementAttributes>
-      <pos x="-300" y="-360"/>
+      <pos x="60" y="240"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -512,24 +465,25 @@
         </entry>
         <entry>
           <string>NetName</string>
-          <string>CLK</string>
+          <string>US_RS</string>
         </entry>
       </elementAttributes>
-      <pos x="400" y="-220"/>
+      <pos x="-80" y="280"/>
     </visualElement>
     <visualElement>
-      <elementName>Tunnel</elementName>
+      <elementName>VDD</elementName>
       <elementAttributes>
         <entry>
           <string>rotation</string>
-          <rotation rotation="2"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>CLK</string>
+          <rotation rotation="1"/>
         </entry>
       </elementAttributes>
-      <pos x="0" y="-260"/>
+      <pos x="40" y="240"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Not</elementName>
+      <elementAttributes/>
+      <pos x="0" y="260"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -543,89 +497,76 @@
           <string>CLK</string>
         </entry>
       </elementAttributes>
-      <pos x="280" y="300"/>
+      <pos x="-40" y="260"/>
     </visualElement>
     <visualElement>
-      <elementName>Probe</elementName>
+      <elementName>Reset</elementName>
       <elementAttributes>
         <entry>
-          <string>Label</string>
-          <string>Bus</string>
+          <string>invertOutput</string>
+          <boolean>false</boolean>
         </entry>
       </elementAttributes>
-      <pos x="200" y="-280"/>
+      <pos x="-60" y="320"/>
     </visualElement>
     <visualElement>
-      <elementName>atk16_mem.dig</elementName>
+      <elementName>Or</elementName>
       <elementAttributes/>
-      <pos x="580" y="-220"/>
+      <pos x="-20" y="280"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
-          <string>rotation</string>
-          <rotation rotation="2"/>
-        </entry>
-        <entry>
           <string>NetName</string>
-          <string>MEM_IE</string>
+          <string>FLAG_EQ</string>
         </entry>
       </elementAttributes>
-      <pos x="580" y="-180"/>
+      <pos x="100" y="-100"/>
     </visualElement>
     <visualElement>
-      <elementName>Tunnel</elementName>
+      <elementName>Out</elementName>
       <elementAttributes>
         <entry>
-          <string>rotation</string>
-          <rotation rotation="2"/>
+          <string>Description</string>
+          <string>Dummy output</string>
         </entry>
         <entry>
-          <string>NetName</string>
-          <string>MEM_OE</string>
+          <string>Label</string>
+          <string>OUT</string>
         </entry>
       </elementAttributes>
-      <pos x="580" y="-160"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Break</elementName>
-      <elementAttributes/>
-      <pos x="-300" y="-400"/>
+      <pos x="960" y="-140"/>
     </visualElement>
     <visualElement>
-      <elementName>atk16_decoder.dig</elementName>
+      <elementName>Ground</elementName>
       <elementAttributes>
         <entry>
-          <string>shapeType</string>
-          <shapeType>SIMPLE</shapeType>
+          <string>rotation</string>
+          <rotation rotation="1"/>
         </entry>
       </elementAttributes>
-      <pos x="0" y="-80"/>
+      <pos x="940" y="-140"/>
     </visualElement>
     <visualElement>
-      <elementName>Tunnel</elementName>
+      <elementName>In</elementName>
       <elementAttributes>
         <entry>
-          <string>NetName</string>
-          <string>OPCODE</string>
+          <string>Label</string>
+          <string>IN</string>
         </entry>
       </elementAttributes>
-      <pos x="80" y="60"/>
+      <pos x="960" y="-200"/>
     </visualElement>
     <visualElement>
-      <elementName>Tunnel</elementName>
+      <elementName>Ground</elementName>
       <elementAttributes>
         <entry>
           <string>rotation</string>
-          <rotation rotation="2"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>JA_OE</string>
+          <rotation reference="../../../../visualElement[40]/elementAttributes/entry/rotation"/>
         </entry>
       </elementAttributes>
-      <pos x="-20" y="-20"/>
+      <pos x="980" y="-200"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -639,7 +580,7 @@
           <string>IR_IE</string>
         </entry>
       </elementAttributes>
-      <pos x="-20" y="-60"/>
+      <pos x="-60" y="-60"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -653,178 +594,230 @@
           <string>CLK</string>
         </entry>
       </elementAttributes>
-      <pos x="0" y="-40"/>
+      <pos x="-40" y="-40"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
           <string>NetName</string>
-          <string>RW_IE</string>
+          <string>OPCODE</string>
         </entry>
       </elementAttributes>
-      <pos x="740" y="200"/>
+      <pos x="100" y="-80"/>
     </visualElement>
     <visualElement>
-      <elementName>Tunnel</elementName>
+      <elementName>Splitter</elementName>
       <elementAttributes>
         <entry>
-          <string>rotation</string>
-          <rotation rotation="2"/>
+          <string>mirror</string>
+          <boolean>true</boolean>
         </entry>
         <entry>
-          <string>NetName</string>
-          <string>RW_IE</string>
+          <string>Input Splitting</string>
+          <string>16</string>
+        </entry>
+        <entry>
+          <string>Output Splitting</string>
+          <string>1*16</string>
         </entry>
       </elementAttributes>
-      <pos x="280" y="-60"/>
+      <pos x="880" y="320"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
-          <string>rotation</string>
-          <rotation rotation="2"/>
-        </entry>
-        <entry>
           <string>NetName</string>
-          <string>CLK</string>
+          <string>PC_CO</string>
         </entry>
       </elementAttributes>
-      <pos x="260" y="-20"/>
+      <pos x="920" y="320"/>
     </visualElement>
     <visualElement>
-      <elementName>atk16_regbank.dig</elementName>
-      <elementAttributes/>
-      <pos x="280" y="-80"/>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>NetName</string>
+          <string>PC_IE</string>
+        </entry>
+      </elementAttributes>
+      <pos x="920" y="300"/>
     </visualElement>
     <visualElement>
-      <elementName>atk16_alu.dig</elementName>
+      <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
-          <string>shapeType</string>
-          <shapeType>SIMPLE</shapeType>
+          <string>NetName</string>
+          <string>PC_OE</string>
         </entry>
+      </elementAttributes>
+      <pos x="920" y="280"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
         <entry>
-          <string>Label</string>
-          <string>ALU</string>
+          <string>NetName</string>
+          <string>MAR_IE</string>
         </entry>
       </elementAttributes>
-      <pos x="480" y="20"/>
+      <pos x="920" y="260"/>
     </visualElement>
     <visualElement>
-      <elementName>Driver</elementName>
+      <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
-          <string>Bits</string>
-          <int>16</int>
+          <string>NetName</string>
+          <string>MEM_IE</string>
         </entry>
+      </elementAttributes>
+      <pos x="920" y="240"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
         <entry>
-          <string>flipSelPos</string>
-          <boolean>true</boolean>
+          <string>NetName</string>
+          <string>MEM_OE</string>
         </entry>
       </elementAttributes>
-      <pos x="460" y="-100"/>
+      <pos x="920" y="220"/>
     </visualElement>
     <visualElement>
-      <elementName>Driver</elementName>
+      <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
-          <string>Bits</string>
-          <int>16</int>
+          <string>NetName</string>
+          <string>R1_OE</string>
         </entry>
+      </elementAttributes>
+      <pos x="920" y="180"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
         <entry>
-          <string>flipSelPos</string>
-          <boolean>true</boolean>
+          <string>NetName</string>
+          <string>R2_OE</string>
         </entry>
       </elementAttributes>
-      <pos x="480" y="-60"/>
+      <pos x="920" y="160"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
           <string>NetName</string>
-          <string>R2_OE</string>
+          <string>IR_IE</string>
         </entry>
       </elementAttributes>
-      <pos x="500" y="-40"/>
+      <pos x="920" y="140"/>
     </visualElement>
     <visualElement>
-      <elementName>Driver</elementName>
+      <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
-          <string>Bits</string>
-          <int>16</int>
+          <string>NetName</string>
+          <string>ALU_OE</string>
         </entry>
       </elementAttributes>
-      <pos x="600" y="20"/>
+      <pos x="920" y="80"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
-          <string>rotation</string>
-          <rotation rotation="1"/>
+          <string>NetName</string>
+          <string>US_RS</string>
         </entry>
+      </elementAttributes>
+      <pos x="920" y="20"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
         <entry>
           <string>NetName</string>
-          <string>ALU_OE</string>
+          <string>FR_IE</string>
         </entry>
       </elementAttributes>
-      <pos x="600" y="0"/>
+      <pos x="920" y="60"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
           <string>NetName</string>
-          <string>R1_OE</string>
+          <string>RW_IE</string>
         </entry>
       </elementAttributes>
-      <pos x="480" y="-80"/>
+      <pos x="920" y="200"/>
     </visualElement>
     <visualElement>
-      <elementName>Probe</elementName>
+      <elementName>Stop</elementName>
+      <elementAttributes/>
+      <pos x="1000" y="40"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
-          <string>Label</string>
-          <string>ALU</string>
+          <string>NetName</string>
+          <string>LI_OE</string>
         </entry>
       </elementAttributes>
-      <pos x="680" y="-40"/>
+      <pos x="920" y="100"/>
     </visualElement>
     <visualElement>
-      <elementName>Counter</elementName>
+      <elementName>EEPROM</elementName>
       <elementAttributes>
         <entry>
-          <string>valueIsProbe</string>
-          <boolean>true</boolean>
+          <string>AddrBits</string>
+          <int>8</int>
         </entry>
         <entry>
           <string>Label</string>
-          <string>Microsequencer</string>
+          <string>UCODE</string>
         </entry>
         <entry>
           <string>Bits</string>
-          <int>3</int>
+          <int>16</int>
+        </entry>
+        <entry>
+          <string>Data</string>
+          <data>c,221,3040,8000,4*0,c,221,3040,8000,4*0,c,221,3040,8000,4*0,c
+,221,3040,8000,4*0,c,221,88,60,8000,0,0,0,c,221,88,60,8000,0,0,0
+,c,221,88,90,8000,0,0,0,c,221,88,90,8000,0,0,0,c,221,840,8000
+,4*0,c,221,840,8000,4*0,c,221,82,8000,4*0,c,221,82,8000,4*0,c
+,221,802,8000,4*0,c,221,802,8000,4*0,c,221,8000,5*0,c,221,82,8000
+,4*0,c,221,8000,5*0,c,221,802,8000,4*0,c,221,8000,5*0,c,221,8000
+,5*0,c,221,8000,5*0,c,221,8000,5*0,c,221,8000,5*0,c,221,8000,5*0
+,c,221,8000,5*0,c,221,8000,5*0,c,221,8000,5*0,c,221,8000,5*0,c
+,221,8000,5*0,c,221,8000,5*0,c,221,4000,5*0,c,221,4000</data>
         </entry>
       </elementAttributes>
-      <pos x="60" y="240"/>
+      <pos x="780" y="280"/>
     </visualElement>
     <visualElement>
-      <elementName>Tunnel</elementName>
+      <elementName>VDD</elementName>
       <elementAttributes>
         <entry>
           <string>rotation</string>
-          <rotation rotation="2"/>
+          <rotation rotation="1"/>
         </entry>
+      </elementAttributes>
+      <pos x="760" y="300"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Ground</elementName>
+      <elementAttributes>
         <entry>
-          <string>NetName</string>
-          <string>US_RS</string>
+          <string>rotation</string>
+          <rotation rotation="1"/>
         </entry>
       </elementAttributes>
-      <pos x="-80" y="280"/>
+      <pos x="760" y="340"/>
     </visualElement>
     <visualElement>
       <elementName>VDD</elementName>
@@ -834,12 +827,7 @@
           <rotation rotation="1"/>
         </entry>
       </elementAttributes>
-      <pos x="40" y="240"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Not</elementName>
-      <elementAttributes/>
-      <pos x="0" y="260"/>
+      <pos x="740" y="360"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
@@ -850,58 +838,101 @@
         </entry>
         <entry>
           <string>NetName</string>
-          <string>CLK</string>
+          <string>LI_OE</string>
         </entry>
       </elementAttributes>
-      <pos x="-40" y="260"/>
+      <pos x="-60" y="-20"/>
     </visualElement>
     <visualElement>
-      <elementName>Reset</elementName>
+      <elementName>atk16_alu.dig</elementName>
       <elementAttributes>
         <entry>
-          <string>invertOutput</string>
-          <boolean>false</boolean>
+          <string>shapeType</string>
+          <shapeType>SIMPLE</shapeType>
+        </entry>
+        <entry>
+          <string>Label</string>
+          <string>ALU</string>
         </entry>
       </elementAttributes>
-      <pos x="-60" y="320"/>
+      <pos x="740" y="-40"/>
     </visualElement>
     <visualElement>
-      <elementName>Or</elementName>
+      <elementName>atk16_alu_inputs.dig</elementName>
       <elementAttributes/>
-      <pos x="-20" y="280"/>
+      <pos x="580" y="-40"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Driver</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Bits</string>
+          <int>16</int>
+        </entry>
+      </elementAttributes>
+      <pos x="880" y="-40"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Driver</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Bits</string>
+          <int>16</int>
+        </entry>
+        <entry>
+          <string>flipSelPos</string>
+          <boolean>true</boolean>
+        </entry>
+      </elementAttributes>
+      <pos x="440" y="-100"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Driver</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Bits</string>
+          <int>16</int>
+        </entry>
+        <entry>
+          <string>flipSelPos</string>
+          <boolean>true</boolean>
+        </entry>
+      </elementAttributes>
+      <pos x="460" y="-60"/>
     </visualElement>
     <visualElement>
       <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
           <string>NetName</string>
-          <string>FLAG_EQ</string>
+          <string>R1_OE</string>
         </entry>
       </elementAttributes>
-      <pos x="100" y="-100"/>
+      <pos x="460" y="-80"/>
     </visualElement>
     <visualElement>
-      <elementName>Stop</elementName>
-      <elementAttributes/>
-      <pos x="820" y="40"/>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>NetName</string>
+          <string>R2_OE</string>
+        </entry>
+      </elementAttributes>
+      <pos x="460" y="-40"/>
     </visualElement>
     <visualElement>
-      <elementName>Probe</elementName>
+      <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
           <string>rotation</string>
           <rotation rotation="2"/>
         </entry>
         <entry>
-          <string>Label</string>
+          <string>NetName</string>
           <string>OPCODE</string>
         </entry>
-        <entry>
-          <string>intFormat</string>
-          <intFormat>bin</intFormat>
-        </entry>
       </elementAttributes>
-      <pos x="60" y="60"/>
+      <pos x="540" y="60"/>
     </visualElement>
     <visualElement>
       <elementName>Testcase</elementName>
@@ -921,51 +952,74 @@ program(0x4051, 0x40a2, 0x029b)
           </testData>
         </entry>
       </elementAttributes>
-      <pos x="-340" y="-240"/>
+      <pos x="-60" y="-460"/>
     </visualElement>
     <visualElement>
-      <elementName>Out</elementName>
+      <elementName>atk16_jump_unit.dig</elementName>
+      <elementAttributes/>
+      <pos x="-220" y="-240"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
-          <string>Label</string>
-          <string>OUT</string>
+          <string>rotation</string>
+          <rotation rotation="2"/>
         </entry>
         <entry>
-          <string>Description</string>
-          <string>Dummy output</string>
+          <string>NetName</string>
+          <string>OPCODE</string>
         </entry>
       </elementAttributes>
-      <pos x="960" y="-140"/>
+      <pos x="-240" y="-200"/>
     </visualElement>
     <visualElement>
-      <elementName>Ground</elementName>
+      <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
           <string>rotation</string>
           <rotation rotation="1"/>
         </entry>
+        <entry>
+          <string>NetName</string>
+          <string>ALU_OE</string>
+        </entry>
       </elementAttributes>
-      <pos x="940" y="-140"/>
+      <pos x="880" y="-60"/>
     </visualElement>
     <visualElement>
-      <elementName>In</elementName>
+      <elementName>Probe</elementName>
       <elementAttributes>
         <entry>
           <string>Label</string>
-          <string>IN</string>
+          <string>PC</string>
         </entry>
       </elementAttributes>
-      <pos x="960" y="-200"/>
+      <pos x="240" y="-380"/>
     </visualElement>
     <visualElement>
-      <elementName>Ground</elementName>
+      <elementName>Tunnel</elementName>
       <elementAttributes>
         <entry>
           <string>rotation</string>
-          <rotation reference="../../../../visualElement[74]/elementAttributes/entry/rotation"/>
+          <rotation rotation="2"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>OPCODE</string>
         </entry>
       </elementAttributes>
-      <pos x="980" y="-200"/>
+      <pos x="240" y="-440"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Probe</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Label</string>
+          <string>OPCODE</string>
+        </entry>
+      </elementAttributes>
+      <pos x="240" y="-440"/>
     </visualElement>
   </visualElements>
   <wires>
@@ -974,32 +1028,40 @@ program(0x4051, 0x40a2, 0x029b)
       <p2 x="300" y="320"/>
     </wire>
     <wire>
-      <p1 x="680" y="320"/>
-      <p2 x="700" y="320"/>
+      <p1 x="-60" y="320"/>
+      <p2 x="-20" y="320"/>
     </wire>
     <wire>
-      <p1 x="720" y="320"/>
-      <p2 x="740" y="320"/>
+      <p1 x="900" y="320"/>
+      <p2 x="920" y="320"/>
     </wire>
     <wire>
-      <p1 x="-60" y="320"/>
-      <p2 x="-20" y="320"/>
+      <p1 x="840" y="320"/>
+      <p2 x="880" y="320"/>
     </wire>
     <wire>
       <p1 x="60" y="0"/>
-      <p2 x="80" y="0"/>
+      <p2 x="160" y="0"/>
     </wire>
     <wire>
-      <p1 x="160" y="0"/>
+      <p1 x="180" y="0"/>
       <p2 x="280" y="0"/>
     </wire>
     <wire>
-      <p1 x="0" y="-260"/>
-      <p2 x="20" y="-260"/>
+      <p1 x="720" y="0"/>
+      <p2 x="740" y="0"/>
+    </wire>
+    <wire>
+      <p1 x="420" y="0"/>
+      <p2 x="520" y="0"/>
+    </wire>
+    <wire>
+      <p1 x="540" y="0"/>
+      <p2 x="580" y="0"/>
     </wire>
     <wire>
-      <p1 x="720" y="260"/>
-      <p2 x="740" y="260"/>
+      <p1 x="0" y="-260"/>
+      <p2 x="20" y="-260"/>
     </wire>
     <wire>
       <p1 x="40" y="260"/>
@@ -1010,6 +1072,10 @@ program(0x4051, 0x40a2, 0x029b)
       <p2 x="0" y="260"/>
     </wire>
     <wire>
+      <p1 x="900" y="260"/>
+      <p2 x="920" y="260"/>
+    </wire>
+    <wire>
       <p1 x="380" y="-200"/>
       <p2 x="400" y="-200"/>
     </wire>
@@ -1026,60 +1092,64 @@ program(0x4051, 0x40a2, 0x029b)
       <p2 x="980" y="-200"/>
     </wire>
     <wire>
-      <p1 x="720" y="200"/>
-      <p2 x="740" y="200"/>
+      <p1 x="-240" y="-200"/>
+      <p2 x="-220" y="-200"/>
+    </wire>
+    <wire>
+      <p1 x="900" y="200"/>
+      <p2 x="920" y="200"/>
     </wire>
     <wire>
       <p1 x="280" y="200"/>
-      <p2 x="580" y="200"/>
+      <p2 x="860" y="200"/>
     </wire>
     <wire>
       <p1 x="940" y="-140"/>
       <p2 x="960" y="-140"/>
     </wire>
     <wire>
-      <p1 x="-20" y="-140"/>
-      <p2 x="200" y="-140"/>
-    </wire>
-    <wire>
-      <p1 x="480" y="-140"/>
-      <p2 x="520" y="-140"/>
+      <p1 x="-280" y="-140"/>
+      <p2 x="-60" y="-140"/>
     </wire>
     <wire>
       <p1 x="200" y="-140"/>
       <p2 x="480" y="-140"/>
     </wire>
     <wire>
-      <p1 x="720" y="140"/>
-      <p2 x="740" y="140"/>
+      <p1 x="-60" y="-140"/>
+      <p2 x="200" y="-140"/>
     </wire>
     <wire>
-      <p1 x="-20" y="-80"/>
-      <p2 x="0" y="-80"/>
+      <p1 x="900" y="140"/>
+      <p2 x="920" y="140"/>
     </wire>
     <wire>
       <p1 x="200" y="-80"/>
       <p2 x="280" y="-80"/>
     </wire>
     <wire>
+      <p1 x="-60" y="-80"/>
+      <p2 x="-40" y="-80"/>
+    </wire>
+    <wire>
       <p1 x="60" y="-80"/>
-      <p2 x="180" y="-80"/>
+      <p2 x="100" y="-80"/>
     </wire>
     <wire>
-      <p1 x="460" y="-80"/>
-      <p2 x="480" y="-80"/>
+      <p1 x="440" y="-80"/>
+      <p2 x="460" y="-80"/>
     </wire>
     <wire>
-      <p1 x="340" y="-80"/>
+      <p1 x="380" y="-80"/>
       <p2 x="400" y="-80"/>
     </wire>
     <wire>
-      <p1 x="720" y="80"/>
-      <p2 x="740" y="80"/>
+      <p1 x="900" y="80"/>
+      <p2 x="920" y="80"/>
     </wire>
     <wire>
-      <p1 x="-20" y="-20"/>
-      <p2 x="0" y="-20"/>
+      <p1 x="200" y="80"/>
+      <p2 x="720" y="80"/>
     </wire>
     <wire>
       <p1 x="260" y="-20"/>
@@ -1087,51 +1157,63 @@ program(0x4051, 0x40a2, 0x029b)
     </wire>
     <wire>
       <p1 x="60" y="-20"/>
-      <p2 x="120" y="-20"/>
+      <p2 x="180" y="-20"/>
     </wire>
     <wire>
-      <p1 x="600" y="340"/>
-      <p2 x="620" y="340"/>
+      <p1 x="-60" y="-20"/>
+      <p2 x="-40" y="-20"/>
     </wire>
     <wire>
-      <p1 x="720" y="20"/>
-      <p2 x="740" y="20"/>
+      <p1 x="680" y="-20"/>
+      <p2 x="740" y="-20"/>
     </wire>
     <wire>
-      <p1 x="140" y="20"/>
-      <p2 x="280" y="20"/>
+      <p1 x="840" y="-20"/>
+      <p2 x="860" y="-20"/>
     </wire>
     <wire>
-      <p1 x="620" y="20"/>
-      <p2 x="640" y="20"/>
+      <p1 x="400" y="-20"/>
+      <p2 x="500" y="-20"/>
     </wire>
     <wire>
-      <p1 x="440" y="20"/>
-      <p2 x="480" y="20"/>
+      <p1 x="520" y="-20"/>
+      <p2 x="580" y="-20"/>
+    </wire>
+    <wire>
+      <p1 x="-240" y="-340"/>
+      <p2 x="100" y="-340"/>
     </wire>
     <wire>
-      <p1 x="540" y="20"/>
-      <p2 x="560" y="20"/>
+      <p1 x="160" y="20"/>
+      <p2 x="220" y="20"/>
+    </wire>
+    <wire>
+      <p1 x="900" y="20"/>
+      <p2 x="920" y="20"/>
     </wire>
     <wire>
       <p1 x="560" y="20"/>
       <p2 x="580" y="20"/>
     </wire>
     <wire>
-      <p1 x="80" y="-280"/>
-      <p2 x="100" y="-280"/>
+      <p1 x="440" y="20"/>
+      <p2 x="540" y="20"/>
     </wire>
     <wire>
-      <p1 x="-40" y="-280"/>
-      <p2 x="20" y="-280"/>
+      <p1 x="220" y="20"/>
+      <p2 x="280" y="20"/>
     </wire>
     <wire>
-      <p1 x="560" y="280"/>
-      <p2 x="620" y="280"/>
+      <p1 x="760" y="340"/>
+      <p2 x="780" y="340"/>
     </wire>
     <wire>
-      <p1 x="720" y="280"/>
-      <p2 x="740" y="280"/>
+      <p1 x="80" y="-280"/>
+      <p2 x="100" y="-280"/>
+    </wire>
+    <wire>
+      <p1 x="-40" y="-280"/>
+      <p2 x="20" y="-280"/>
     </wire>
     <wire>
       <p1 x="40" y="280"/>
@@ -1150,94 +1232,94 @@ program(0x4051, 0x40a2, 0x029b)
       <p2 x="300" y="280"/>
     </wire>
     <wire>
-      <p1 x="-20" y="-220"/>
-      <p2 x="20" y="-220"/>
+      <p1 x="900" y="280"/>
+      <p2 x="920" y="280"/>
+    </wire>
+    <wire>
+      <p1 x="560" y="280"/>
+      <p2 x="780" y="280"/>
     </wire>
     <wire>
       <p1 x="460" y="-220"/>
       <p2 x="580" y="-220"/>
     </wire>
     <wire>
-      <p1 x="720" y="220"/>
-      <p2 x="740" y="220"/>
+      <p1 x="-240" y="-220"/>
+      <p2 x="-220" y="-220"/>
     </wire>
     <wire>
-      <p1 x="720" y="160"/>
-      <p2 x="740" y="160"/>
+      <p1 x="-120" y="-220"/>
+      <p2 x="20" y="-220"/>
     </wire>
     <wire>
-      <p1 x="480" y="-100"/>
-      <p2 x="520" y="-100"/>
+      <p1 x="900" y="220"/>
+      <p2 x="920" y="220"/>
     </wire>
     <wire>
-      <p1 x="400" y="-100"/>
-      <p2 x="440" y="-100"/>
+      <p1 x="900" y="160"/>
+      <p2 x="920" y="160"/>
     </wire>
     <wire>
       <p1 x="80" y="-100"/>
       <p2 x="100" y="-100"/>
     </wire>
     <wire>
-      <p1 x="520" y="-100"/>
-      <p2 x="640" y="-100"/>
+      <p1 x="460" y="-100"/>
+      <p2 x="500" y="-100"/>
     </wire>
     <wire>
-      <p1 x="-320" y="-360"/>
-      <p2 x="-300" y="-360"/>
+      <p1 x="400" y="-100"/>
+      <p2 x="420" y="-100"/>
     </wire>
     <wire>
-      <p1 x="180" y="-40"/>
-      <p2 x="280" y="-40"/>
+      <p1 x="900" y="100"/>
+      <p2 x="920" y="100"/>
     </wire>
     <wire>
-      <p1 x="60" y="-40"/>
-      <p2 x="140" y="-40"/>
+      <p1 x="-320" y="-360"/>
+      <p2 x="-300" y="-360"/>
     </wire>
     <wire>
-      <p1 x="560" y="-40"/>
-      <p2 x="680" y="-40"/>
+      <p1 x="60" y="-40"/>
+      <p2 x="200" y="-40"/>
     </wire>
     <wire>
-      <p1 x="400" y="-40"/>
-      <p2 x="440" y="-40"/>
+      <p1 x="220" y="-40"/>
+      <p2 x="280" y="-40"/>
     </wire>
     <wire>
-      <p1 x="480" y="-40"/>
-      <p2 x="500" y="-40"/>
+      <p1 x="680" y="-40"/>
+      <p2 x="740" y="-40"/>
     </wire>
     <wire>
-      <p1 x="580" y="360"/>
-      <p2 x="620" y="360"/>
+      <p1 x="840" y="-40"/>
+      <p2 x="860" y="-40"/>
     </wire>
     <wire>
-      <p1 x="400" y="360"/>
-      <p2 x="420" y="360"/>
+      <p1 x="900" y="-40"/>
+      <p2 x="920" y="-40"/>
     </wire>
     <wire>
-      <p1 x="420" y="40"/>
-      <p2 x="480" y="40"/>
+      <p1 x="500" y="-40"/>
+      <p2 x="580" y="-40"/>
     </wire>
     <wire>
-      <p1 x="120" y="40"/>
-      <p2 x="180" y="40"/>
+      <p1 x="400" y="360"/>
+      <p2 x="420" y="360"/>
     </wire>
     <wire>
-      <p1 x="540" y="40"/>
-      <p2 x="580" y="40"/>
+      <p1 x="740" y="360"/>
+      <p2 x="780" y="360"/>
     </wire>
     <wire>
-      <p1 x="720" y="40"/>
-      <p2 x="820" y="40"/>
+      <p1 x="900" y="40"/>
+      <p2 x="1000" y="40"/>
     </wire>
     <wire>
       <p1 x="280" y="300"/>
       <p2 x="300" y="300"/>
     </wire>
     <wire>
-      <p1 x="600" y="300"/>
-      <p2 x="620" y="300"/>
-    </wire>
-    <wire>
       <p1 x="360" y="300"/>
       <p2 x="400" y="300"/>
     </wire>
@@ -1246,8 +1328,12 @@ program(0x4051, 0x40a2, 0x029b)
       <p2 x="540" y="300"/>
     </wire>
     <wire>
-      <p1 x="720" y="300"/>
-      <p2 x="740" y="300"/>
+      <p1 x="900" y="300"/>
+      <p2 x="920" y="300"/>
+    </wire>
+    <wire>
+      <p1 x="760" y="300"/>
+      <p2 x="780" y="300"/>
     </wire>
     <wire>
       <p1 x="100" y="-240"/>
@@ -1262,12 +1348,12 @@ program(0x4051, 0x40a2, 0x029b)
       <p2 x="200" y="-240"/>
     </wire>
     <wire>
-      <p1 x="200" y="-240"/>
-      <p2 x="400" y="-240"/>
+      <p1 x="-280" y="-240"/>
+      <p2 x="-220" y="-240"/>
     </wire>
     <wire>
-      <p1 x="720" y="240"/>
-      <p2 x="740" y="240"/>
+      <p1 x="200" y="-240"/>
+      <p2 x="400" y="-240"/>
     </wire>
     <wire>
       <p1 x="40" y="240"/>
@@ -1278,68 +1364,76 @@ program(0x4051, 0x40a2, 0x029b)
       <p2 x="500" y="240"/>
     </wire>
     <wire>
+      <p1 x="900" y="240"/>
+      <p2 x="920" y="240"/>
+    </wire>
+    <wire>
       <p1 x="0" y="-180"/>
       <p2 x="20" y="-180"/>
     </wire>
     <wire>
-      <p1 x="720" y="180"/>
-      <p2 x="740" y="180"/>
+      <p1 x="900" y="180"/>
+      <p2 x="920" y="180"/>
     </wire>
     <wire>
-      <p1 x="720" y="120"/>
-      <p2 x="740" y="120"/>
+      <p1 x="480" y="-120"/>
+      <p2 x="500" y="-120"/>
     </wire>
     <wire>
-      <p1 x="-20" y="-60"/>
-      <p2 x="0" y="-60"/>
+      <p1 x="500" y="-120"/>
+      <p2 x="920" y="-120"/>
     </wire>
     <wire>
       <p1 x="60" y="-60"/>
       <p2 x="80" y="-60"/>
     </wire>
     <wire>
-      <p1 x="340" y="-60"/>
-      <p2 x="420" y="-60"/>
+      <p1 x="-60" y="-60"/>
+      <p2 x="-40" y="-60"/>
     </wire>
     <wire>
-      <p1 x="500" y="-60"/>
-      <p2 x="640" y="-60"/>
+      <p1 x="480" y="-60"/>
+      <p2 x="500" y="-60"/>
+    </wire>
+    <wire>
+      <p1 x="380" y="-60"/>
+      <p2 x="420" y="-60"/>
     </wire>
     <wire>
       <p1 x="420" y="-60"/>
-      <p2 x="460" y="-60"/>
+      <p2 x="440" y="-60"/>
     </wire>
     <wire>
       <p1 x="80" y="-60"/>
-      <p2 x="160" y="-60"/>
+      <p2 x="220" y="-60"/>
     </wire>
     <wire>
-      <p1 x="720" y="60"/>
-      <p2 x="740" y="60"/>
+      <p1 x="100" y="-380"/>
+      <p2 x="240" y="-380"/>
     </wire>
     <wire>
-      <p1 x="180" y="60"/>
-      <p2 x="480" y="60"/>
+      <p1 x="900" y="60"/>
+      <p2 x="920" y="60"/>
     </wire>
     <wire>
-      <p1 x="60" y="60"/>
-      <p2 x="80" y="60"/>
+      <p1 x="540" y="60"/>
+      <p2 x="560" y="60"/>
     </wire>
     <wire>
-      <p1 x="480" y="-200"/>
-      <p2 x="480" y="-140"/>
+      <p1 x="220" y="60"/>
+      <p2 x="440" y="60"/>
     </wire>
     <wire>
-      <p1 x="160" y="-60"/>
-      <p2 x="160" y="0"/>
+      <p1 x="480" y="-200"/>
+      <p2 x="480" y="-140"/>
     </wire>
     <wire>
-      <p1 x="640" y="-100"/>
-      <p2 x="640" y="-60"/>
+      <p1 x="480" y="-140"/>
+      <p2 x="480" y="-120"/>
     </wire>
     <wire>
-      <p1 x="640" y="-60"/>
-      <p2 x="640" y="20"/>
+      <p1 x="160" y="0"/>
+      <p2 x="160" y="20"/>
     </wire>
     <wire>
       <p1 x="420" y="320"/>
@@ -1347,21 +1441,29 @@ program(0x4051, 0x40a2, 0x029b)
     </wire>
     <wire>
       <p1 x="420" y="-60"/>
-      <p2 x="420" y="40"/>
+      <p2 x="420" y="0"/>
     </wire>
     <wire>
-      <p1 x="100" y="-280"/>
-      <p2 x="100" y="-240"/>
+      <p1 x="100" y="-380"/>
+      <p2 x="100" y="-340"/>
     </wire>
     <wire>
-      <p1 x="580" y="40"/>
-      <p2 x="580" y="200"/>
+      <p1 x="100" y="-340"/>
+      <p2 x="100" y="-280"/>
+    </wire>
+    <wire>
+      <p1 x="100" y="-280"/>
+      <p2 x="100" y="-240"/>
     </wire>
     <wire>
       <p1 x="200" y="-280"/>
       <p2 x="200" y="-240"/>
     </wire>
     <wire>
+      <p1 x="200" y="-40"/>
+      <p2 x="200" y="80"/>
+    </wire>
+    <wire>
       <p1 x="200" y="-240"/>
       <p2 x="200" y="-140"/>
     </wire>
@@ -1374,56 +1476,60 @@ program(0x4051, 0x40a2, 0x029b)
       <p2 x="40" y="300"/>
     </wire>
     <wire>
-      <p1 x="520" y="-140"/>
-      <p2 x="520" y="-100"/>
+      <p1 x="520" y="-20"/>
+      <p2 x="520" y="0"/>
     </wire>
     <wire>
       <p1 x="-300" y="-400"/>
       <p2 x="-300" y="-360"/>
     </wire>
     <wire>
-      <p1 x="140" y="-40"/>
-      <p2 x="140" y="20"/>
-    </wire>
-    <wire>
-      <p1 x="80" y="0"/>
-      <p2 x="80" y="60"/>
+      <p1 x="-240" y="-340"/>
+      <p2 x="-240" y="-220"/>
     </wire>
     <wire>
       <p1 x="80" y="-100"/>
       <p2 x="80" y="-60"/>
     </wire>
     <wire>
+      <p1 x="720" y="0"/>
+      <p2 x="720" y="80"/>
+    </wire>
+    <wire>
       <p1 x="400" y="-100"/>
       <p2 x="400" y="-80"/>
     </wire>
     <wire>
       <p1 x="400" y="-80"/>
-      <p2 x="400" y="-40"/>
+      <p2 x="400" y="-20"/>
+    </wire>
+    <wire>
+      <p1 x="560" y="20"/>
+      <p2 x="560" y="60"/>
     </wire>
     <wire>
-      <p1 x="560" y="-40"/>
-      <p2 x="560" y="20"/>
+      <p1 x="500" y="240"/>
+      <p2 x="500" y="280"/>
     </wire>
     <wire>
-      <p1 x="-20" y="-220"/>
-      <p2 x="-20" y="-140"/>
+      <p1 x="500" y="-120"/>
+      <p2 x="500" y="-100"/>
     </wire>
     <wire>
-      <p1 x="-20" y="-140"/>
-      <p2 x="-20" y="-80"/>
+      <p1 x="500" y="-40"/>
+      <p2 x="500" y="-20"/>
     </wire>
     <wire>
-      <p1 x="180" y="-80"/>
-      <p2 x="180" y="-40"/>
+      <p1 x="500" y="-100"/>
+      <p2 x="500" y="-60"/>
     </wire>
     <wire>
-      <p1 x="180" y="40"/>
-      <p2 x="180" y="60"/>
+      <p1 x="180" y="-20"/>
+      <p2 x="180" y="0"/>
     </wire>
     <wire>
-      <p1 x="500" y="240"/>
-      <p2 x="500" y="280"/>
+      <p1 x="-280" y="-240"/>
+      <p2 x="-280" y="-140"/>
     </wire>
     <wire>
       <p1 x="280" y="320"/>
@@ -1434,17 +1540,37 @@ program(0x4051, 0x40a2, 0x029b)
       <p2 x="280" y="280"/>
     </wire>
     <wire>
-      <p1 x="440" y="-40"/>
-      <p2 x="440" y="20"/>
+      <p1 x="920" y="-120"/>
+      <p2 x="920" y="-40"/>
+    </wire>
+    <wire>
+      <p1 x="440" y="20"/>
+      <p2 x="440" y="60"/>
     </wire>
     <wire>
-      <p1 x="120" y="-20"/>
-      <p2 x="120" y="40"/>
+      <p1 x="-60" y="-140"/>
+      <p2 x="-60" y="-80"/>
     </wire>
     <wire>
       <p1 x="380" y="-200"/>
       <p2 x="380" y="-180"/>
     </wire>
+    <wire>
+      <p1 x="220" y="-60"/>
+      <p2 x="220" y="-40"/>
+    </wire>
+    <wire>
+      <p1 x="220" y="20"/>
+      <p2 x="220" y="60"/>
+    </wire>
+    <wire>
+      <p1 x="860" y="-20"/>
+      <p2 x="860" y="200"/>
+    </wire>
+    <wire>
+      <p1 x="540" y="0"/>
+      <p2 x="540" y="20"/>
+    </wire>
   </wires>
   <measurementOrdering/>
 </circuit>
\ No newline at end of file