Am2901 finally snaps correctly

[Mograsim.git] / net.mograsim.logic.model.am2900 / components / net / mograsim / logic / model / am2900 / components / am2901 / Am2901.json

diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json
index 8932e97..9ef2749 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json
+++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json
@@ -1,10 +1,10 @@
 {
-  "width": 87.0,
-  "height": 113.5,
+  "width": 90.0,
+  "height": 125.0,
   "interfacePins": [
     {
       "location": {
-        "x": 87.0,
+        "x": 90.0,
         "y": 10.0
       },
       "name": "A0",
@@ -13,7 +13,7 @@
     },
     {
       "location": {
-        "x": 87.0,
+        "x": 90.0,
         "y": 15.0
       },
       "name": "A1",
@@ -22,7 +22,7 @@
     },
     {
       "location": {
-        "x": 87.0,
+        "x": 90.0,
         "y": 20.0
       },
       "name": "A2",
@@ -31,7 +31,7 @@
     },
     {
       "location": {
-        "x": 87.0,
+        "x": 90.0,
         "y": 25.0
       },
       "name": "A3",
@@ -40,7 +40,7 @@
     },
     {
       "location": {
-        "x": 87.0,
+        "x": 90.0,
         "y": 35.0
       },
       "name": "B0",
@@ -49,7 +49,7 @@
     },
     {
       "location": {
-        "x": 87.0,
+        "x": 90.0,
         "y": 40.0
       },
       "name": "B1",
@@ -58,7 +58,7 @@
     },
     {
       "location": {
-        "x": 87.0,
+        "x": 90.0,
         "y": 45.0
       },
       "name": "B2",
@@ -67,7 +67,7 @@
     },
     {
       "location": {
-        "x": 87.0,
+        "x": 90.0,
         "y": 50.0
       },
       "name": "B3",
@@ -94,8 +94,8 @@
     },
     {
       "location": {
-        "x": 0.0,
-        "y": 45.0
+        "x": 90.0,
+        "y": 120.0
       },
       "name": "Cn+4",
       "logicWidth": 1,
@@ -149,7 +149,7 @@
     {
       "location": {
         "x": 0.0,
-        "y": 40.0
+        "y": 45.0
       },
       "name": "F\u003d0",
       "logicWidth": 1,
@@ -157,7 +157,7 @@
     },
     {
       "location": {
-        "x": 87.0,
+        "x": 90.0,
         "y": 100.0
       },
       "name": "I0",
@@ -166,7 +166,7 @@
     },
     {
       "location": {
-        "x": 87.0,
+        "x": 90.0,
         "y": 95.0
       },
       "name": "I1",
@@ -175,7 +175,7 @@
     },
     {
       "location": {
-        "x": 87.0,
+        "x": 90.0,
         "y": 90.0
       },
       "name": "I2",
@@ -184,7 +184,7 @@
     },
     {
       "location": {
-        "x": 87.0,
+        "x": 90.0,
         "y": 85.0
       },
       "name": "I3",
@@ -193,7 +193,7 @@
     },
     {
       "location": {
-        "x": 87.0,
+        "x": 90.0,
         "y": 80.0
       },
       "name": "I4",
@@ -202,7 +202,7 @@
     },
     {
       "location": {
-        "x": 87.0,
+        "x": 90.0,
         "y": 75.0
       },
       "name": "I5",
@@ -211,7 +211,7 @@
     },
     {
       "location": {
-        "x": 87.0,
+        "x": 90.0,
         "y": 70.0
       },
       "name": "I6",
@@ -220,7 +220,7 @@
     },
     {
       "location": {
-        "x": 87.0,
+        "x": 90.0,
         "y": 65.0
       },
       "name": "I7",
@@ -229,7 +229,7 @@
     },
     {
       "location": {
-        "x": 87.0,
+        "x": 90.0,
         "y": 60.0
       },
       "name": "I8",
@@ -248,7 +248,7 @@
     {
       "location": {
         "x": 0.0,
-        "y": 25.0
+        "y": 20.0
       },
       "name": "Qn",
       "logicWidth": 1,
@@ -256,8 +256,8 @@
     },
     {
       "location": {
-        "x": 0.0,
-        "y": 30.0
+        "x": 90.0,
+        "y": 115.0
       },
       "name": "Qn+3",
       "logicWidth": 1,
@@ -274,8 +274,8 @@
     },
     {
       "location": {
-        "x": 0.0,
-        "y": 15.0
+        "x": 90.0,
+        "y": 110.0
       },
       "name": "RAMn+3",
       "logicWidth": 1,
@@ -283,8 +283,8 @@
     },
     {
       "location": {
-        "x": 64.5,
-        "y": 113.5
+        "x": 65.0,
+        "y": 125.0
       },
       "name": "Y1",
       "logicWidth": 1,
@@ -292,8 +292,8 @@
     },
     {
       "location": {
-        "x": 69.5,
-        "y": 113.5
+        "x": 70.0,
+        "y": 125.0
       },
       "name": "Y2",
       "logicWidth": 1,
@@ -301,8 +301,8 @@
     },
     {
       "location": {
-        "x": 74.5,
-        "y": 113.5
+        "x": 75.0,
+        "y": 125.0
       },
       "name": "Y3",
       "logicWidth": 1,
@@ -310,8 +310,8 @@
     },
     {
       "location": {
-        "x": 79.5,
-        "y": 113.5
+        "x": 80.0,
+        "y": 125.0
       },
       "name": "Y4",
       "logicWidth": 1,
@@ -341,7 +341,7 @@
         "id": "NandGate",
         "name": "NandGate#0",
         "pos": {
-          "x": 466.0,
+          "x": 465.0,
           "y": 190.0
         },
         "params": 1
@@ -350,7 +350,7 @@
         "id": "NandGate",
         "name": "NandGate#1",
         "pos": {
-          "x": 421.0,
+          "x": 420.0,
           "y": 440.0
         },
         "params": 1
@@ -359,8 +359,8 @@
         "id": "TriStateBuffer",
         "name": "TriStateBuffer#0",
         "pos": {
-          "x": 356.0,
-          "y": 901.0
+          "x": 355.0,
+          "y": 900.0
         },
         "params": {
           "logicWidth": 1,
@@ -395,8 +395,8 @@
         "id": "TriStateBuffer",
         "name": "TriStateBuffer#3",
         "pos": {
-          "x": 401.0,
-          "y": 726.0
+          "x": 400.0,
+          "y": 725.0
         },
         "params": {
           "logicWidth": 1,
@@ -407,8 +407,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#0",
         "pos": {
-          "x": 15.0,
-          "y": 715.0
+          "x": 14.0,
+          "y": 714.0
         },
         "params": 1
       },
@@ -416,8 +416,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#1",
         "pos": {
-          "x": 460.0,
-          "y": 195.0
+          "x": 459.0,
+          "y": 194.0
         },
         "params": 1
       },
@@ -425,8 +425,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#10",
         "pos": {
-          "x": 335.0,
-          "y": 395.0
+          "x": 229.0,
+          "y": 909.0
         },
         "params": 1
       },
@@ -434,8 +434,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#11",
         "pos": {
-          "x": 230.0,
-          "y": 910.0
+          "x": 234.0,
+          "y": 919.0
         },
         "params": 1
       },
@@ -443,8 +443,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#12",
         "pos": {
-          "x": 235.0,
-          "y": 920.0
+          "x": 239.0,
+          "y": 929.0
         },
         "params": 1
       },
@@ -452,8 +452,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#13",
         "pos": {
-          "x": 240.0,
-          "y": 930.0
+          "x": 244.0,
+          "y": 939.0
         },
         "params": 1
       },
@@ -461,8 +461,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#14",
         "pos": {
-          "x": 245.0,
-          "y": 940.0
+          "x": 319.0,
+          "y": 909.0
         },
         "params": 1
       },
@@ -470,8 +470,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#15",
         "pos": {
-          "x": 320.0,
-          "y": 910.0
+          "x": 334.0,
+          "y": 939.0
         },
         "params": 1
       },
@@ -479,8 +479,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#16",
         "pos": {
-          "x": 335.0,
-          "y": 940.0
+          "x": 134.0,
+          "y": 1039.0
         },
         "params": 1
       },
@@ -488,8 +488,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#17",
         "pos": {
-          "x": 135.0,
-          "y": 1040.0
+          "x": 139.0,
+          "y": 1049.0
         },
         "params": 1
       },
@@ -497,8 +497,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#18",
         "pos": {
-          "x": 140.0,
-          "y": 1050.0
+          "x": 379.0,
+          "y": 529.0
         },
         "params": 1
       },
@@ -506,8 +506,17 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#19",
         "pos": {
-          "x": 380.0,
-          "y": 530.0
+          "x": 394.0,
+          "y": 544.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#2",
+        "pos": {
+          "x": 254.0,
+          "y": 749.0
         },
         "params": 1
       },
@@ -515,8 +524,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#20",
         "pos": {
-          "x": 395.0,
-          "y": 545.0
+          "x": 434.0,
+          "y": 734.0
         },
         "params": 1
       },
@@ -524,8 +533,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#21",
         "pos": {
-          "x": 435.0,
-          "y": 735.0
+          "x": 354.0,
+          "y": 504.0
         },
         "params": 1
       },
@@ -533,8 +542,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#22",
         "pos": {
-          "x": 355.0,
-          "y": 505.0
+          "x": 359.0,
+          "y": 509.0
         },
         "params": 1
       },
@@ -542,8 +551,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#23",
         "pos": {
-          "x": 360.0,
-          "y": 510.0
+          "x": 364.0,
+          "y": 514.0
         },
         "params": 1
       },
@@ -551,8 +560,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#24",
         "pos": {
-          "x": 365.0,
-          "y": 515.0
+          "x": 369.0,
+          "y": 519.0
         },
         "params": 1
       },
@@ -560,8 +569,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#25",
         "pos": {
-          "x": 370.0,
-          "y": 520.0
+          "x": 354.0,
+          "y": 449.0
         },
         "params": 1
       },
@@ -569,8 +578,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#26",
         "pos": {
-          "x": 355.0,
-          "y": 449.0
+          "x": 359.0,
+          "y": 459.0
         },
         "params": 1
       },
@@ -578,8 +587,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#27",
         "pos": {
-          "x": 360.0,
-          "y": 459.0
+          "x": 364.0,
+          "y": 469.0
         },
         "params": 1
       },
@@ -587,8 +596,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#28",
         "pos": {
-          "x": 365.0,
-          "y": 469.0
+          "x": 369.0,
+          "y": 479.0
         },
         "params": 1
       },
@@ -596,8 +605,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#29",
         "pos": {
-          "x": 370.0,
-          "y": 479.0
+          "x": 104.0,
+          "y": 769.0
         },
         "params": 1
       },
@@ -605,8 +614,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#3",
         "pos": {
-          "x": 255.0,
-          "y": 750.0
+          "x": 134.0,
+          "y": 729.0
         },
         "params": 1
       },
@@ -614,8 +623,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#30",
         "pos": {
-          "x": 110.0,
-          "y": 770.0
+          "x": 109.0,
+          "y": 779.0
         },
         "params": 1
       },
@@ -623,8 +632,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#31",
         "pos": {
-          "x": 115.0,
-          "y": 780.0
+          "x": 114.0,
+          "y": 789.0
         },
         "params": 1
       },
@@ -632,8 +641,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#32",
         "pos": {
-          "x": 120.0,
-          "y": 790.0
+          "x": 109.0,
+          "y": 809.0
         },
         "params": 1
       },
@@ -641,8 +650,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#33",
         "pos": {
-          "x": 115.0,
-          "y": 810.0
+          "x": 114.0,
+          "y": 819.0
         },
         "params": 1
       },
@@ -650,8 +659,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#34",
         "pos": {
-          "x": 120.0,
-          "y": 820.0
+          "x": 119.0,
+          "y": 829.0
         },
         "params": 1
       },
@@ -659,8 +668,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#35",
         "pos": {
-          "x": 125.0,
-          "y": 830.0
+          "x": 104.0,
+          "y": 799.0
         },
         "params": 1
       },
@@ -668,8 +677,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#36",
         "pos": {
-          "x": 110.0,
-          "y": 800.0
+          "x": 109.0,
+          "y": 839.0
         },
         "params": 1
       },
@@ -677,8 +686,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#37",
         "pos": {
-          "x": 115.0,
-          "y": 840.0
+          "x": 114.0,
+          "y": 849.0
         },
         "params": 1
       },
@@ -686,8 +695,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#38",
         "pos": {
-          "x": 120.0,
-          "y": 850.0
+          "x": 119.0,
+          "y": 859.0
         },
         "params": 1
       },
@@ -695,8 +704,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#39",
         "pos": {
-          "x": 125.0,
-          "y": 860.0
+          "x": 414.0,
+          "y": 449.0
         },
         "params": 1
       },
@@ -704,8 +713,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#4",
         "pos": {
-          "x": 140.0,
-          "y": 730.0
+          "x": 129.0,
+          "y": 739.0
         },
         "params": 1
       },
@@ -713,8 +722,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#40",
         "pos": {
-          "x": 415.0,
-          "y": 449.0
+          "x": 99.0,
+          "y": 964.0
         },
         "params": 1
       },
@@ -722,8 +731,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#41",
         "pos": {
-          "x": 105.0,
-          "y": 965.0
+          "x": 99.0,
+          "y": 764.0
         },
         "params": 1
       },
@@ -731,53 +740,44 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#42",
         "pos": {
-          "x": 105.0,
-          "y": 765.0
+          "x": 124.0,
+          "y": 889.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#44",
+        "name": "WireCrossPoint#43",
         "pos": {
-          "x": 130.0,
-          "y": 890.0
+          "x": 364.0,
+          "y": 889.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#45",
-        "pos": {
-          "x": 365.0,
-          "y": 890.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#46",
+        "name": "WireCrossPoint#44",
         "pos": {
-          "x": 140.0,
-          "y": 895.0
+          "x": 134.0,
+          "y": 894.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#47",
+        "name": "WireCrossPoint#45",
         "pos": {
-          "x": 410.0,
-          "y": 895.0
+          "x": 409.0,
+          "y": 894.0
         },
         "params": 1
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#48",
+        "name": "WireCrossPoint#46",
         "pos": {
-          "x": 145.0,
-          "y": 1080.0
+          "x": 424.0,
+          "y": 1079.0
         },
         "params": 1
       },
@@ -785,8 +785,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#5",
         "pos": {
-          "x": 135.0,
-          "y": 740.0
+          "x": 124.0,
+          "y": 749.0
         },
         "params": 1
       },
@@ -794,8 +794,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#6",
         "pos": {
-          "x": 130.0,
-          "y": 750.0
+          "x": 349.0,
+          "y": 364.0
         },
         "params": 1
       },
@@ -803,8 +803,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#7",
         "pos": {
-          "x": 350.0,
-          "y": 365.0
+          "x": 344.0,
+          "y": 374.0
         },
         "params": 1
       },
@@ -812,8 +812,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#8",
         "pos": {
-          "x": 345.0,
-          "y": 375.0
+          "x": 339.0,
+          "y": 384.0
         },
         "params": 1
       },
@@ -821,8 +821,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#9",
         "pos": {
-          "x": 340.0,
-          "y": 385.0
+          "x": 334.0,
+          "y": 394.0
         },
         "params": 1
       },
@@ -830,7 +830,7 @@
         "id": "and",
         "name": "and#0",
         "pos": {
-          "x": 496.0,
+          "x": 495.0,
           "y": 180.0
         }
       },
@@ -870,7 +870,7 @@
         "id": "or4",
         "name": "or4#0",
         "pos": {
-          "x": 376.0,
+          "x": 375.0,
           "y": 445.0
         }
       },
@@ -886,7 +886,7 @@
         "id": "sel3_4",
         "name": "sel3_4#0",
         "pos": {
-          "x": 150.0,
+          "x": 145.0,
           "y": 725.0
         }
       },
@@ -985,7 +985,7 @@
           "pinName": "F3"
         },
         "pin2": {
-          "compName": "WireCrossPoint#24",
+          "compName": "WireCrossPoint#23",
           "pinName": ""
         },
         "name": "unnamedWire#100",
@@ -1010,11 +1010,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#20",
+          "compName": "WireCrossPoint#19",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#25",
+          "compName": "WireCrossPoint#24",
           "pinName": ""
         },
         "name": "unnamedWire#101",
@@ -1027,11 +1027,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#22",
+          "compName": "WireCrossPoint#21",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#26",
+          "compName": "WireCrossPoint#25",
           "pinName": ""
         },
         "name": "unnamedWire#102",
@@ -1039,11 +1039,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#23",
+          "compName": "WireCrossPoint#22",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#27",
+          "compName": "WireCrossPoint#26",
           "pinName": ""
         },
         "name": "unnamedWire#103",
@@ -1051,11 +1051,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#24",
+          "compName": "WireCrossPoint#23",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#28",
+          "compName": "WireCrossPoint#27",
           "pinName": ""
         },
         "name": "unnamedWire#104",
@@ -1063,11 +1063,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#25",
+          "compName": "WireCrossPoint#24",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#29",
+          "compName": "WireCrossPoint#28",
           "pinName": ""
         },
         "name": "unnamedWire#105",
@@ -1075,7 +1075,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#26",
+          "compName": "WireCrossPoint#25",
           "pinName": ""
         },
         "pin2": {
@@ -1087,7 +1087,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#27",
+          "compName": "WireCrossPoint#26",
           "pinName": ""
         },
         "pin2": {
@@ -1099,7 +1099,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#28",
+          "compName": "WireCrossPoint#27",
           "pinName": ""
         },
         "pin2": {
@@ -1111,7 +1111,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#29",
+          "compName": "WireCrossPoint#28",
           "pinName": ""
         },
         "pin2": {
@@ -1135,7 +1135,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#26",
+          "compName": "WireCrossPoint#25",
           "pinName": ""
         },
         "pin2": {
@@ -1145,14 +1145,14 @@
         "name": "unnamedWire#110",
         "path": [
           {
-            "x": 356.0,
+            "x": 355.0,
             "y": 405.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#27",
+          "compName": "WireCrossPoint#26",
           "pinName": ""
         },
         "pin2": {
@@ -1162,14 +1162,14 @@
         "name": "unnamedWire#111",
         "path": [
           {
-            "x": 361.0,
+            "x": 360.0,
             "y": 415.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#28",
+          "compName": "WireCrossPoint#27",
           "pinName": ""
         },
         "pin2": {
@@ -1179,14 +1179,14 @@
         "name": "unnamedWire#112",
         "path": [
           {
-            "x": 366.0,
+            "x": 365.0,
             "y": 425.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#29",
+          "compName": "WireCrossPoint#28",
           "pinName": ""
         },
         "pin2": {
@@ -1196,59 +1196,59 @@
         "name": "unnamedWire#113",
         "path": [
           {
-            "x": 371.0,
+            "x": 370.0,
             "y": 435.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#22",
+          "compName": "WireCrossPoint#21",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#30",
+          "compName": "WireCrossPoint#29",
           "pinName": ""
         },
         "name": "unnamedWire#114",
         "path": [
           {
-            "x": 111.0,
-            "y": 506.0
+            "x": 105.0,
+            "y": 505.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#23",
+          "compName": "WireCrossPoint#22",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#31",
+          "compName": "WireCrossPoint#30",
           "pinName": ""
         },
         "name": "unnamedWire#115",
         "path": [
           {
-            "x": 116.0,
-            "y": 511.0
+            "x": 110.0,
+            "y": 510.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#24",
+          "compName": "WireCrossPoint#23",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#32",
+          "compName": "WireCrossPoint#31",
           "pinName": ""
         },
         "name": "unnamedWire#116",
         "path": [
           {
-            "x": 121.0,
-            "y": 516.0
+            "x": 115.0,
+            "y": 515.0
           }
         ]
       },
@@ -1258,20 +1258,20 @@
           "pinName": "A1"
         },
         "pin2": {
-          "compName": "WireCrossPoint#41",
+          "compName": "WireCrossPoint#40",
           "pinName": ""
         },
         "name": "unnamedWire#117",
         "path": [
           {
-            "x": 105.0,
+            "x": 100.0,
             "y": 960.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#30",
+          "compName": "WireCrossPoint#29",
           "pinName": ""
         },
         "pin2": {
@@ -1283,7 +1283,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#31",
+          "compName": "WireCrossPoint#30",
           "pinName": ""
         },
         "pin2": {
@@ -1312,7 +1312,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#32",
+          "compName": "WireCrossPoint#31",
           "pinName": ""
         },
         "pin2": {
@@ -1324,11 +1324,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#31",
+          "compName": "WireCrossPoint#30",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#33",
+          "compName": "WireCrossPoint#32",
           "pinName": ""
         },
         "name": "unnamedWire#121",
@@ -1336,11 +1336,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#32",
+          "compName": "WireCrossPoint#31",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#34",
+          "compName": "WireCrossPoint#33",
           "pinName": ""
         },
         "name": "unnamedWire#122",
@@ -1348,28 +1348,28 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#25",
+          "compName": "WireCrossPoint#24",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#35",
+          "compName": "WireCrossPoint#34",
           "pinName": ""
         },
         "name": "unnamedWire#123",
         "path": [
           {
-            "x": 126.0,
-            "y": 521.0
+            "x": 120.0,
+            "y": 520.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#30",
+          "compName": "WireCrossPoint#29",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#36",
+          "compName": "WireCrossPoint#35",
           "pinName": ""
         },
         "name": "unnamedWire#124",
@@ -1377,7 +1377,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#36",
+          "compName": "WireCrossPoint#35",
           "pinName": ""
         },
         "pin2": {
@@ -1389,7 +1389,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#33",
+          "compName": "WireCrossPoint#32",
           "pinName": ""
         },
         "pin2": {
@@ -1401,7 +1401,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#34",
+          "compName": "WireCrossPoint#33",
           "pinName": ""
         },
         "pin2": {
@@ -1413,7 +1413,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#35",
+          "compName": "WireCrossPoint#34",
           "pinName": ""
         },
         "pin2": {
@@ -1425,11 +1425,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#33",
+          "compName": "WireCrossPoint#32",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#37",
+          "compName": "WireCrossPoint#36",
           "pinName": ""
         },
         "name": "unnamedWire#129",
@@ -1441,7 +1441,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#2",
           "pinName": ""
         },
         "name": "unnamedWire#13",
@@ -1458,11 +1458,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#34",
+          "compName": "WireCrossPoint#33",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#38",
+          "compName": "WireCrossPoint#37",
           "pinName": ""
         },
         "name": "unnamedWire#130",
@@ -1470,11 +1470,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#35",
+          "compName": "WireCrossPoint#34",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#39",
+          "compName": "WireCrossPoint#38",
           "pinName": ""
         },
         "name": "unnamedWire#131",
@@ -1482,7 +1482,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#37",
+          "compName": "WireCrossPoint#36",
           "pinName": ""
         },
         "pin2": {
@@ -1494,7 +1494,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#38",
+          "compName": "WireCrossPoint#37",
           "pinName": ""
         },
         "pin2": {
@@ -1506,7 +1506,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#39",
+          "compName": "WireCrossPoint#38",
           "pinName": ""
         },
         "pin2": {
@@ -1518,7 +1518,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#16",
+          "compName": "WireCrossPoint#15",
           "pinName": ""
         },
         "pin2": {
@@ -1530,7 +1530,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#36",
+          "compName": "WireCrossPoint#35",
           "pinName": ""
         },
         "pin2": {
@@ -1540,14 +1540,14 @@
         "name": "unnamedWire#136",
         "path": [
           {
-            "x": 110.0,
+            "x": 105.0,
             "y": 1000.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#37",
+          "compName": "WireCrossPoint#36",
           "pinName": ""
         },
         "pin2": {
@@ -1557,14 +1557,14 @@
         "name": "unnamedWire#137",
         "path": [
           {
-            "x": 115.0,
+            "x": 110.0,
             "y": 1010.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#38",
+          "compName": "WireCrossPoint#37",
           "pinName": ""
         },
         "pin2": {
@@ -1574,14 +1574,14 @@
         "name": "unnamedWire#138",
         "path": [
           {
-            "x": 120.0,
+            "x": 115.0,
             "y": 1020.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#39",
+          "compName": "WireCrossPoint#38",
           "pinName": ""
         },
         "pin2": {
@@ -1591,14 +1591,14 @@
         "name": "unnamedWire#139",
         "path": [
           {
-            "x": 125.0,
+            "x": 120.0,
             "y": 1030.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#2",
           "pinName": ""
         },
         "pin2": {
@@ -1629,11 +1629,11 @@
         "name": "unnamedWire#140",
         "path": [
           {
-            "x": 190.0,
+            "x": 195.0,
             "y": 730.0
           },
           {
-            "x": 190.0,
+            "x": 195.0,
             "y": 265.0
           }
         ]
@@ -1650,11 +1650,11 @@
         "name": "unnamedWire#141",
         "path": [
           {
-            "x": 195.0,
+            "x": 200.0,
             "y": 740.0
           },
           {
-            "x": 195.0,
+            "x": 200.0,
             "y": 275.0
           }
         ]
@@ -1671,11 +1671,11 @@
         "name": "unnamedWire#142",
         "path": [
           {
-            "x": 200.0,
+            "x": 205.0,
             "y": 750.0
           },
           {
-            "x": 200.0,
+            "x": 205.0,
             "y": 285.0
           }
         ]
@@ -1692,11 +1692,11 @@
         "name": "unnamedWire#143",
         "path": [
           {
-            "x": 205.0,
+            "x": 210.0,
             "y": 760.0
           },
           {
-            "x": 205.0,
+            "x": 210.0,
             "y": 295.0
           }
         ]
@@ -1819,12 +1819,12 @@
             "y": 525.0
           },
           {
-            "x": 725.0,
-            "y": 1125.0
+            "x": 735.0,
+            "y": 1240.0
           },
           {
-            "x": 645.0,
-            "y": 1125.0
+            "x": 650.0,
+            "y": 1240.0
           }
         ]
       },
@@ -1852,12 +1852,12 @@
             "y": 520.0
           },
           {
-            "x": 730.0,
-            "y": 1130.0
+            "x": 740.0,
+            "y": 1245.0
           },
           {
-            "x": 695.0,
-            "y": 1130.0
+            "x": 700.0,
+            "y": 1245.0
           }
         ]
       },
@@ -1885,12 +1885,12 @@
             "y": 515.0
           },
           {
-            "x": 735.0,
-            "y": 1130.0
+            "x": 745.0,
+            "y": 1245.0
           },
           {
-            "x": 745.0,
-            "y": 1130.0
+            "x": 750.0,
+            "y": 1245.0
           }
         ]
       },
@@ -1918,12 +1918,12 @@
             "y": 510.0
           },
           {
-            "x": 740.0,
-            "y": 1125.0
+            "x": 750.0,
+            "y": 1240.0
           },
           {
-            "x": 795.0,
-            "y": 1125.0
+            "x": 800.0,
+            "y": 1240.0
           }
         ]
       },
@@ -1933,7 +1933,7 @@
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "WireCrossPoint#40",
+          "compName": "WireCrossPoint#39",
           "pinName": ""
         },
         "name": "unnamedWire#153",
@@ -1941,7 +1941,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#40",
+          "compName": "WireCrossPoint#39",
           "pinName": ""
         },
         "pin2": {
@@ -1951,14 +1951,14 @@
         "name": "unnamedWire#154",
         "path": [
           {
-            "x": 416.0,
+            "x": 415.0,
             "y": 445.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#40",
+          "compName": "WireCrossPoint#39",
           "pinName": ""
         },
         "pin2": {
@@ -1968,7 +1968,7 @@
         "name": "unnamedWire#155",
         "path": [
           {
-            "x": 416.0,
+            "x": 415.0,
             "y": 455.0
           }
         ]
@@ -1998,13 +1998,13 @@
           },
           {
             "x": 310.0,
-            "y": 400.0
+            "y": 450.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#41",
+          "compName": "WireCrossPoint#40",
           "pinName": ""
         },
         "pin2": {
@@ -2014,7 +2014,7 @@
         "name": "unnamedWire#158",
         "path": [
           {
-            "x": 105.0,
+            "x": 100.0,
             "y": 1115.0
           },
           {
@@ -2022,14 +2022,14 @@
             "y": 1115.0
           },
           {
-            "x": 381.0,
-            "y": 911.0
+            "x": 380.0,
+            "y": 910.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#19",
+          "compName": "WireCrossPoint#18",
           "pinName": ""
         },
         "pin2": {
@@ -2041,7 +2041,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#2",
           "pinName": ""
         },
         "pin2": {
@@ -2058,7 +2058,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#42",
+          "compName": "WireCrossPoint#41",
           "pinName": ""
         },
         "pin2": {
@@ -2068,14 +2068,14 @@
         "name": "unnamedWire#160",
         "path": [
           {
-            "x": 106.0,
-            "y": 761.0
+            "x": 100.0,
+            "y": 760.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#42",
+          "compName": "WireCrossPoint#41",
           "pinName": ""
         },
         "pin2": {
@@ -2085,7 +2085,7 @@
         "name": "unnamedWire#161",
         "path": [
           {
-            "x": 105.0,
+            "x": 100.0,
             "y": 885.0
           },
           {
@@ -2096,7 +2096,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#20",
+          "compName": "WireCrossPoint#19",
           "pinName": ""
         },
         "pin2": {
@@ -2117,11 +2117,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#44",
+          "compName": "WireCrossPoint#42",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#6",
+          "compName": "WireCrossPoint#5",
           "pinName": ""
         },
         "name": "unnamedWire#164",
@@ -2129,7 +2129,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#45",
+          "compName": "WireCrossPoint#43",
           "pinName": ""
         },
         "pin2": {
@@ -2150,7 +2150,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#45",
+          "compName": "WireCrossPoint#43",
           "pinName": ""
         },
         "pin2": {
@@ -2162,11 +2162,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#45",
+          "compName": "WireCrossPoint#43",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#44",
+          "compName": "WireCrossPoint#42",
           "pinName": ""
         },
         "name": "unnamedWire#167",
@@ -2174,11 +2174,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#46",
+          "compName": "WireCrossPoint#44",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#4",
+          "compName": "WireCrossPoint#3",
           "pinName": ""
         },
         "name": "unnamedWire#168",
@@ -2186,11 +2186,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#46",
+          "compName": "WireCrossPoint#44",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#47",
+          "compName": "WireCrossPoint#45",
           "pinName": ""
         },
         "name": "unnamedWire#169",
@@ -2198,7 +2198,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#2",
           "pinName": ""
         },
         "pin2": {
@@ -2227,7 +2227,7 @@
           "pinName": "EN"
         },
         "pin2": {
-          "compName": "WireCrossPoint#47",
+          "compName": "WireCrossPoint#45",
           "pinName": ""
         },
         "name": "unnamedWire#170",
@@ -2235,7 +2235,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#20",
+          "compName": "WireCrossPoint#19",
           "pinName": ""
         },
         "pin2": {
@@ -2245,8 +2245,8 @@
         "name": "unnamedWire#171",
         "path": [
           {
-            "x": 396.0,
-            "y": 736.0
+            "x": 395.0,
+            "y": 735.0
           }
         ]
       },
@@ -2256,7 +2256,7 @@
           "pinName": "C4"
         },
         "pin2": {
-          "compName": "WireCrossPoint#48",
+          "compName": "WireCrossPoint#46",
           "pinName": ""
         },
         "name": "unnamedWire#172",
@@ -2264,12 +2264,16 @@
           {
             "x": 145.0,
             "y": 1070.0
+          },
+          {
+            "x": 145.0,
+            "y": 1080.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#48",
+          "compName": "WireCrossPoint#46",
           "pinName": ""
         },
         "pin2": {
@@ -2278,10 +2282,6 @@
         },
         "name": "unnamedWire#173",
         "path": [
-          {
-            "x": 425.0,
-            "y": 1080.0
-          },
           {
             "x": 425.0,
             "y": 940.0
@@ -2290,7 +2290,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#48",
+          "compName": "WireCrossPoint#46",
           "pinName": ""
         },
         "pin2": {
@@ -2300,12 +2300,8 @@
         "name": "unnamedWire#174",
         "path": [
           {
-            "x": 20.0,
-            "y": 1080.0
-          },
-          {
-            "x": 20.0,
-            "y": 300.0
+            "x": 425.0,
+            "y": 1150.0
           }
         ]
       },
@@ -2315,7 +2311,7 @@
           "pinName": "LSH"
         },
         "pin2": {
-          "compName": "WireCrossPoint#4",
+          "compName": "WireCrossPoint#3",
           "pinName": ""
         },
         "name": "unnamedWire#18",
@@ -2329,7 +2325,7 @@
             "y": 240.0
           },
           {
-            "x": 140.0,
+            "x": 135.0,
             "y": 240.0
           }
         ]
@@ -2340,7 +2336,7 @@
           "pinName": "NSH"
         },
         "pin2": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#4",
           "pinName": ""
         },
         "name": "unnamedWire#19",
@@ -2354,7 +2350,7 @@
             "y": 235.0
           },
           {
-            "x": 135.0,
+            "x": 130.0,
             "y": 235.0
           }
         ]
@@ -2394,7 +2390,7 @@
           "pinName": "RSH"
         },
         "pin2": {
-          "compName": "WireCrossPoint#6",
+          "compName": "WireCrossPoint#5",
           "pinName": ""
         },
         "name": "unnamedWire#20",
@@ -2408,14 +2404,14 @@
             "y": 230.0
           },
           {
-            "x": 130.0,
+            "x": 125.0,
             "y": 230.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#4",
+          "compName": "WireCrossPoint#3",
           "pinName": ""
         },
         "pin2": {
@@ -2427,7 +2423,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#4",
           "pinName": ""
         },
         "pin2": {
@@ -2439,7 +2435,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#6",
+          "compName": "WireCrossPoint#5",
           "pinName": ""
         },
         "pin2": {
@@ -2451,7 +2447,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#46",
+          "compName": "WireCrossPoint#44",
           "pinName": ""
         },
         "pin2": {
@@ -2461,14 +2457,14 @@
         "name": "unnamedWire#24",
         "path": [
           {
-            "x": 140.0,
+            "x": 135.0,
             "y": 930.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#5",
+          "compName": "WireCrossPoint#4",
           "pinName": ""
         },
         "pin2": {
@@ -2478,7 +2474,7 @@
         "name": "unnamedWire#25",
         "path": [
           {
-            "x": 135.0,
+            "x": 130.0,
             "y": 940.0
           }
         ]
@@ -2489,13 +2485,13 @@
           "pinName": "SC"
         },
         "pin2": {
-          "compName": "WireCrossPoint#44",
+          "compName": "WireCrossPoint#42",
           "pinName": ""
         },
         "name": "unnamedWire#26",
         "path": [
           {
-            "x": 130.0,
+            "x": 125.0,
             "y": 950.0
           }
         ]
@@ -2803,11 +2799,11 @@
           },
           {
             "x": 800.0,
-            "y": 605.0
+            "y": 610.0
           },
           {
-            "x": 565.0,
-            "y": 605.0
+            "x": 575.0,
+            "y": 610.0
           }
         ]
       },
@@ -3061,7 +3057,7 @@
           "pinName": "Q1"
         },
         "pin2": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#6",
           "pinName": ""
         },
         "name": "unnamedWire#48",
@@ -3086,7 +3082,7 @@
           "pinName": "Q2"
         },
         "pin2": {
-          "compName": "WireCrossPoint#8",
+          "compName": "WireCrossPoint#7",
           "pinName": ""
         },
         "name": "unnamedWire#49",
@@ -3122,11 +3118,11 @@
           },
           {
             "x": 795.0,
-            "y": 610.0
+            "y": 605.0
           },
           {
-            "x": 575.0,
-            "y": 610.0
+            "x": 565.0,
+            "y": 605.0
           }
         ]
       },
@@ -3136,7 +3132,7 @@
           "pinName": "Q3"
         },
         "pin2": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#8",
           "pinName": ""
         },
         "name": "unnamedWire#50",
@@ -3161,7 +3157,7 @@
           "pinName": "Q4"
         },
         "pin2": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#9",
           "pinName": ""
         },
         "name": "unnamedWire#51",
@@ -3182,7 +3178,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#6",
           "pinName": ""
         },
         "pin2": {
@@ -3194,7 +3190,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#8",
+          "compName": "WireCrossPoint#7",
           "pinName": ""
         },
         "pin2": {
@@ -3206,7 +3202,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#8",
           "pinName": ""
         },
         "pin2": {
@@ -3218,7 +3214,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#9",
           "pinName": ""
         },
         "pin2": {
@@ -3230,7 +3226,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#7",
+          "compName": "WireCrossPoint#6",
           "pinName": ""
         },
         "pin2": {
@@ -3247,7 +3243,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#8",
+          "compName": "WireCrossPoint#7",
           "pinName": ""
         },
         "pin2": {
@@ -3264,7 +3260,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#9",
+          "compName": "WireCrossPoint#8",
           "pinName": ""
         },
         "pin2": {
@@ -3281,7 +3277,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#10",
+          "compName": "WireCrossPoint#9",
           "pinName": ""
         },
         "pin2": {
@@ -3411,7 +3407,7 @@
           "pinName": "Q1"
         },
         "pin2": {
-          "compName": "WireCrossPoint#11",
+          "compName": "WireCrossPoint#10",
           "pinName": ""
         },
         "name": "unnamedWire#64",
@@ -3423,7 +3419,7 @@
           "pinName": "Q2"
         },
         "pin2": {
-          "compName": "WireCrossPoint#12",
+          "compName": "WireCrossPoint#11",
           "pinName": ""
         },
         "name": "unnamedWire#65",
@@ -3435,7 +3431,7 @@
           "pinName": "Q3"
         },
         "pin2": {
-          "compName": "WireCrossPoint#13",
+          "compName": "WireCrossPoint#12",
           "pinName": ""
         },
         "name": "unnamedWire#66",
@@ -3447,7 +3443,7 @@
           "pinName": "Q4"
         },
         "pin2": {
-          "compName": "WireCrossPoint#14",
+          "compName": "WireCrossPoint#13",
           "pinName": ""
         },
         "name": "unnamedWire#67",
@@ -3455,11 +3451,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#11",
+          "compName": "WireCrossPoint#10",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#15",
+          "compName": "WireCrossPoint#14",
           "pinName": ""
         },
         "name": "unnamedWire#68",
@@ -3467,7 +3463,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#15",
+          "compName": "WireCrossPoint#14",
           "pinName": ""
         },
         "pin2": {
@@ -3504,11 +3500,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#14",
+          "compName": "WireCrossPoint#13",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#16",
+          "compName": "WireCrossPoint#15",
           "pinName": ""
         },
         "name": "unnamedWire#70",
@@ -3520,14 +3516,14 @@
           "pinName": "Qn"
         },
         "pin2": {
-          "compName": "WireCrossPoint#41",
+          "compName": "WireCrossPoint#40",
           "pinName": ""
         },
         "name": "unnamedWire#71",
         "path": [
           {
             "x": 80.0,
-            "y": 250.0
+            "y": 200.0
           },
           {
             "x": 80.0,
@@ -3537,11 +3533,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#12",
+          "compName": "WireCrossPoint#11",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#17",
+          "compName": "WireCrossPoint#16",
           "pinName": ""
         },
         "name": "unnamedWire#72",
@@ -3566,11 +3562,11 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#13",
+          "compName": "WireCrossPoint#12",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#18",
+          "compName": "WireCrossPoint#17",
           "pinName": ""
         },
         "name": "unnamedWire#73",
@@ -3595,7 +3591,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#17",
+          "compName": "WireCrossPoint#16",
           "pinName": ""
         },
         "pin2": {
@@ -3607,7 +3603,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#18",
+          "compName": "WireCrossPoint#17",
           "pinName": ""
         },
         "pin2": {
@@ -3619,7 +3615,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#14",
+          "compName": "WireCrossPoint#13",
           "pinName": ""
         },
         "pin2": {
@@ -3648,7 +3644,7 @@
           "pinName": "RAMn"
         },
         "pin2": {
-          "compName": "WireCrossPoint#42",
+          "compName": "WireCrossPoint#41",
           "pinName": ""
         },
         "name": "unnamedWire#78",
@@ -3665,7 +3661,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#11",
+          "compName": "WireCrossPoint#10",
           "pinName": ""
         },
         "pin2": {
@@ -3723,7 +3719,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#15",
+          "compName": "WireCrossPoint#14",
           "pinName": ""
         },
         "pin2": {
@@ -3740,7 +3736,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#12",
+          "compName": "WireCrossPoint#11",
           "pinName": ""
         },
         "pin2": {
@@ -3761,7 +3757,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#13",
+          "compName": "WireCrossPoint#12",
           "pinName": ""
         },
         "pin2": {
@@ -3782,7 +3778,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#16",
+          "compName": "WireCrossPoint#15",
           "pinName": ""
         },
         "pin2": {
@@ -3799,7 +3795,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#17",
+          "compName": "WireCrossPoint#16",
           "pinName": ""
         },
         "pin2": {
@@ -3816,7 +3812,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#18",
+          "compName": "WireCrossPoint#17",
           "pinName": ""
         },
         "pin2": {
@@ -3908,20 +3904,12 @@
         "name": "unnamedWire#90",
         "path": [
           {
-            "x": 616.0,
+            "x": 615.0,
             "y": 665.0
           },
           {
             "x": 615.0,
-            "y": 1130.0
-          },
-          {
-            "x": 90.0,
-            "y": 1130.0
-          },
-          {
-            "x": 90.0,
-            "y": 450.0
+            "y": 1200.0
           }
         ]
       },
@@ -3937,7 +3925,7 @@
         "name": "unnamedWire#91",
         "path": [
           {
-            "x": 611.0,
+            "x": 610.0,
             "y": 675.0
           },
           {
@@ -3960,7 +3948,7 @@
           "pinName": "F1"
         },
         "pin2": {
-          "compName": "WireCrossPoint#19",
+          "compName": "WireCrossPoint#18",
           "pinName": ""
         },
         "name": "unnamedWire#92",
@@ -3970,7 +3958,7 @@
             "y": 625.0
           },
           {
-            "x": 636.0,
+            "x": 635.0,
             "y": 530.0
           }
         ]
@@ -3981,7 +3969,7 @@
           "pinName": "F4"
         },
         "pin2": {
-          "compName": "WireCrossPoint#20",
+          "compName": "WireCrossPoint#19",
           "pinName": ""
         },
         "name": "unnamedWire#93",
@@ -4002,7 +3990,7 @@
           "pinName": "OUT"
         },
         "pin2": {
-          "compName": "WireCrossPoint#21",
+          "compName": "WireCrossPoint#20",
           "pinName": ""
         },
         "name": "unnamedWire#94",
@@ -4010,7 +3998,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#47",
+          "compName": "WireCrossPoint#45",
           "pinName": ""
         },
         "pin2": {
@@ -4022,7 +4010,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#21",
+          "compName": "WireCrossPoint#20",
           "pinName": ""
         },
         "pin2": {
@@ -4036,26 +4024,26 @@
             "y": 795.0
           },
           {
-            "x": 190.0,
+            "x": 195.0,
             "y": 795.0
           },
           {
-            "x": 190.0,
+            "x": 195.0,
             "y": 880.0
           },
           {
-            "x": 145.0,
+            "x": 140.0,
             "y": 880.0
           },
           {
-            "x": 145.0,
+            "x": 140.0,
             "y": 870.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#21",
+          "compName": "WireCrossPoint#20",
           "pinName": ""
         },
         "pin2": {
@@ -4070,17 +4058,17 @@
           },
           {
             "x": 455.0,
-            "y": 150.0
+            "y": 1100.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#19",
+          "compName": "WireCrossPoint#18",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#22",
+          "compName": "WireCrossPoint#21",
           "pinName": ""
         },
         "name": "unnamedWire#98",
@@ -4097,7 +4085,7 @@
           "pinName": "F2"
         },
         "pin2": {
-          "compName": "WireCrossPoint#23",
+          "compName": "WireCrossPoint#22",
           "pinName": ""
         },
         "name": "unnamedWire#99",