From 4c32f417cd05b70a063b1c4457071fb63962094a Mon Sep 17 00:00:00 2001
From: hneemann <helmut.neemann@arcor.de>
Date: Mon, 22 Jul 2019 10:31:48 +0200
Subject: [PATCH] Fixed swapped IC numbers 7447 and 7448. Closes #290

---
 distribution/ReleaseNotes.txt                 |   1 +
 src/main/dig/74xx/counter.dig                 |  31 +-
 .../dig/lib/DIL Chips/74xx/display/7447.dig   | 723 +++++++++++-------
 .../dig/lib/DIL Chips/74xx/display/7448.dig   | 721 ++++++++---------
 .../digital/integration/TestExamples.java     |   2 +-
 5 files changed, 787 insertions(+), 691 deletions(-)

diff --git a/distribution/ReleaseNotes.txt b/distribution/ReleaseNotes.txt
index f34c78dac..9ba2a99e4 100644
--- a/distribution/ReleaseNotes.txt
+++ b/distribution/ReleaseNotes.txt
@@ -22,6 +22,7 @@ head, planned as v0.23
   74xx circuit example.
 - Fixed an issue in the "RAM, Chip select" component which was not fully
   asynchronous.
+- Fixed swapped IC numbers 7447 and 7448.
 
 v0.22, released on 01. Apr 2019
 - Improved the RAM/ROM data loader. Now binary files and Intel HEX files are
diff --git a/src/main/dig/74xx/counter.dig b/src/main/dig/74xx/counter.dig
index d23a55530..8ccdb564d 100644
--- a/src/main/dig/74xx/counter.dig
+++ b/src/main/dig/74xx/counter.dig
@@ -8,11 +8,6 @@
     </entry>
   </attributes>
   <visualElements>
-    <visualElement>
-      <elementName>7447.dig</elementName>
-      <elementAttributes/>
-      <pos x="160" y="-480"/>
-    </visualElement>
     <visualElement>
       <elementName>Seven-Seg</elementName>
       <elementAttributes/>
@@ -23,11 +18,6 @@
       <elementAttributes/>
       <pos x="780" y="440"/>
     </visualElement>
-    <visualElement>
-      <elementName>7447.dig</elementName>
-      <elementAttributes/>
-      <pos x="160" y="-140"/>
-    </visualElement>
     <visualElement>
       <elementName>Seven-Seg</elementName>
       <elementAttributes/>
@@ -38,11 +28,6 @@
       <elementAttributes/>
       <pos x="640" y="440"/>
     </visualElement>
-    <visualElement>
-      <elementName>7447.dig</elementName>
-      <elementAttributes/>
-      <pos x="160" y="200"/>
-    </visualElement>
     <visualElement>
       <elementName>Seven-Seg</elementName>
       <elementAttributes/>
@@ -201,6 +186,21 @@
       <elementAttributes/>
       <pos x="-140" y="-180"/>
     </visualElement>
+    <visualElement>
+      <elementName>7448.dig</elementName>
+      <elementAttributes/>
+      <pos x="160" y="-480"/>
+    </visualElement>
+    <visualElement>
+      <elementName>7448.dig</elementName>
+      <elementAttributes/>
+      <pos x="160" y="-140"/>
+    </visualElement>
+    <visualElement>
+      <elementName>7448.dig</elementName>
+      <elementAttributes/>
+      <pos x="160" y="200"/>
+    </visualElement>
   </visualElements>
   <wires>
     <wire>
@@ -980,4 +980,5 @@
       <p2 x="60" y="440"/>
     </wire>
   </wires>
+  <measurementOrdering/>
 </circuit>
\ No newline at end of file
diff --git a/src/main/dig/lib/DIL Chips/74xx/display/7447.dig b/src/main/dig/lib/DIL Chips/74xx/display/7447.dig
index af4d5a0cf..f5e92d1c0 100644
--- a/src/main/dig/lib/DIL Chips/74xx/display/7447.dig	
+++ b/src/main/dig/lib/DIL Chips/74xx/display/7447.dig	
@@ -8,7 +8,7 @@
     </entry>
     <entry>
       <string>Description</string>
-      <string>BCD to 7-segment decoder, active high</string>
+      <string>BCD to 7-segment decoder, active low</string>
     </entry>
     <entry>
       <string>lockedMode</string>
@@ -23,10 +23,6 @@
     <visualElement>
       <elementName>In</elementName>
       <elementAttributes>
-        <entry>
-          <string>Description</string>
-          <string>Bit 0</string>
-        </entry>
         <entry>
           <string>Label</string>
           <string>A</string>
@@ -36,15 +32,11 @@
           <string>7</string>
         </entry>
       </elementAttributes>
-      <pos x="-180" y="-840"/>
+      <pos x="-540" y="-960"/>
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
       <elementAttributes>
-        <entry>
-          <string>Description</string>
-          <string>Bit 1</string>
-        </entry>
         <entry>
           <string>Label</string>
           <string>B</string>
@@ -54,15 +46,11 @@
           <string>1</string>
         </entry>
       </elementAttributes>
-      <pos x="-180" y="-920"/>
+      <pos x="-540" y="-1040"/>
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
       <elementAttributes>
-        <entry>
-          <string>Description</string>
-          <string>Bit 2</string>
-        </entry>
         <entry>
           <string>Label</string>
           <string>C</string>
@@ -72,15 +60,11 @@
           <string>2</string>
         </entry>
       </elementAttributes>
-      <pos x="-180" y="-1000"/>
+      <pos x="-540" y="-1120"/>
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
       <elementAttributes>
-        <entry>
-          <string>Description</string>
-          <string>Bit 3</string>
-        </entry>
         <entry>
           <string>Label</string>
           <string>D</string>
@@ -90,12 +74,113 @@
           <string>6</string>
         </entry>
       </elementAttributes>
-      <pos x="-180" y="-1080"/>
+      <pos x="-540" y="-1200"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="1"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>a</string>
+        </entry>
+      </elementAttributes>
+      <pos x="440" y="-1200"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="1"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>b</string>
+        </entry>
+      </elementAttributes>
+      <pos x="400" y="-1200"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="1"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>c</string>
+        </entry>
+      </elementAttributes>
+      <pos x="360" y="-1200"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>rotation</string>
+          <rotation rotation="1"/>
+        </entry>
+        <entry>
+          <string>NetName</string>
+          <string>d</string>
+        </entry>
+      </elementAttributes>
+      <pos x="320" y="-1200"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>NetName</string>
+          <string>a</string>
+        </entry>
+      </elementAttributes>
+      <pos x="-80" y="-940"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>NetName</string>
+          <string>b</string>
+        </entry>
+      </elementAttributes>
+      <pos x="-80" y="-1020"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>NetName</string>
+          <string>c</string>
+        </entry>
+      </elementAttributes>
+      <pos x="-80" y="-1100"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Tunnel</elementName>
+      <elementAttributes>
+        <entry>
+          <string>NetName</string>
+          <string>d</string>
+        </entry>
+      </elementAttributes>
+      <pos x="-80" y="-1180"/>
     </visualElement>
     <visualElement>
       <elementName>NAnd</elementName>
-      <elementAttributes/>
-      <pos x="40" y="-680"/>
+      <elementAttributes>
+        <entry>
+          <string>Inputs</string>
+          <int>3</int>
+        </entry>
+      </elementAttributes>
+      <pos x="-260" y="-680"/>
     </visualElement>
     <visualElement>
       <elementName>Out</elementName>
@@ -113,7 +198,7 @@
           <string>4</string>
         </entry>
       </elementAttributes>
-      <pos x="140" y="-660"/>
+      <pos x="-160" y="-660"/>
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
@@ -131,32 +216,32 @@
           <string>5</string>
         </entry>
       </elementAttributes>
-      <pos x="-180" y="-640"/>
+      <pos x="-540" y="-640"/>
     </visualElement>
     <visualElement>
       <elementName>Not</elementName>
       <elementAttributes/>
-      <pos x="-80" y="-640"/>
+      <pos x="-420" y="-640"/>
     </visualElement>
     <visualElement>
       <elementName>Or</elementName>
       <elementAttributes/>
-      <pos x="140" y="-1080"/>
+      <pos x="-160" y="-1200"/>
     </visualElement>
     <visualElement>
       <elementName>Or</elementName>
       <elementAttributes/>
-      <pos x="140" y="-1000"/>
+      <pos x="-160" y="-1120"/>
     </visualElement>
     <visualElement>
       <elementName>Or</elementName>
       <elementAttributes/>
-      <pos x="140" y="-920"/>
+      <pos x="-160" y="-1040"/>
     </visualElement>
     <visualElement>
       <elementName>Or</elementName>
       <elementAttributes/>
-      <pos x="140" y="-840"/>
+      <pos x="-160" y="-960"/>
     </visualElement>
     <visualElement>
       <elementName>NOr</elementName>
@@ -166,19 +251,19 @@
           <int>4</int>
         </entry>
       </elementAttributes>
-      <pos x="-80" y="-800"/>
+      <pos x="-440" y="-800"/>
     </visualElement>
     <visualElement>
       <elementName>And</elementName>
       <elementAttributes/>
-      <pos x="40" y="-760"/>
+      <pos x="-260" y="-920"/>
     </visualElement>
     <visualElement>
       <elementName>Out</elementName>
       <elementAttributes>
         <entry>
           <string>Label</string>
-          <string>a</string>
+          <string>~a</string>
         </entry>
         <entry>
           <string>pinNumber</string>
@@ -189,17 +274,7 @@
           <int>1</int>
         </entry>
       </elementAttributes>
-      <pos x="720" y="-960"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Or</elementName>
-      <elementAttributes>
-        <entry>
-          <string>Inputs</string>
-          <int>5</int>
-        </entry>
-      </elementAttributes>
-      <pos x="640" y="-1000"/>
+      <pos x="740" y="-960"/>
     </visualElement>
     <visualElement>
       <elementName>And</elementName>
@@ -246,7 +321,7 @@
       <elementAttributes>
         <entry>
           <string>Label</string>
-          <string>b</string>
+          <string>~b</string>
         </entry>
         <entry>
           <string>pinNumber</string>
@@ -257,17 +332,7 @@
           <int>1</int>
         </entry>
       </elementAttributes>
-      <pos x="720" y="-640"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Or</elementName>
-      <elementAttributes>
-        <entry>
-          <string>Inputs</string>
-          <int>5</int>
-        </entry>
-      </elementAttributes>
-      <pos x="640" y="-680"/>
+      <pos x="740" y="-640"/>
     </visualElement>
     <visualElement>
       <elementName>And</elementName>
@@ -299,7 +364,7 @@
       <elementAttributes>
         <entry>
           <string>Label</string>
-          <string>c</string>
+          <string>~c</string>
         </entry>
         <entry>
           <string>pinNumber</string>
@@ -310,17 +375,7 @@
           <int>1</int>
         </entry>
       </elementAttributes>
-      <pos x="720" y="-340"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Or</elementName>
-      <elementAttributes>
-        <entry>
-          <string>Inputs</string>
-          <int>4</int>
-        </entry>
-      </elementAttributes>
-      <pos x="640" y="-380"/>
+      <pos x="740" y="-340"/>
     </visualElement>
     <visualElement>
       <elementName>And</elementName>
@@ -342,7 +397,7 @@
       <elementAttributes>
         <entry>
           <string>Label</string>
-          <string>d</string>
+          <string>~d</string>
         </entry>
         <entry>
           <string>pinNumber</string>
@@ -353,17 +408,7 @@
           <int>1</int>
         </entry>
       </elementAttributes>
-      <pos x="720" y="-80"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Or</elementName>
-      <elementAttributes>
-        <entry>
-          <string>Inputs</string>
-          <int>5</int>
-        </entry>
-      </elementAttributes>
-      <pos x="640" y="-120"/>
+      <pos x="740" y="-80"/>
     </visualElement>
     <visualElement>
       <elementName>And</elementName>
@@ -395,7 +440,7 @@
       <elementAttributes>
         <entry>
           <string>Label</string>
-          <string>e</string>
+          <string>~e</string>
         </entry>
         <entry>
           <string>pinNumber</string>
@@ -406,17 +451,7 @@
           <int>1</int>
         </entry>
       </elementAttributes>
-      <pos x="720" y="160"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Or</elementName>
-      <elementAttributes>
-        <entry>
-          <string>Inputs</string>
-          <int>3</int>
-        </entry>
-      </elementAttributes>
-      <pos x="640" y="140"/>
+      <pos x="740" y="160"/>
     </visualElement>
     <visualElement>
       <elementName>And</elementName>
@@ -433,7 +468,7 @@
       <elementAttributes>
         <entry>
           <string>Label</string>
-          <string>f</string>
+          <string>~f</string>
         </entry>
         <entry>
           <string>pinNumber</string>
@@ -444,17 +479,7 @@
           <int>1</int>
         </entry>
       </elementAttributes>
-      <pos x="720" y="400"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Or</elementName>
-      <elementAttributes>
-        <entry>
-          <string>Inputs</string>
-          <int>5</int>
-        </entry>
-      </elementAttributes>
-      <pos x="640" y="360"/>
+      <pos x="740" y="400"/>
     </visualElement>
     <visualElement>
       <elementName>And</elementName>
@@ -481,7 +506,7 @@
       <elementAttributes>
         <entry>
           <string>Label</string>
-          <string>g</string>
+          <string>~g</string>
         </entry>
         <entry>
           <string>pinNumber</string>
@@ -492,17 +517,7 @@
           <int>1</int>
         </entry>
       </elementAttributes>
-      <pos x="720" y="720"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Or</elementName>
-      <elementAttributes>
-        <entry>
-          <string>Inputs</string>
-          <int>5</int>
-        </entry>
-      </elementAttributes>
-      <pos x="640" y="680"/>
+      <pos x="740" y="720"/>
     </visualElement>
     <visualElement>
       <elementName>And</elementName>
@@ -571,10 +586,6 @@
           <string>Description</string>
           <string>lamp test</string>
         </entry>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="3"/>
-        </entry>
         <entry>
           <string>Label</string>
           <string>~LT</string>
@@ -584,22 +595,87 @@
           <string>3</string>
         </entry>
       </elementAttributes>
-      <pos x="620" y="-1140"/>
+      <pos x="-540" y="-1280"/>
     </visualElement>
     <visualElement>
       <elementName>Not</elementName>
+      <elementAttributes/>
+      <pos x="-260" y="-1280"/>
+    </visualElement>
+    <visualElement>
+      <elementName>NOr</elementName>
       <elementAttributes>
         <entry>
-          <string>rotation</string>
-          <rotation rotation="3"/>
+          <string>Inputs</string>
+          <int>5</int>
         </entry>
       </elementAttributes>
-      <pos x="620" y="-1120"/>
+      <pos x="640" y="-1000"/>
+    </visualElement>
+    <visualElement>
+      <elementName>NOr</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Inputs</string>
+          <int>5</int>
+        </entry>
+      </elementAttributes>
+      <pos x="640" y="-680"/>
+    </visualElement>
+    <visualElement>
+      <elementName>NOr</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Inputs</string>
+          <int>5</int>
+        </entry>
+      </elementAttributes>
+      <pos x="640" y="-120"/>
+    </visualElement>
+    <visualElement>
+      <elementName>NOr</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Inputs</string>
+          <int>5</int>
+        </entry>
+      </elementAttributes>
+      <pos x="640" y="360"/>
+    </visualElement>
+    <visualElement>
+      <elementName>NOr</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Inputs</string>
+          <int>5</int>
+        </entry>
+      </elementAttributes>
+      <pos x="640" y="680"/>
+    </visualElement>
+    <visualElement>
+      <elementName>NOr</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Inputs</string>
+          <int>4</int>
+        </entry>
+      </elementAttributes>
+      <pos x="640" y="-380"/>
+    </visualElement>
+    <visualElement>
+      <elementName>NOr</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Inputs</string>
+          <int>3</int>
+        </entry>
+      </elementAttributes>
+      <pos x="640" y="140"/>
     </visualElement>
     <visualElement>
       <elementName>PowerSupply</elementName>
       <elementAttributes/>
-      <pos x="-140" y="-520"/>
+      <pos x="-500" y="-500"/>
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
@@ -617,7 +693,7 @@
           <value v="1" z="false"/>
         </entry>
       </elementAttributes>
-      <pos x="-180" y="-520"/>
+      <pos x="-540" y="-500"/>
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
@@ -631,18 +707,52 @@
           <string>8</string>
         </entry>
       </elementAttributes>
-      <pos x="-180" y="-480"/>
+      <pos x="-540" y="-460"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Testcase</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Testdata</string>
+          <testData>
+            <dataString>~LT ~RBI D C B A ~RBO  ~a ~b ~c ~d ~e ~f ~g 
+ 1    1  0 0 0 0   1   0 0 0 0 0 0 1
+
+ 1    x  0 0 0 1   1   1 0 0 1 1 1 1
+ 1    x  0 0 1 0   1   0 0 1 0 0 1 0
+ 1    x  0 0 1 1   1   0 0 0 0 1 1 0
+ 1    x  0 1 0 0   1   1 0 0 1 1 0 0
+ 1    x  0 1 0 1   1   0 1 0 0 1 0 0
+ 1    x  0 1 1 1   1   0 0 0 1 1 1 1
+ 1    x  1 0 0 0   1   0 0 0 0 0 0 0
+ 1    x  1 0 0 1   1   0 0 0 1 1 0 0
+ 1    x  1 0 1 0   1   1 1 1 0 0 1 0
+ 1    x  1 0 1 1   1   1 1 0 0 1 1 0
+ 1    x  1 1 0 0   1   1 0 1 1 1 0 0
+ 1    x  1 1 0 1   1   0 1 1 0 1 0 0
+ 1    x  1 1 1 0   1   1 1 1 0 0 0 0
+ 1    x  1 1 1 1   1   1 1 1 1 1 1 1
+
+#x    x  x x x x   0   0 0 0 0 0 0 0
+ 1    0  0 0 0 0   0   1 1 1 1 1 1 1
+ 0    x  x x x x   1   0 0 0 0 0 0 0
+
+</dataString>
+          </testData>
+        </entry>
+      </elementAttributes>
+      <pos x="-140" y="-520"/>
     </visualElement>
   </visualElements>
   <wires>
-    <wire>
-      <p1 x="200" y="-900"/>
-      <p2 x="400" y="-900"/>
-    </wire>
     <wire>
       <p1 x="400" y="-900"/>
       <p2 x="500" y="-900"/>
     </wire>
+    <wire>
+      <p1 x="-200" y="-900"/>
+      <p2 x="-180" y="-900"/>
+    </wire>
     <wire>
       <p1 x="440" y="-260"/>
       <p2 x="500" y="-260"/>
@@ -656,21 +766,21 @@
       <p2 x="600" y="-520"/>
     </wire>
     <wire>
-      <p1 x="-180" y="-520"/>
-      <p2 x="-140" y="-520"/>
+      <p1 x="-180" y="-1160"/>
+      <p2 x="-160" y="-1160"/>
     </wire>
     <wire>
       <p1 x="560" y="520"/>
       <p2 x="600" y="520"/>
     </wire>
-    <wire>
-      <p1 x="-120" y="-780"/>
-      <p2 x="-80" y="-780"/>
-    </wire>
     <wire>
       <p1 x="340" y="-780"/>
       <p2 x="500" y="-780"/>
     </wire>
+    <wire>
+      <p1 x="-480" y="-780"/>
+      <p2 x="-440" y="-780"/>
+    </wire>
     <wire>
       <p1 x="380" y="-140"/>
       <p2 x="500" y="-140"/>
@@ -688,21 +798,21 @@
       <p2 x="500" y="780"/>
     </wire>
     <wire>
-      <p1 x="120" y="-1040"/>
-      <p2 x="140" y="-1040"/>
+      <p1 x="-540" y="-1040"/>
+      <p2 x="-480" y="-1040"/>
     </wire>
     <wire>
-      <p1 x="700" y="400"/>
-      <p2 x="720" y="400"/>
+      <p1 x="-480" y="-1040"/>
+      <p2 x="-160" y="-1040"/>
+    </wire>
+    <wire>
+      <p1 x="720" y="400"/>
+      <p2 x="740" y="400"/>
     </wire>
     <wire>
       <p1 x="620" y="400"/>
       <p2 x="640" y="400"/>
     </wire>
-    <wire>
-      <p1 x="120" y="-660"/>
-      <p2 x="140" y="-660"/>
-    </wire>
     <wire>
       <p1 x="440" y="-660"/>
       <p2 x="500" y="-660"/>
@@ -711,6 +821,14 @@
       <p1 x="580" y="-660"/>
       <p2 x="640" y="-660"/>
     </wire>
+    <wire>
+      <p1 x="-180" y="-660"/>
+      <p2 x="-160" y="-660"/>
+    </wire>
+    <wire>
+      <p1 x="-280" y="-660"/>
+      <p2 x="-260" y="-660"/>
+    </wire>
     <wire>
       <p1 x="440" y="-20"/>
       <p2 x="500" y="-20"/>
@@ -723,10 +841,6 @@
       <p1 x="380" y="660"/>
       <p2 x="500" y="660"/>
     </wire>
-    <wire>
-      <p1 x="-180" y="-920"/>
-      <p2 x="-120" y="-920"/>
-    </wire>
     <wire>
       <p1 x="380" y="-920"/>
       <p2 x="500" y="-920"/>
@@ -740,8 +854,12 @@
       <p2 x="640" y="-920"/>
     </wire>
     <wire>
-      <p1 x="-120" y="-920"/>
-      <p2 x="140" y="-920"/>
+      <p1 x="-340" y="-920"/>
+      <p2 x="-260" y="-920"/>
+    </wire>
+    <wire>
+      <p1 x="-180" y="-920"/>
+      <p2 x="-160" y="-920"/>
     </wire>
     <wire>
       <p1 x="560" y="-280"/>
@@ -767,6 +885,10 @@
       <p1 x="440" y="-1180"/>
       <p2 x="460" y="-1180"/>
     </wire>
+    <wire>
+      <p1 x="-100" y="-1180"/>
+      <p2 x="-80" y="-1180"/>
+    </wire>
     <wire>
       <p1 x="420" y="-540"/>
       <p2 x="500" y="-540"/>
@@ -776,25 +898,17 @@
       <p2 x="500" y="540"/>
     </wire>
     <wire>
-      <p1 x="120" y="-800"/>
-      <p2 x="140" y="-800"/>
+      <p1 x="-460" y="-800"/>
+      <p2 x="-440" y="-800"/>
     </wire>
     <wire>
-      <p1 x="-100" y="-800"/>
-      <p2 x="-80" y="-800"/>
-    </wire>
-    <wire>
-      <p1 x="700" y="160"/>
-      <p2 x="720" y="160"/>
+      <p1 x="720" y="160"/>
+      <p2 x="740" y="160"/>
     </wire>
     <wire>
       <p1 x="620" y="160"/>
       <p2 x="640" y="160"/>
     </wire>
-    <wire>
-      <p1 x="200" y="-1060"/>
-      <p2 x="320" y="-1060"/>
-    </wire>
     <wire>
       <p1 x="440" y="-1060"/>
       <p2 x="500" y="-1060"/>
@@ -811,10 +925,6 @@
       <p1 x="580" y="420"/>
       <p2 x="640" y="420"/>
     </wire>
-    <wire>
-      <p1 x="20" y="-680"/>
-      <p2 x="40" y="-680"/>
-    </wire>
     <wire>
       <p1 x="600" y="-680"/>
       <p2 x="640" y="-680"/>
@@ -827,6 +937,10 @@
       <p1 x="560" y="-680"/>
       <p2 x="580" y="-680"/>
     </wire>
+    <wire>
+      <p1 x="-340" y="-680"/>
+      <p2 x="-260" y="-680"/>
+    </wire>
     <wire>
       <p1 x="420" y="-40"/>
       <p2 x="500" y="-40"/>
@@ -859,6 +973,10 @@
       <p1 x="580" y="-940"/>
       <p2 x="640" y="-940"/>
     </wire>
+    <wire>
+      <p1 x="-100" y="-940"/>
+      <p2 x="-80" y="-940"/>
+    </wire>
     <wire>
       <p1 x="380" y="-300"/>
       <p2 x="500" y="-300"/>
@@ -872,8 +990,12 @@
       <p2 x="500" y="300"/>
     </wire>
     <wire>
-      <p1 x="200" y="-820"/>
-      <p2 x="440" y="-820"/>
+      <p1 x="-540" y="-1200"/>
+      <p2 x="-520" y="-1200"/>
+    </wire>
+    <wire>
+      <p1 x="-520" y="-1200"/>
+      <p2 x="-160" y="-1200"/>
     </wire>
     <wire>
       <p1 x="460" y="-820"/>
@@ -895,10 +1017,6 @@
       <p1 x="400" y="820"/>
       <p2 x="500" y="820"/>
     </wire>
-    <wire>
-      <p1 x="-180" y="-1080"/>
-      <p2 x="-160" y="-1080"/>
-    </wire>
     <wire>
       <p1 x="420" y="-1080"/>
       <p2 x="500" y="-1080"/>
@@ -908,8 +1026,8 @@
       <p2 x="600" y="-1080"/>
     </wire>
     <wire>
-      <p1 x="-160" y="-1080"/>
-      <p2 x="140" y="-1080"/>
+      <p1 x="-180" y="-1080"/>
+      <p2 x="-160" y="-1080"/>
     </wire>
     <wire>
       <p1 x="560" y="-440"/>
@@ -948,17 +1066,21 @@
       <p2 x="640" y="700"/>
     </wire>
     <wire>
-      <p1 x="120" y="-960"/>
-      <p2 x="140" y="-960"/>
+      <p1 x="720" y="-960"/>
+      <p2 x="740" y="-960"/>
     </wire>
     <wire>
-      <p1 x="700" y="-960"/>
-      <p2 x="720" y="-960"/>
+      <p1 x="-540" y="-960"/>
+      <p2 x="-460" y="-960"/>
     </wire>
     <wire>
       <p1 x="620" y="-960"/>
       <p2 x="640" y="-960"/>
     </wire>
+    <wire>
+      <p1 x="-460" y="-960"/>
+      <p2 x="-160" y="-960"/>
+    </wire>
     <wire>
       <p1 x="620" y="-320"/>
       <p2 x="640" y="-320"/>
@@ -971,10 +1093,6 @@
       <p1 x="320" y="580"/>
       <p2 x="500" y="580"/>
     </wire>
-    <wire>
-      <p1 x="-180" y="-840"/>
-      <p2 x="-100" y="-840"/>
-    </wire>
     <wire>
       <p1 x="420" y="-840"/>
       <p2 x="500" y="-840"/>
@@ -983,10 +1101,6 @@
       <p1 x="560" y="-840"/>
       <p2 x="600" y="-840"/>
     </wire>
-    <wire>
-      <p1 x="-100" y="-840"/>
-      <p2 x="140" y="-840"/>
-    </wire>
     <wire>
       <p1 x="560" y="-200"/>
       <p2 x="600" y="-200"/>
@@ -1003,42 +1117,42 @@
       <p1 x="320" y="-1100"/>
       <p2 x="500" y="-1100"/>
     </wire>
+    <wire>
+      <p1 x="-100" y="-1100"/>
+      <p2 x="-80" y="-1100"/>
+    </wire>
     <wire>
       <p1 x="340" y="-460"/>
       <p2 x="500" y="-460"/>
     </wire>
+    <wire>
+      <p1 x="-540" y="-460"/>
+      <p2 x="-520" y="-460"/>
+    </wire>
     <wire>
       <p1 x="460" y="460"/>
       <p2 x="500" y="460"/>
     </wire>
     <wire>
-      <p1 x="-160" y="-720"/>
-      <p2 x="-80" y="-720"/>
-    </wire>
-    <wire>
-      <p1 x="0" y="-720"/>
-      <p2 x="40" y="-720"/>
-    </wire>
-    <wire>
-      <p1 x="700" y="-80"/>
-      <p2 x="720" y="-80"/>
+      <p1 x="720" y="-80"/>
+      <p2 x="740" y="-80"/>
     </wire>
     <wire>
       <p1 x="620" y="-80"/>
       <p2 x="640" y="-80"/>
     </wire>
     <wire>
-      <p1 x="700" y="720"/>
-      <p2 x="720" y="720"/>
+      <p1 x="-520" y="-720"/>
+      <p2 x="-440" y="-720"/>
+    </wire>
+    <wire>
+      <p1 x="720" y="720"/>
+      <p2 x="740" y="720"/>
     </wire>
     <wire>
       <p1 x="620" y="720"/>
       <p2 x="640" y="720"/>
     </wire>
-    <wire>
-      <p1 x="200" y="-980"/>
-      <p2 x="360" y="-980"/>
-    </wire>
     <wire>
       <p1 x="440" y="-980"/>
       <p2 x="500" y="-980"/>
@@ -1052,8 +1166,8 @@
       <p2 x="500" y="-340"/>
     </wire>
     <wire>
-      <p1 x="700" y="-340"/>
-      <p2 x="720" y="-340"/>
+      <p1 x="720" y="-340"/>
+      <p2 x="740" y="-340"/>
     </wire>
     <wire>
       <p1 x="360" y="340"/>
@@ -1088,16 +1202,20 @@
       <p2 x="500" y="860"/>
     </wire>
     <wire>
-      <p1 x="-180" y="-480"/>
-      <p2 x="-160" y="-480"/>
+      <p1 x="-540" y="-1120"/>
+      <p2 x="-500" y="-1120"/>
     </wire>
     <wire>
-      <p1 x="100" y="-740"/>
-      <p2 x="120" y="-740"/>
+      <p1 x="-500" y="-1120"/>
+      <p2 x="-160" y="-1120"/>
     </wire>
     <wire>
-      <p1 x="-140" y="-740"/>
-      <p2 x="-80" y="-740"/>
+      <p1 x="-520" y="-480"/>
+      <p2 x="-500" y="-480"/>
+    </wire>
+    <wire>
+      <p1 x="-500" y="-740"/>
+      <p2 x="-440" y="-740"/>
     </wire>
     <wire>
       <p1 x="380" y="-740"/>
@@ -1125,7 +1243,7 @@
     </wire>
     <wire>
       <p1 x="-180" y="-1000"/>
-      <p2 x="-140" y="-1000"/>
+      <p2 x="-160" y="-1000"/>
     </wire>
     <wire>
       <p1 x="600" y="-1000"/>
@@ -1139,10 +1257,6 @@
       <p1 x="560" y="-1000"/>
       <p2 x="580" y="-1000"/>
     </wire>
-    <wire>
-      <p1 x="-140" y="-1000"/>
-      <p2 x="140" y="-1000"/>
-    </wire>
     <wire>
       <p1 x="560" y="-360"/>
       <p2 x="640" y="-360"/>
@@ -1168,33 +1282,29 @@
       <p2 x="500" y="620"/>
     </wire>
     <wire>
-      <p1 x="120" y="-880"/>
-      <p2 x="140" y="-880"/>
+      <p1 x="-320" y="-880"/>
+      <p2 x="-260" y="-880"/>
     </wire>
     <wire>
       <p1 x="460" y="-500"/>
       <p2 x="500" y="-500"/>
     </wire>
     <wire>
-      <p1 x="-160" y="-500"/>
-      <p2 x="-140" y="-500"/>
+      <p1 x="-540" y="-500"/>
+      <p2 x="-500" y="-500"/>
     </wire>
     <wire>
       <p1 x="420" y="500"/>
       <p2 x="500" y="500"/>
     </wire>
     <wire>
-      <p1 x="0" y="-760"/>
-      <p2 x="20" y="-760"/>
+      <p1 x="-360" y="-760"/>
+      <p2 x="-340" y="-760"/>
     </wire>
     <wire>
       <p1 x="560" y="-760"/>
       <p2 x="600" y="-760"/>
     </wire>
-    <wire>
-      <p1 x="20" y="-760"/>
-      <p2 x="40" y="-760"/>
-    </wire>
     <wire>
       <p1 x="600" y="-120"/>
       <p2 x="640" y="-120"/>
@@ -1215,6 +1325,10 @@
       <p1 x="600" y="760"/>
       <p2 x="640" y="760"/>
     </wire>
+    <wire>
+      <p1 x="-100" y="-1020"/>
+      <p2 x="-80" y="-1020"/>
+    </wire>
     <wire>
       <p1 x="340" y="-1020"/>
       <p2 x="500" y="-1020"/>
@@ -1236,24 +1350,40 @@
       <p2 x="640" y="380"/>
     </wire>
     <wire>
-      <p1 x="-40" y="-640"/>
-      <p2 x="0" y="-640"/>
+      <p1 x="-380" y="-640"/>
+      <p2 x="-320" y="-640"/>
     </wire>
     <wire>
-      <p1 x="-180" y="-640"/>
-      <p2 x="-80" y="-640"/>
+      <p1 x="-540" y="-640"/>
+      <p2 x="-420" y="-640"/>
     </wire>
     <wire>
-      <p1 x="700" y="-640"/>
-      <p2 x="720" y="-640"/>
+      <p1 x="720" y="-640"/>
+      <p2 x="740" y="-640"/>
     </wire>
     <wire>
       <p1 x="620" y="-640"/>
       <p2 x="640" y="-640"/>
     </wire>
     <wire>
-      <p1 x="0" y="-640"/>
-      <p2 x="40" y="-640"/>
+      <p1 x="-320" y="-640"/>
+      <p2 x="-260" y="-640"/>
+    </wire>
+    <wire>
+      <p1 x="-540" y="-1280"/>
+      <p2 x="-280" y="-1280"/>
+    </wire>
+    <wire>
+      <p1 x="-220" y="-1280"/>
+      <p2 x="620" y="-1280"/>
+    </wire>
+    <wire>
+      <p1 x="-280" y="-1280"/>
+      <p2 x="-260" y="-1280"/>
+    </wire>
+    <wire>
+      <p1 x="320" y="-1200"/>
+      <p2 x="320" y="-1180"/>
     </wire>
     <wire>
       <p1 x="320" y="-1180"/>
@@ -1261,10 +1391,6 @@
     </wire>
     <wire>
       <p1 x="320" y="-1100"/>
-      <p2 x="320" y="-1060"/>
-    </wire>
-    <wire>
-      <p1 x="320" y="-1060"/>
       <p2 x="320" y="260"/>
     </wire>
     <wire>
@@ -1275,14 +1401,6 @@
       <p1 x="320" y="260"/>
       <p2 x="320" y="580"/>
     </wire>
-    <wire>
-      <p1 x="0" y="-720"/>
-      <p2 x="0" y="-640"/>
-    </wire>
-    <wire>
-      <p1 x="-100" y="-840"/>
-      <p2 x="-100" y="-800"/>
-    </wire>
     <wire>
       <p1 x="580" y="-1000"/>
       <p2 x="580" y="-980"/>
@@ -1392,8 +1510,16 @@
       <p2 x="420" y="880"/>
     </wire>
     <wire>
-      <p1 x="360" y="-1180"/>
-      <p2 x="360" y="-1000"/>
+      <p1 x="-520" y="-1200"/>
+      <p2 x="-520" y="-720"/>
+    </wire>
+    <wire>
+      <p1 x="-520" y="-480"/>
+      <p2 x="-520" y="-460"/>
+    </wire>
+    <wire>
+      <p1 x="360" y="-1200"/>
+      <p2 x="360" y="-1180"/>
     </wire>
     <wire>
       <p1 x="360" y="740"/>
@@ -1403,6 +1529,10 @@
       <p1 x="360" y="340"/>
       <p2 x="360" y="420"/>
     </wire>
+    <wire>
+      <p1 x="360" y="-1180"/>
+      <p2 x="360" y="-1000"/>
+    </wire>
     <wire>
       <p1 x="360" y="420"/>
       <p2 x="360" y="740"/>
@@ -1413,10 +1543,6 @@
     </wire>
     <wire>
       <p1 x="360" y="-1000"/>
-      <p2 x="360" y="-980"/>
-    </wire>
-    <wire>
-      <p1 x="360" y="-980"/>
       <p2 x="360" y="-420"/>
     </wire>
     <wire>
@@ -1424,15 +1550,11 @@
       <p2 x="360" y="-60"/>
     </wire>
     <wire>
-      <p1 x="-140" y="-1000"/>
-      <p2 x="-140" y="-740"/>
+      <p1 x="-460" y="-960"/>
+      <p2 x="-460" y="-800"/>
     </wire>
     <wire>
-      <p1 x="620" y="-1140"/>
-      <p2 x="620" y="-1120"/>
-    </wire>
-    <wire>
-      <p1 x="620" y="-1080"/>
+      <p1 x="620" y="-1280"/>
       <p2 x="620" y="-960"/>
     </wire>
     <wire>
@@ -1504,8 +1626,8 @@
       <p2 x="460" y="140"/>
     </wire>
     <wire>
-      <p1 x="400" y="-1180"/>
-      <p2 x="400" y="-900"/>
+      <p1 x="400" y="-1200"/>
+      <p2 x="400" y="-1180"/>
     </wire>
     <wire>
       <p1 x="400" y="-100"/>
@@ -1535,6 +1657,38 @@
       <p1 x="400" y="-680"/>
       <p2 x="400" y="-100"/>
     </wire>
+    <wire>
+      <p1 x="400" y="-1180"/>
+      <p2 x="400" y="-900"/>
+    </wire>
+    <wire>
+      <p1 x="-500" y="-1120"/>
+      <p2 x="-500" y="-740"/>
+    </wire>
+    <wire>
+      <p1 x="-340" y="-920"/>
+      <p2 x="-340" y="-760"/>
+    </wire>
+    <wire>
+      <p1 x="-340" y="-760"/>
+      <p2 x="-340" y="-680"/>
+    </wire>
+    <wire>
+      <p1 x="-180" y="-1160"/>
+      <p2 x="-180" y="-1080"/>
+    </wire>
+    <wire>
+      <p1 x="-180" y="-1080"/>
+      <p2 x="-180" y="-1000"/>
+    </wire>
+    <wire>
+      <p1 x="-180" y="-920"/>
+      <p2 x="-180" y="-900"/>
+    </wire>
+    <wire>
+      <p1 x="-180" y="-1000"/>
+      <p2 x="-180" y="-920"/>
+    </wire>
     <wire>
       <p1 x="340" y="-1180"/>
       <p2 x="340" y="-1160"/>
@@ -1564,41 +1718,21 @@
       <p2 x="340" y="-780"/>
     </wire>
     <wire>
-      <p1 x="20" y="-760"/>
-      <p2 x="20" y="-680"/>
+      <p1 x="-280" y="-1280"/>
+      <p2 x="-280" y="-660"/>
     </wire>
     <wire>
-      <p1 x="-120" y="-920"/>
-      <p2 x="-120" y="-780"/>
-    </wire>
-    <wire>
-      <p1 x="120" y="-1040"/>
-      <p2 x="120" y="-960"/>
-    </wire>
-    <wire>
-      <p1 x="120" y="-960"/>
-      <p2 x="120" y="-880"/>
-    </wire>
-    <wire>
-      <p1 x="120" y="-880"/>
-      <p2 x="120" y="-800"/>
-    </wire>
-    <wire>
-      <p1 x="120" y="-800"/>
-      <p2 x="120" y="-740"/>
-    </wire>
-    <wire>
-      <p1 x="440" y="-1180"/>
-      <p2 x="440" y="-1060"/>
-    </wire>
-    <wire>
-      <p1 x="440" y="-820"/>
-      <p2 x="440" y="-660"/>
+      <p1 x="440" y="-1200"/>
+      <p2 x="440" y="-1180"/>
     </wire>
     <wire>
       <p1 x="440" y="-260"/>
       <p2 x="440" y="-20"/>
     </wire>
+    <wire>
+      <p1 x="440" y="-1180"/>
+      <p2 x="440" y="-1060"/>
+    </wire>
     <wire>
       <p1 x="440" y="-660"/>
       <p2 x="440" y="-260"/>
@@ -1613,7 +1747,7 @@
     </wire>
     <wire>
       <p1 x="440" y="-980"/>
-      <p2 x="440" y="-820"/>
+      <p2 x="440" y="-660"/>
     </wire>
     <wire>
       <p1 x="600" y="-1080"/>
@@ -1704,12 +1838,13 @@
       <p2 x="380" y="-380"/>
     </wire>
     <wire>
-      <p1 x="-160" y="-1080"/>
-      <p2 x="-160" y="-720"/>
+      <p1 x="-480" y="-1040"/>
+      <p2 x="-480" y="-780"/>
     </wire>
     <wire>
-      <p1 x="-160" y="-500"/>
-      <p2 x="-160" y="-480"/>
+      <p1 x="-320" y="-880"/>
+      <p2 x="-320" y="-640"/>
     </wire>
   </wires>
+  <measurementOrdering/>
 </circuit>
\ No newline at end of file
diff --git a/src/main/dig/lib/DIL Chips/74xx/display/7448.dig b/src/main/dig/lib/DIL Chips/74xx/display/7448.dig
index c9477e2e5..a84d3ae75 100644
--- a/src/main/dig/lib/DIL Chips/74xx/display/7448.dig	
+++ b/src/main/dig/lib/DIL Chips/74xx/display/7448.dig	
@@ -8,7 +8,7 @@
     </entry>
     <entry>
       <string>Description</string>
-      <string>BCD to 7-segment decoder, active low</string>
+      <string>BCD to 7-segment decoder, active high</string>
     </entry>
     <entry>
       <string>lockedMode</string>
@@ -23,6 +23,10 @@
     <visualElement>
       <elementName>In</elementName>
       <elementAttributes>
+        <entry>
+          <string>Description</string>
+          <string>Bit 0</string>
+        </entry>
         <entry>
           <string>Label</string>
           <string>A</string>
@@ -32,11 +36,15 @@
           <string>7</string>
         </entry>
       </elementAttributes>
-      <pos x="-540" y="-960"/>
+      <pos x="-180" y="-840"/>
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
       <elementAttributes>
+        <entry>
+          <string>Description</string>
+          <string>Bit 1</string>
+        </entry>
         <entry>
           <string>Label</string>
           <string>B</string>
@@ -46,11 +54,15 @@
           <string>1</string>
         </entry>
       </elementAttributes>
-      <pos x="-540" y="-1040"/>
+      <pos x="-180" y="-920"/>
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
       <elementAttributes>
+        <entry>
+          <string>Description</string>
+          <string>Bit 2</string>
+        </entry>
         <entry>
           <string>Label</string>
           <string>C</string>
@@ -60,11 +72,15 @@
           <string>2</string>
         </entry>
       </elementAttributes>
-      <pos x="-540" y="-1120"/>
+      <pos x="-180" y="-1000"/>
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
       <elementAttributes>
+        <entry>
+          <string>Description</string>
+          <string>Bit 3</string>
+        </entry>
         <entry>
           <string>Label</string>
           <string>D</string>
@@ -74,108 +90,17 @@
           <string>6</string>
         </entry>
       </elementAttributes>
-      <pos x="-540" y="-1200"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="1"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>a</string>
-        </entry>
-      </elementAttributes>
-      <pos x="440" y="-1200"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="1"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>b</string>
-        </entry>
-      </elementAttributes>
-      <pos x="400" y="-1200"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="1"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>c</string>
-        </entry>
-      </elementAttributes>
-      <pos x="360" y="-1200"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="1"/>
-        </entry>
-        <entry>
-          <string>NetName</string>
-          <string>d</string>
-        </entry>
-      </elementAttributes>
-      <pos x="320" y="-1200"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>NetName</string>
-          <string>a</string>
-        </entry>
-      </elementAttributes>
-      <pos x="-120" y="-940"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>NetName</string>
-          <string>b</string>
-        </entry>
-      </elementAttributes>
-      <pos x="-120" y="-1020"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>NetName</string>
-          <string>c</string>
-        </entry>
-      </elementAttributes>
-      <pos x="-120" y="-1100"/>
-    </visualElement>
-    <visualElement>
-      <elementName>Tunnel</elementName>
-      <elementAttributes>
-        <entry>
-          <string>NetName</string>
-          <string>d</string>
-        </entry>
-      </elementAttributes>
-      <pos x="-120" y="-1180"/>
+      <pos x="-180" y="-1080"/>
     </visualElement>
     <visualElement>
       <elementName>NAnd</elementName>
-      <elementAttributes/>
-      <pos x="-260" y="-680"/>
+      <elementAttributes>
+        <entry>
+          <string>Inputs</string>
+          <int>3</int>
+        </entry>
+      </elementAttributes>
+      <pos x="60" y="-680"/>
     </visualElement>
     <visualElement>
       <elementName>Out</elementName>
@@ -193,7 +118,7 @@
           <string>4</string>
         </entry>
       </elementAttributes>
-      <pos x="-160" y="-660"/>
+      <pos x="160" y="-660"/>
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
@@ -211,32 +136,32 @@
           <string>5</string>
         </entry>
       </elementAttributes>
-      <pos x="-540" y="-640"/>
+      <pos x="-180" y="-640"/>
     </visualElement>
     <visualElement>
       <elementName>Not</elementName>
       <elementAttributes/>
-      <pos x="-420" y="-640"/>
+      <pos x="-80" y="-640"/>
     </visualElement>
     <visualElement>
       <elementName>Or</elementName>
       <elementAttributes/>
-      <pos x="-200" y="-1200"/>
+      <pos x="160" y="-1080"/>
     </visualElement>
     <visualElement>
       <elementName>Or</elementName>
       <elementAttributes/>
-      <pos x="-200" y="-1120"/>
+      <pos x="160" y="-1000"/>
     </visualElement>
     <visualElement>
       <elementName>Or</elementName>
       <elementAttributes/>
-      <pos x="-200" y="-1040"/>
+      <pos x="160" y="-920"/>
     </visualElement>
     <visualElement>
       <elementName>Or</elementName>
       <elementAttributes/>
-      <pos x="-200" y="-960"/>
+      <pos x="160" y="-840"/>
     </visualElement>
     <visualElement>
       <elementName>NOr</elementName>
@@ -246,19 +171,19 @@
           <int>4</int>
         </entry>
       </elementAttributes>
-      <pos x="-440" y="-800"/>
+      <pos x="-80" y="-800"/>
     </visualElement>
     <visualElement>
       <elementName>And</elementName>
       <elementAttributes/>
-      <pos x="-300" y="-920"/>
+      <pos x="60" y="-760"/>
     </visualElement>
     <visualElement>
       <elementName>Out</elementName>
       <elementAttributes>
         <entry>
           <string>Label</string>
-          <string>~a</string>
+          <string>a</string>
         </entry>
         <entry>
           <string>pinNumber</string>
@@ -269,7 +194,17 @@
           <int>1</int>
         </entry>
       </elementAttributes>
-      <pos x="740" y="-960"/>
+      <pos x="720" y="-960"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Or</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Inputs</string>
+          <int>5</int>
+        </entry>
+      </elementAttributes>
+      <pos x="640" y="-1000"/>
     </visualElement>
     <visualElement>
       <elementName>And</elementName>
@@ -316,7 +251,7 @@
       <elementAttributes>
         <entry>
           <string>Label</string>
-          <string>~b</string>
+          <string>b</string>
         </entry>
         <entry>
           <string>pinNumber</string>
@@ -327,7 +262,17 @@
           <int>1</int>
         </entry>
       </elementAttributes>
-      <pos x="740" y="-640"/>
+      <pos x="720" y="-640"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Or</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Inputs</string>
+          <int>5</int>
+        </entry>
+      </elementAttributes>
+      <pos x="640" y="-680"/>
     </visualElement>
     <visualElement>
       <elementName>And</elementName>
@@ -359,7 +304,7 @@
       <elementAttributes>
         <entry>
           <string>Label</string>
-          <string>~c</string>
+          <string>c</string>
         </entry>
         <entry>
           <string>pinNumber</string>
@@ -370,7 +315,17 @@
           <int>1</int>
         </entry>
       </elementAttributes>
-      <pos x="740" y="-340"/>
+      <pos x="720" y="-340"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Or</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Inputs</string>
+          <int>4</int>
+        </entry>
+      </elementAttributes>
+      <pos x="640" y="-380"/>
     </visualElement>
     <visualElement>
       <elementName>And</elementName>
@@ -392,7 +347,7 @@
       <elementAttributes>
         <entry>
           <string>Label</string>
-          <string>~d</string>
+          <string>d</string>
         </entry>
         <entry>
           <string>pinNumber</string>
@@ -403,7 +358,17 @@
           <int>1</int>
         </entry>
       </elementAttributes>
-      <pos x="740" y="-80"/>
+      <pos x="720" y="-80"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Or</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Inputs</string>
+          <int>5</int>
+        </entry>
+      </elementAttributes>
+      <pos x="640" y="-120"/>
     </visualElement>
     <visualElement>
       <elementName>And</elementName>
@@ -435,7 +400,7 @@
       <elementAttributes>
         <entry>
           <string>Label</string>
-          <string>~e</string>
+          <string>e</string>
         </entry>
         <entry>
           <string>pinNumber</string>
@@ -446,7 +411,17 @@
           <int>1</int>
         </entry>
       </elementAttributes>
-      <pos x="740" y="160"/>
+      <pos x="720" y="160"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Or</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Inputs</string>
+          <int>3</int>
+        </entry>
+      </elementAttributes>
+      <pos x="640" y="140"/>
     </visualElement>
     <visualElement>
       <elementName>And</elementName>
@@ -463,7 +438,7 @@
       <elementAttributes>
         <entry>
           <string>Label</string>
-          <string>~f</string>
+          <string>f</string>
         </entry>
         <entry>
           <string>pinNumber</string>
@@ -474,7 +449,17 @@
           <int>1</int>
         </entry>
       </elementAttributes>
-      <pos x="740" y="400"/>
+      <pos x="720" y="400"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Or</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Inputs</string>
+          <int>5</int>
+        </entry>
+      </elementAttributes>
+      <pos x="640" y="360"/>
     </visualElement>
     <visualElement>
       <elementName>And</elementName>
@@ -501,7 +486,7 @@
       <elementAttributes>
         <entry>
           <string>Label</string>
-          <string>~g</string>
+          <string>g</string>
         </entry>
         <entry>
           <string>pinNumber</string>
@@ -512,7 +497,17 @@
           <int>1</int>
         </entry>
       </elementAttributes>
-      <pos x="740" y="720"/>
+      <pos x="720" y="720"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Or</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Inputs</string>
+          <int>5</int>
+        </entry>
+      </elementAttributes>
+      <pos x="640" y="680"/>
     </visualElement>
     <visualElement>
       <elementName>And</elementName>
@@ -581,10 +576,6 @@
           <string>Description</string>
           <string>lamp test</string>
         </entry>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="3"/>
-        </entry>
         <entry>
           <string>Label</string>
           <string>~LT</string>
@@ -594,92 +585,17 @@
           <string>3</string>
         </entry>
       </elementAttributes>
-      <pos x="620" y="-1140"/>
+      <pos x="-180" y="-1200"/>
     </visualElement>
     <visualElement>
       <elementName>Not</elementName>
-      <elementAttributes>
-        <entry>
-          <string>rotation</string>
-          <rotation rotation="3"/>
-        </entry>
-      </elementAttributes>
-      <pos x="620" y="-1120"/>
-    </visualElement>
-    <visualElement>
-      <elementName>NOr</elementName>
-      <elementAttributes>
-        <entry>
-          <string>Inputs</string>
-          <int>5</int>
-        </entry>
-      </elementAttributes>
-      <pos x="640" y="-1000"/>
-    </visualElement>
-    <visualElement>
-      <elementName>NOr</elementName>
-      <elementAttributes>
-        <entry>
-          <string>Inputs</string>
-          <int>5</int>
-        </entry>
-      </elementAttributes>
-      <pos x="640" y="-680"/>
-    </visualElement>
-    <visualElement>
-      <elementName>NOr</elementName>
-      <elementAttributes>
-        <entry>
-          <string>Inputs</string>
-          <int>5</int>
-        </entry>
-      </elementAttributes>
-      <pos x="640" y="-120"/>
-    </visualElement>
-    <visualElement>
-      <elementName>NOr</elementName>
-      <elementAttributes>
-        <entry>
-          <string>Inputs</string>
-          <int>5</int>
-        </entry>
-      </elementAttributes>
-      <pos x="640" y="360"/>
-    </visualElement>
-    <visualElement>
-      <elementName>NOr</elementName>
-      <elementAttributes>
-        <entry>
-          <string>Inputs</string>
-          <int>5</int>
-        </entry>
-      </elementAttributes>
-      <pos x="640" y="680"/>
-    </visualElement>
-    <visualElement>
-      <elementName>NOr</elementName>
-      <elementAttributes>
-        <entry>
-          <string>Inputs</string>
-          <int>4</int>
-        </entry>
-      </elementAttributes>
-      <pos x="640" y="-380"/>
-    </visualElement>
-    <visualElement>
-      <elementName>NOr</elementName>
-      <elementAttributes>
-        <entry>
-          <string>Inputs</string>
-          <int>3</int>
-        </entry>
-      </elementAttributes>
-      <pos x="640" y="140"/>
+      <elementAttributes/>
+      <pos x="60" y="-1200"/>
     </visualElement>
     <visualElement>
       <elementName>PowerSupply</elementName>
       <elementAttributes/>
-      <pos x="-500" y="-500"/>
+      <pos x="-140" y="-520"/>
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
@@ -697,7 +613,7 @@
           <value v="1" z="false"/>
         </entry>
       </elementAttributes>
-      <pos x="-540" y="-500"/>
+      <pos x="-180" y="-520"/>
     </visualElement>
     <visualElement>
       <elementName>In</elementName>
@@ -711,17 +627,51 @@
           <string>8</string>
         </entry>
       </elementAttributes>
-      <pos x="-540" y="-460"/>
+      <pos x="-180" y="-480"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Testcase</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Testdata</string>
+          <testData>
+            <dataString>~LT ~RBI D C B A ~RBO  a b c d e f g 
+ 1    1  0 0 0 0   1   1 1 1 1 1 1 0
+
+ 1    x  0 0 0 1   1   0 1 1 0 0 0 0
+ 1    x  0 0 1 0   1   1 1 0 1 1 0 1
+ 1    x  0 0 1 1   1   1 1 1 1 0 0 1
+ 1    x  0 1 0 0   1   0 1 1 0 0 1 1
+ 1    x  0 1 0 1   1   1 0 1 1 0 1 1
+ 1    x  0 1 1 1   1   1 1 1 0 0 0 0
+ 1    x  1 0 0 0   1   1 1 1 1 1 1 1
+ 1    x  1 0 0 1   1   1 1 1 0 0 1 1
+ 1    x  1 0 1 0   1   0 0 0 1 1 0 1
+ 1    x  1 0 1 1   1   0 0 1 1 0 0 1
+ 1    x  1 1 0 0   1   0 1 0 0 0 1 1
+ 1    x  1 1 0 1   1   1 0 0 1 0 1 1
+ 1    x  1 1 1 0   1   0 0 0 1 1 1 1
+ 1    x  1 1 1 1   1   0 0 0 0 0 0 0
+
+#x    x  x x x x   0   0 0 0 0 0 0 0
+ 1    0  0 0 0 0   0   0 0 0 0 0 0 0
+ 0    x  x x x x   1   1 1 1 1 1 1 1
+
+</dataString>
+          </testData>
+        </entry>
+      </elementAttributes>
+      <pos x="120" y="-520"/>
     </visualElement>
   </visualElements>
   <wires>
     <wire>
-      <p1 x="400" y="-900"/>
-      <p2 x="500" y="-900"/>
+      <p1 x="220" y="-900"/>
+      <p2 x="400" y="-900"/>
     </wire>
     <wire>
-      <p1 x="-240" y="-900"/>
-      <p2 x="-220" y="-900"/>
+      <p1 x="400" y="-900"/>
+      <p2 x="500" y="-900"/>
     </wire>
     <wire>
       <p1 x="440" y="-260"/>
@@ -736,20 +686,20 @@
       <p2 x="600" y="-520"/>
     </wire>
     <wire>
-      <p1 x="-220" y="-1160"/>
-      <p2 x="-200" y="-1160"/>
+      <p1 x="-180" y="-520"/>
+      <p2 x="-140" y="-520"/>
     </wire>
     <wire>
       <p1 x="560" y="520"/>
       <p2 x="600" y="520"/>
     </wire>
     <wire>
-      <p1 x="340" y="-780"/>
-      <p2 x="500" y="-780"/>
+      <p1 x="-120" y="-780"/>
+      <p2 x="-80" y="-780"/>
     </wire>
     <wire>
-      <p1 x="-480" y="-780"/>
-      <p2 x="-440" y="-780"/>
+      <p1 x="340" y="-780"/>
+      <p2 x="500" y="-780"/>
     </wire>
     <wire>
       <p1 x="380" y="-140"/>
@@ -768,21 +718,21 @@
       <p2 x="500" y="780"/>
     </wire>
     <wire>
-      <p1 x="-540" y="-1040"/>
-      <p2 x="-480" y="-1040"/>
+      <p1 x="140" y="-1040"/>
+      <p2 x="160" y="-1040"/>
     </wire>
     <wire>
-      <p1 x="-480" y="-1040"/>
-      <p2 x="-200" y="-1040"/>
-    </wire>
-    <wire>
-      <p1 x="720" y="400"/>
-      <p2 x="740" y="400"/>
+      <p1 x="700" y="400"/>
+      <p2 x="720" y="400"/>
     </wire>
     <wire>
       <p1 x="620" y="400"/>
       <p2 x="640" y="400"/>
     </wire>
+    <wire>
+      <p1 x="140" y="-660"/>
+      <p2 x="160" y="-660"/>
+    </wire>
     <wire>
       <p1 x="440" y="-660"/>
       <p2 x="500" y="-660"/>
@@ -792,8 +742,8 @@
       <p2 x="640" y="-660"/>
     </wire>
     <wire>
-      <p1 x="-180" y="-660"/>
-      <p2 x="-160" y="-660"/>
+      <p1 x="20" y="-660"/>
+      <p2 x="60" y="-660"/>
     </wire>
     <wire>
       <p1 x="440" y="-20"/>
@@ -807,6 +757,10 @@
       <p1 x="380" y="660"/>
       <p2 x="500" y="660"/>
     </wire>
+    <wire>
+      <p1 x="-180" y="-920"/>
+      <p2 x="-120" y="-920"/>
+    </wire>
     <wire>
       <p1 x="380" y="-920"/>
       <p2 x="500" y="-920"/>
@@ -820,12 +774,8 @@
       <p2 x="640" y="-920"/>
     </wire>
     <wire>
-      <p1 x="-340" y="-920"/>
-      <p2 x="-300" y="-920"/>
-    </wire>
-    <wire>
-      <p1 x="-220" y="-920"/>
-      <p2 x="-200" y="-920"/>
+      <p1 x="-120" y="-920"/>
+      <p2 x="160" y="-920"/>
     </wire>
     <wire>
       <p1 x="560" y="-280"/>
@@ -851,10 +801,6 @@
       <p1 x="440" y="-1180"/>
       <p2 x="460" y="-1180"/>
     </wire>
-    <wire>
-      <p1 x="-140" y="-1180"/>
-      <p2 x="-120" y="-1180"/>
-    </wire>
     <wire>
       <p1 x="420" y="-540"/>
       <p2 x="500" y="-540"/>
@@ -864,17 +810,25 @@
       <p2 x="500" y="540"/>
     </wire>
     <wire>
-      <p1 x="-460" y="-800"/>
-      <p2 x="-440" y="-800"/>
+      <p1 x="140" y="-800"/>
+      <p2 x="160" y="-800"/>
     </wire>
     <wire>
-      <p1 x="720" y="160"/>
-      <p2 x="740" y="160"/>
+      <p1 x="-100" y="-800"/>
+      <p2 x="-80" y="-800"/>
+    </wire>
+    <wire>
+      <p1 x="700" y="160"/>
+      <p2 x="720" y="160"/>
     </wire>
     <wire>
       <p1 x="620" y="160"/>
       <p2 x="640" y="160"/>
     </wire>
+    <wire>
+      <p1 x="220" y="-1060"/>
+      <p2 x="320" y="-1060"/>
+    </wire>
     <wire>
       <p1 x="440" y="-1060"/>
       <p2 x="500" y="-1060"/>
@@ -891,6 +845,10 @@
       <p1 x="580" y="420"/>
       <p2 x="640" y="420"/>
     </wire>
+    <wire>
+      <p1 x="40" y="-680"/>
+      <p2 x="60" y="-680"/>
+    </wire>
     <wire>
       <p1 x="600" y="-680"/>
       <p2 x="640" y="-680"/>
@@ -903,10 +861,6 @@
       <p1 x="560" y="-680"/>
       <p2 x="580" y="-680"/>
     </wire>
-    <wire>
-      <p1 x="-340" y="-680"/>
-      <p2 x="-260" y="-680"/>
-    </wire>
     <wire>
       <p1 x="420" y="-40"/>
       <p2 x="500" y="-40"/>
@@ -939,10 +893,6 @@
       <p1 x="580" y="-940"/>
       <p2 x="640" y="-940"/>
     </wire>
-    <wire>
-      <p1 x="-140" y="-940"/>
-      <p2 x="-120" y="-940"/>
-    </wire>
     <wire>
       <p1 x="380" y="-300"/>
       <p2 x="500" y="-300"/>
@@ -956,12 +906,20 @@
       <p2 x="500" y="300"/>
     </wire>
     <wire>
-      <p1 x="-540" y="-1200"/>
-      <p2 x="-520" y="-1200"/>
+      <p1 x="-180" y="-1200"/>
+      <p2 x="20" y="-1200"/>
     </wire>
     <wire>
-      <p1 x="-520" y="-1200"/>
-      <p2 x="-200" y="-1200"/>
+      <p1 x="100" y="-1200"/>
+      <p2 x="620" y="-1200"/>
+    </wire>
+    <wire>
+      <p1 x="20" y="-1200"/>
+      <p2 x="60" y="-1200"/>
+    </wire>
+    <wire>
+      <p1 x="220" y="-820"/>
+      <p2 x="440" y="-820"/>
     </wire>
     <wire>
       <p1 x="460" y="-820"/>
@@ -983,6 +941,10 @@
       <p1 x="400" y="820"/>
       <p2 x="500" y="820"/>
     </wire>
+    <wire>
+      <p1 x="-180" y="-1080"/>
+      <p2 x="-160" y="-1080"/>
+    </wire>
     <wire>
       <p1 x="420" y="-1080"/>
       <p2 x="500" y="-1080"/>
@@ -992,8 +954,8 @@
       <p2 x="600" y="-1080"/>
     </wire>
     <wire>
-      <p1 x="-220" y="-1080"/>
-      <p2 x="-200" y="-1080"/>
+      <p1 x="-160" y="-1080"/>
+      <p2 x="160" y="-1080"/>
     </wire>
     <wire>
       <p1 x="560" y="-440"/>
@@ -1032,21 +994,17 @@
       <p2 x="640" y="700"/>
     </wire>
     <wire>
-      <p1 x="720" y="-960"/>
-      <p2 x="740" y="-960"/>
+      <p1 x="140" y="-960"/>
+      <p2 x="160" y="-960"/>
     </wire>
     <wire>
-      <p1 x="-540" y="-960"/>
-      <p2 x="-460" y="-960"/>
+      <p1 x="700" y="-960"/>
+      <p2 x="720" y="-960"/>
     </wire>
     <wire>
       <p1 x="620" y="-960"/>
       <p2 x="640" y="-960"/>
     </wire>
-    <wire>
-      <p1 x="-460" y="-960"/>
-      <p2 x="-200" y="-960"/>
-    </wire>
     <wire>
       <p1 x="620" y="-320"/>
       <p2 x="640" y="-320"/>
@@ -1059,6 +1017,10 @@
       <p1 x="320" y="580"/>
       <p2 x="500" y="580"/>
     </wire>
+    <wire>
+      <p1 x="-180" y="-840"/>
+      <p2 x="-100" y="-840"/>
+    </wire>
     <wire>
       <p1 x="420" y="-840"/>
       <p2 x="500" y="-840"/>
@@ -1067,6 +1029,10 @@
       <p1 x="560" y="-840"/>
       <p2 x="600" y="-840"/>
     </wire>
+    <wire>
+      <p1 x="-100" y="-840"/>
+      <p2 x="160" y="-840"/>
+    </wire>
     <wire>
       <p1 x="560" y="-200"/>
       <p2 x="600" y="-200"/>
@@ -1083,42 +1049,42 @@
       <p1 x="320" y="-1100"/>
       <p2 x="500" y="-1100"/>
     </wire>
-    <wire>
-      <p1 x="-140" y="-1100"/>
-      <p2 x="-120" y="-1100"/>
-    </wire>
     <wire>
       <p1 x="340" y="-460"/>
       <p2 x="500" y="-460"/>
     </wire>
-    <wire>
-      <p1 x="-540" y="-460"/>
-      <p2 x="-520" y="-460"/>
-    </wire>
     <wire>
       <p1 x="460" y="460"/>
       <p2 x="500" y="460"/>
     </wire>
     <wire>
-      <p1 x="720" y="-80"/>
-      <p2 x="740" y="-80"/>
+      <p1 x="-160" y="-720"/>
+      <p2 x="-80" y="-720"/>
+    </wire>
+    <wire>
+      <p1 x="0" y="-720"/>
+      <p2 x="60" y="-720"/>
+    </wire>
+    <wire>
+      <p1 x="700" y="-80"/>
+      <p2 x="720" y="-80"/>
     </wire>
     <wire>
       <p1 x="620" y="-80"/>
       <p2 x="640" y="-80"/>
     </wire>
     <wire>
-      <p1 x="-520" y="-720"/>
-      <p2 x="-440" y="-720"/>
-    </wire>
-    <wire>
-      <p1 x="720" y="720"/>
-      <p2 x="740" y="720"/>
+      <p1 x="700" y="720"/>
+      <p2 x="720" y="720"/>
     </wire>
     <wire>
       <p1 x="620" y="720"/>
       <p2 x="640" y="720"/>
     </wire>
+    <wire>
+      <p1 x="220" y="-980"/>
+      <p2 x="360" y="-980"/>
+    </wire>
     <wire>
       <p1 x="440" y="-980"/>
       <p2 x="500" y="-980"/>
@@ -1132,8 +1098,8 @@
       <p2 x="500" y="-340"/>
     </wire>
     <wire>
-      <p1 x="720" y="-340"/>
-      <p2 x="740" y="-340"/>
+      <p1 x="700" y="-340"/>
+      <p2 x="720" y="-340"/>
     </wire>
     <wire>
       <p1 x="360" y="340"/>
@@ -1168,20 +1134,16 @@
       <p2 x="500" y="860"/>
     </wire>
     <wire>
-      <p1 x="-540" y="-1120"/>
-      <p2 x="-500" y="-1120"/>
+      <p1 x="-180" y="-480"/>
+      <p2 x="-160" y="-480"/>
     </wire>
     <wire>
-      <p1 x="-500" y="-1120"/>
-      <p2 x="-200" y="-1120"/>
+      <p1 x="120" y="-740"/>
+      <p2 x="140" y="-740"/>
     </wire>
     <wire>
-      <p1 x="-520" y="-480"/>
-      <p2 x="-500" y="-480"/>
-    </wire>
-    <wire>
-      <p1 x="-500" y="-740"/>
-      <p2 x="-440" y="-740"/>
+      <p1 x="-140" y="-740"/>
+      <p2 x="-80" y="-740"/>
     </wire>
     <wire>
       <p1 x="380" y="-740"/>
@@ -1208,8 +1170,8 @@
       <p2 x="640" y="740"/>
     </wire>
     <wire>
-      <p1 x="-220" y="-1000"/>
-      <p2 x="-200" y="-1000"/>
+      <p1 x="-180" y="-1000"/>
+      <p2 x="-140" y="-1000"/>
     </wire>
     <wire>
       <p1 x="600" y="-1000"/>
@@ -1223,6 +1185,10 @@
       <p1 x="560" y="-1000"/>
       <p2 x="580" y="-1000"/>
     </wire>
+    <wire>
+      <p1 x="-140" y="-1000"/>
+      <p2 x="160" y="-1000"/>
+    </wire>
     <wire>
       <p1 x="560" y="-360"/>
       <p2 x="640" y="-360"/>
@@ -1248,29 +1214,33 @@
       <p2 x="500" y="620"/>
     </wire>
     <wire>
-      <p1 x="-320" y="-880"/>
-      <p2 x="-300" y="-880"/>
+      <p1 x="140" y="-880"/>
+      <p2 x="160" y="-880"/>
     </wire>
     <wire>
       <p1 x="460" y="-500"/>
       <p2 x="500" y="-500"/>
     </wire>
     <wire>
-      <p1 x="-540" y="-500"/>
-      <p2 x="-500" y="-500"/>
+      <p1 x="-160" y="-500"/>
+      <p2 x="-140" y="-500"/>
     </wire>
     <wire>
       <p1 x="420" y="500"/>
       <p2 x="500" y="500"/>
     </wire>
     <wire>
-      <p1 x="-360" y="-760"/>
-      <p2 x="-340" y="-760"/>
+      <p1 x="0" y="-760"/>
+      <p2 x="40" y="-760"/>
     </wire>
     <wire>
       <p1 x="560" y="-760"/>
       <p2 x="600" y="-760"/>
     </wire>
+    <wire>
+      <p1 x="40" y="-760"/>
+      <p2 x="60" y="-760"/>
+    </wire>
     <wire>
       <p1 x="600" y="-120"/>
       <p2 x="640" y="-120"/>
@@ -1291,10 +1261,6 @@
       <p1 x="600" y="760"/>
       <p2 x="640" y="760"/>
     </wire>
-    <wire>
-      <p1 x="-140" y="-1020"/>
-      <p2 x="-120" y="-1020"/>
-    </wire>
     <wire>
       <p1 x="340" y="-1020"/>
       <p2 x="500" y="-1020"/>
@@ -1316,28 +1282,24 @@
       <p2 x="640" y="380"/>
     </wire>
     <wire>
-      <p1 x="-380" y="-640"/>
-      <p2 x="-320" y="-640"/>
+      <p1 x="-40" y="-640"/>
+      <p2 x="0" y="-640"/>
     </wire>
     <wire>
-      <p1 x="-540" y="-640"/>
-      <p2 x="-420" y="-640"/>
+      <p1 x="-180" y="-640"/>
+      <p2 x="-80" y="-640"/>
     </wire>
     <wire>
-      <p1 x="720" y="-640"/>
-      <p2 x="740" y="-640"/>
+      <p1 x="700" y="-640"/>
+      <p2 x="720" y="-640"/>
     </wire>
     <wire>
       <p1 x="620" y="-640"/>
       <p2 x="640" y="-640"/>
     </wire>
     <wire>
-      <p1 x="-320" y="-640"/>
-      <p2 x="-260" y="-640"/>
-    </wire>
-    <wire>
-      <p1 x="320" y="-1200"/>
-      <p2 x="320" y="-1180"/>
+      <p1 x="0" y="-640"/>
+      <p2 x="60" y="-640"/>
     </wire>
     <wire>
       <p1 x="320" y="-1180"/>
@@ -1345,6 +1307,10 @@
     </wire>
     <wire>
       <p1 x="320" y="-1100"/>
+      <p2 x="320" y="-1060"/>
+    </wire>
+    <wire>
+      <p1 x="320" y="-1060"/>
       <p2 x="320" y="260"/>
     </wire>
     <wire>
@@ -1355,6 +1321,14 @@
       <p1 x="320" y="260"/>
       <p2 x="320" y="580"/>
     </wire>
+    <wire>
+      <p1 x="0" y="-720"/>
+      <p2 x="0" y="-640"/>
+    </wire>
+    <wire>
+      <p1 x="-100" y="-840"/>
+      <p2 x="-100" y="-800"/>
+    </wire>
     <wire>
       <p1 x="580" y="-1000"/>
       <p2 x="580" y="-980"/>
@@ -1464,16 +1438,8 @@
       <p2 x="420" y="880"/>
     </wire>
     <wire>
-      <p1 x="-520" y="-1200"/>
-      <p2 x="-520" y="-720"/>
-    </wire>
-    <wire>
-      <p1 x="-520" y="-480"/>
-      <p2 x="-520" y="-460"/>
-    </wire>
-    <wire>
-      <p1 x="360" y="-1200"/>
-      <p2 x="360" y="-1180"/>
+      <p1 x="360" y="-1180"/>
+      <p2 x="360" y="-1000"/>
     </wire>
     <wire>
       <p1 x="360" y="740"/>
@@ -1483,10 +1449,6 @@
       <p1 x="360" y="340"/>
       <p2 x="360" y="420"/>
     </wire>
-    <wire>
-      <p1 x="360" y="-1180"/>
-      <p2 x="360" y="-1000"/>
-    </wire>
     <wire>
       <p1 x="360" y="420"/>
       <p2 x="360" y="740"/>
@@ -1497,6 +1459,10 @@
     </wire>
     <wire>
       <p1 x="360" y="-1000"/>
+      <p2 x="360" y="-980"/>
+    </wire>
+    <wire>
+      <p1 x="360" y="-980"/>
       <p2 x="360" y="-420"/>
     </wire>
     <wire>
@@ -1504,15 +1470,15 @@
       <p2 x="360" y="-60"/>
     </wire>
     <wire>
-      <p1 x="-460" y="-960"/>
-      <p2 x="-460" y="-800"/>
+      <p1 x="40" y="-760"/>
+      <p2 x="40" y="-680"/>
     </wire>
     <wire>
-      <p1 x="620" y="-1140"/>
-      <p2 x="620" y="-1120"/>
+      <p1 x="-140" y="-1000"/>
+      <p2 x="-140" y="-740"/>
     </wire>
     <wire>
-      <p1 x="620" y="-1080"/>
+      <p1 x="620" y="-1200"/>
       <p2 x="620" y="-960"/>
     </wire>
     <wire>
@@ -1584,8 +1550,24 @@
       <p2 x="460" y="140"/>
     </wire>
     <wire>
-      <p1 x="400" y="-1200"/>
-      <p2 x="400" y="-1180"/>
+      <p1 x="140" y="-1040"/>
+      <p2 x="140" y="-960"/>
+    </wire>
+    <wire>
+      <p1 x="140" y="-960"/>
+      <p2 x="140" y="-880"/>
+    </wire>
+    <wire>
+      <p1 x="140" y="-880"/>
+      <p2 x="140" y="-800"/>
+    </wire>
+    <wire>
+      <p1 x="140" y="-800"/>
+      <p2 x="140" y="-740"/>
+    </wire>
+    <wire>
+      <p1 x="400" y="-1180"/>
+      <p2 x="400" y="-900"/>
     </wire>
     <wire>
       <p1 x="400" y="-100"/>
@@ -1615,22 +1597,6 @@
       <p1 x="400" y="-680"/>
       <p2 x="400" y="-100"/>
     </wire>
-    <wire>
-      <p1 x="400" y="-1180"/>
-      <p2 x="400" y="-900"/>
-    </wire>
-    <wire>
-      <p1 x="-500" y="-1120"/>
-      <p2 x="-500" y="-740"/>
-    </wire>
-    <wire>
-      <p1 x="-340" y="-920"/>
-      <p2 x="-340" y="-760"/>
-    </wire>
-    <wire>
-      <p1 x="-340" y="-760"/>
-      <p2 x="-340" y="-680"/>
-    </wire>
     <wire>
       <p1 x="340" y="-1180"/>
       <p2 x="340" y="-1160"/>
@@ -1660,17 +1626,25 @@
       <p2 x="340" y="-780"/>
     </wire>
     <wire>
-      <p1 x="440" y="-1200"/>
-      <p2 x="440" y="-1180"/>
+      <p1 x="20" y="-1200"/>
+      <p2 x="20" y="-660"/>
     </wire>
     <wire>
-      <p1 x="440" y="-260"/>
-      <p2 x="440" y="-20"/>
+      <p1 x="-120" y="-920"/>
+      <p2 x="-120" y="-780"/>
     </wire>
     <wire>
       <p1 x="440" y="-1180"/>
       <p2 x="440" y="-1060"/>
     </wire>
+    <wire>
+      <p1 x="440" y="-820"/>
+      <p2 x="440" y="-660"/>
+    </wire>
+    <wire>
+      <p1 x="440" y="-260"/>
+      <p2 x="440" y="-20"/>
+    </wire>
     <wire>
       <p1 x="440" y="-660"/>
       <p2 x="440" y="-260"/>
@@ -1685,7 +1659,7 @@
     </wire>
     <wire>
       <p1 x="440" y="-980"/>
-      <p2 x="440" y="-660"/>
+      <p2 x="440" y="-820"/>
     </wire>
     <wire>
       <p1 x="600" y="-1080"/>
@@ -1727,22 +1701,6 @@
       <p1 x="600" y="760"/>
       <p2 x="600" y="840"/>
     </wire>
-    <wire>
-      <p1 x="-220" y="-1160"/>
-      <p2 x="-220" y="-1080"/>
-    </wire>
-    <wire>
-      <p1 x="-220" y="-920"/>
-      <p2 x="-220" y="-900"/>
-    </wire>
-    <wire>
-      <p1 x="-220" y="-1000"/>
-      <p2 x="-220" y="-920"/>
-    </wire>
-    <wire>
-      <p1 x="-220" y="-1080"/>
-      <p2 x="-220" y="-1000"/>
-    </wire>
     <wire>
       <p1 x="380" y="-1180"/>
       <p2 x="380" y="-1160"/>
@@ -1792,12 +1750,13 @@
       <p2 x="380" y="-380"/>
     </wire>
     <wire>
-      <p1 x="-480" y="-1040"/>
-      <p2 x="-480" y="-780"/>
+      <p1 x="-160" y="-1080"/>
+      <p2 x="-160" y="-720"/>
     </wire>
     <wire>
-      <p1 x="-320" y="-880"/>
-      <p2 x="-320" y="-640"/>
+      <p1 x="-160" y="-500"/>
+      <p2 x="-160" y="-480"/>
     </wire>
   </wires>
+  <measurementOrdering/>
 </circuit>
\ No newline at end of file
diff --git a/src/test/java/de/neemann/digital/integration/TestExamples.java b/src/test/java/de/neemann/digital/integration/TestExamples.java
index 61aa376a0..8c0207ed6 100644
--- a/src/test/java/de/neemann/digital/integration/TestExamples.java
+++ b/src/test/java/de/neemann/digital/integration/TestExamples.java
@@ -33,7 +33,7 @@ public class TestExamples extends TestCase {
     public void testDistExamples() throws Exception {
         File examples = new File(Resources.getRoot().getParentFile().getParentFile(), "/main/dig");
         assertEquals(269, new FileScanner(this::check).scan(examples));
-        assertEquals(184, testCasesInFiles);
+        assertEquals(186, testCasesInFiles);
     }
 
     /**