X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.logic.model.am2900%2Fcomponents%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fam2900%2Fcomponents%2FAm2900.json;h=86a882d92c8e15a3e4ac25407e54ba9d0523bcb0;hb=f30643a40e01919e4544891bb8bd92fa37a5b5a7;hp=39a469c7a06c9469706efc7aa17995ef52ca9386;hpb=2198fbadd2105c47ff4cd65d434616ae329802a1;p=Mograsim.git

diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json
index 39a469c7..86a882d9 100644
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/Am2900.json
@@ -5,21 +5,12 @@
   "innerScale": 0.4,
   "submodel": {
     "components": [
-      {
-        "id": "ManualSwitch",
-        "name": "@c",
-        "pos": {
-          "x": 120.0,
-          "y": 355.0
-        },
-        "params": 1
-      },
       {
         "id": "Am2900MainMemory",
         "name": "Am2900MainMemory#0",
         "pos": {
           "x": 35.0,
-          "y": 30.0
+          "y": 70.0
         }
       },
       {
@@ -105,6 +96,18 @@
         },
         "params": 16
       },
+      {
+        "id": "Clock",
+        "name": "Clock#0",
+        "pos": {
+          "x": 120.0,
+          "y": 355.0
+        },
+        "params": {
+          "delta": 500,
+          "orientation": "RIGHT"
+        }
+      },
       {
         "id": "FixedOutput",
         "name": "FixedOutput#0",
@@ -258,20 +261,29 @@
         "id": "NandGate",
         "name": "NandGate#5",
         "pos": {
-          "x": 190.0,
-          "y": 100.0
+          "x": 60.0,
+          "y": 235.0
         },
         "params": 1
       },
       {
         "id": "NandGate",
-        "name": "NandGate#7",
+        "name": "NandGate#6",
         "pos": {
           "x": 150.0,
           "y": 375.0
         },
         "params": 1
       },
+      {
+        "id": "NandGate",
+        "name": "NandGate#7",
+        "pos": {
+          "x": 65.0,
+          "y": 270.0
+        },
+        "params": 1
+      },
       {
         "id": "Splitter",
         "name": "Splitter#0",
@@ -298,67 +310,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#11",
-        "pos": {
-          "x": 575.0,
-          "y": 115.0
-        },
-        "params": {
-          "logicWidth": 8,
-          "orientation": "LEFT"
-        }
-      },
-      {
-        "id": "Splitter",
-        "name": "Splitter#12",
-        "pos": {
-          "x": 575.0,
-          "y": 195.0
-        },
-        "params": {
-          "logicWidth": 4,
-          "orientation": "LEFT"
-        }
-      },
-      {
-        "id": "Splitter",
-        "name": "Splitter#13",
-        "pos": {
-          "x": 575.0,
-          "y": 235.0
-        },
-        "params": {
-          "logicWidth": 4,
-          "orientation": "LEFT"
-        }
-      },
-      {
-        "id": "Splitter",
-        "name": "Splitter#14",
-        "pos": {
-          "x": 675.0,
-          "y": 150.0
-        },
-        "params": {
-          "logicWidth": 4,
-          "orientation": "LEFT"
-        }
-      },
-      {
-        "id": "Splitter",
-        "name": "Splitter#15",
-        "pos": {
-          "x": 675.0,
-          "y": 245.0
-        },
-        "params": {
-          "logicWidth": 4,
-          "orientation": "LEFT"
-        }
-      },
-      {
-        "id": "Splitter",
-        "name": "Splitter#16",
+        "name": "Splitter#10",
         "pos": {
           "x": 345.0,
           "y": 830.0
@@ -370,7 +322,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#17",
+        "name": "Splitter#11",
         "pos": {
           "x": 405.0,
           "y": 815.0
@@ -382,7 +334,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#18",
+        "name": "Splitter#12",
         "pos": {
           "x": 525.0,
           "y": 815.0
@@ -394,7 +346,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#19",
+        "name": "Splitter#13",
         "pos": {
           "x": 660.0,
           "y": 755.0
@@ -406,19 +358,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#2",
-        "pos": {
-          "x": 620.0,
-          "y": 255.0
-        },
-        "params": {
-          "logicWidth": 4,
-          "orientation": "RIGHT"
-        }
-      },
-      {
-        "id": "Splitter",
-        "name": "Splitter#20",
+        "name": "Splitter#14",
         "pos": {
           "x": 575.0,
           "y": 815.0
@@ -430,7 +370,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#21",
+        "name": "Splitter#15",
         "pos": {
           "x": 695.0,
           "y": 815.0
@@ -442,7 +382,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#22",
+        "name": "Splitter#16",
         "pos": {
           "x": 655.0,
           "y": 815.0
@@ -454,7 +394,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#23",
+        "name": "Splitter#17",
         "pos": {
           "x": 730.0,
           "y": 770.0
@@ -466,7 +406,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#24",
+        "name": "Splitter#18",
         "pos": {
           "x": 690.0,
           "y": 770.0
@@ -478,7 +418,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#25",
+        "name": "Splitter#19",
         "pos": {
           "x": 660.0,
           "y": 770.0
@@ -490,7 +430,19 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#26",
+        "name": "Splitter#2",
+        "pos": {
+          "x": 620.0,
+          "y": 255.0
+        },
+        "params": {
+          "logicWidth": 4,
+          "orientation": "RIGHT"
+        }
+      },
+      {
+        "id": "Splitter",
+        "name": "Splitter#20",
         "pos": {
           "x": 925.0,
           "y": 815.0
@@ -502,7 +454,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#27",
+        "name": "Splitter#21",
         "pos": {
           "x": 895.0,
           "y": 815.0
@@ -514,7 +466,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#28",
+        "name": "Splitter#22",
         "pos": {
           "x": 865.0,
           "y": 815.0
@@ -526,7 +478,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#29",
+        "name": "Splitter#23",
         "pos": {
           "x": 835.0,
           "y": 815.0
@@ -538,19 +490,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#3",
-        "pos": {
-          "x": 205.0,
-          "y": 390.0
-        },
-        "params": {
-          "logicWidth": 8,
-          "orientation": "DOWN"
-        }
-      },
-      {
-        "id": "Splitter",
-        "name": "Splitter#30",
+        "name": "Splitter#24",
         "pos": {
           "x": 795.0,
           "y": 815.0
@@ -562,7 +502,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#31",
+        "name": "Splitter#25",
         "pos": {
           "x": 745.0,
           "y": 815.0
@@ -574,7 +514,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#32",
+        "name": "Splitter#26",
         "pos": {
           "x": 895.0,
           "y": 800.0
@@ -586,7 +526,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#33",
+        "name": "Splitter#27",
         "pos": {
           "x": 835.0,
           "y": 800.0
@@ -598,7 +538,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#34",
+        "name": "Splitter#28",
         "pos": {
           "x": 865.0,
           "y": 800.0
@@ -610,7 +550,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#35",
+        "name": "Splitter#29",
         "pos": {
           "x": 835.0,
           "y": 780.0
@@ -622,7 +562,19 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#36",
+        "name": "Splitter#3",
+        "pos": {
+          "x": 205.0,
+          "y": 390.0
+        },
+        "params": {
+          "logicWidth": 8,
+          "orientation": "DOWN"
+        }
+      },
+      {
+        "id": "Splitter",
+        "name": "Splitter#30",
         "pos": {
           "x": 895.0,
           "y": 330.0
@@ -634,7 +586,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#37",
+        "name": "Splitter#31",
         "pos": {
           "x": 895.0,
           "y": 580.0
@@ -646,7 +598,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#38",
+        "name": "Splitter#32",
         "pos": {
           "x": 895.0,
           "y": 565.0
@@ -658,7 +610,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#39",
+        "name": "Splitter#33",
         "pos": {
           "x": 935.0,
           "y": 565.0
@@ -670,19 +622,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#4",
-        "pos": {
-          "x": 205.0,
-          "y": 405.0
-        },
-        "params": {
-          "logicWidth": 12,
-          "orientation": "UP"
-        }
-      },
-      {
-        "id": "Splitter",
-        "name": "Splitter#40",
+        "name": "Splitter#34",
         "pos": {
           "x": 975.0,
           "y": 565.0
@@ -694,7 +634,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#41",
+        "name": "Splitter#35",
         "pos": {
           "x": 1015.0,
           "y": 565.0
@@ -706,7 +646,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#42",
+        "name": "Splitter#36",
         "pos": {
           "x": 895.0,
           "y": 345.0
@@ -718,7 +658,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#43",
+        "name": "Splitter#37",
         "pos": {
           "x": 935.0,
           "y": 345.0
@@ -730,7 +670,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#44",
+        "name": "Splitter#38",
         "pos": {
           "x": 975.0,
           "y": 345.0
@@ -742,7 +682,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#45",
+        "name": "Splitter#39",
         "pos": {
           "x": 1015.0,
           "y": 345.0
@@ -754,7 +694,19 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#46",
+        "name": "Splitter#4",
+        "pos": {
+          "x": 205.0,
+          "y": 405.0
+        },
+        "params": {
+          "logicWidth": 12,
+          "orientation": "UP"
+        }
+      },
+      {
+        "id": "Splitter",
+        "name": "Splitter#40",
         "pos": {
           "x": 310.0,
           "y": 235.0
@@ -766,7 +718,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#47",
+        "name": "Splitter#41",
         "pos": {
           "x": 620.0,
           "y": 200.0
@@ -778,7 +730,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#48",
+        "name": "Splitter#42",
         "pos": {
           "x": 365.0,
           "y": 815.0
@@ -790,7 +742,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#49",
+        "name": "Splitter#43",
         "pos": {
           "x": 620.0,
           "y": 295.0
@@ -801,38 +753,98 @@
         }
       },
       {
-        "id": "TextComponent",
-        "name": "TextComponent#0",
+        "id": "Splitter",
+        "name": "Splitter#5",
         "pos": {
-          "x": 305.0,
-          "y": 30.0
+          "x": 575.0,
+          "y": 115.0
         },
-        "params": "D bus"
+        "params": {
+          "logicWidth": 8,
+          "orientation": "LEFT"
+        }
       },
       {
-        "id": "TextComponent",
-        "name": "TextComponent#1",
+        "id": "Splitter",
+        "name": "Splitter#6",
         "pos": {
-          "x": 305.0,
-          "y": 60.0
+          "x": 575.0,
+          "y": 195.0
         },
-        "params": "A bus"
+        "params": {
+          "logicWidth": 4,
+          "orientation": "LEFT"
+        }
       },
       {
-        "id": "TextComponent",
-        "name": "TextComponent#2",
+        "id": "Splitter",
+        "name": "Splitter#7",
         "pos": {
-          "x": 265.0,
-          "y": 545.0
+          "x": 575.0,
+          "y": 235.0
         },
-        "params": "MPM addr"
-      },
-      {
+        "params": {
+          "logicWidth": 4,
+          "orientation": "LEFT"
+        }
+      },
+      {
+        "id": "Splitter",
+        "name": "Splitter#8",
+        "pos": {
+          "x": 675.0,
+          "y": 150.0
+        },
+        "params": {
+          "logicWidth": 4,
+          "orientation": "LEFT"
+        }
+      },
+      {
+        "id": "Splitter",
+        "name": "Splitter#9",
+        "pos": {
+          "x": 675.0,
+          "y": 245.0
+        },
+        "params": {
+          "logicWidth": 4,
+          "orientation": "LEFT"
+        }
+      },
+      {
+        "id": "TextComponent",
+        "name": "TextComponent#0",
+        "pos": {
+          "x": 305.0,
+          "y": 30.0
+        },
+        "params": "D bus"
+      },
+      {
+        "id": "TextComponent",
+        "name": "TextComponent#1",
+        "pos": {
+          "x": 305.0,
+          "y": 60.0
+        },
+        "params": "A bus"
+      },
+      {
+        "id": "TextComponent",
+        "name": "TextComponent#2",
+        "pos": {
+          "x": 265.0,
+          "y": 545.0
+        },
+        "params": "MPM addr"
+      },
+      {
         "id": "TextComponent",
-        "name": "TextComponent#4",
+        "name": "TextComponent#3",
         "pos": {
           "x": 110.0,
-          "y": 355.0
+          "y": 350.0
         },
         "params": "c"
       },
@@ -886,16 +898,28 @@
       },
       {
         "id": "TriStateBuffer",
-        "name": "TriStateBuffer#5",
+        "name": "TriStateBuffer#4",
         "pos": {
-          "x": 205.0,
-          "y": 70.0
+          "x": 185.0,
+          "y": 175.0
         },
         "params": {
           "logicWidth": 16,
           "orientation": "RIGHT_ALT"
         }
       },
+      {
+        "id": "TriStateBuffer",
+        "name": "TriStateBuffer#5",
+        "pos": {
+          "x": 185.0,
+          "y": 145.0
+        },
+        "params": {
+          "logicWidth": 16,
+          "orientation": "LEFT"
+        }
+      },
       {
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#0",
@@ -1247,6 +1271,60 @@
         },
         "params": 12
       },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#44",
+        "pos": {
+          "x": 174.0,
+          "y": 289.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#45",
+        "pos": {
+          "x": 129.0,
+          "y": 304.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#46",
+        "pos": {
+          "x": 129.0,
+          "y": 279.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#47",
+        "pos": {
+          "x": 59.0,
+          "y": 294.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#48",
+        "pos": {
+          "x": 84.0,
+          "y": 244.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#49",
+        "pos": {
+          "x": 59.0,
+          "y": 274.0
+        },
+        "params": 1
+      },
       {
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#5",
@@ -1256,6 +1334,42 @@
         },
         "params": 1
       },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#50",
+        "pos": {
+          "x": 234.0,
+          "y": 154.0
+        },
+        "params": 16
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#51",
+        "pos": {
+          "x": 164.0,
+          "y": 154.0
+        },
+        "params": 16
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#52",
+        "pos": {
+          "x": 59.0,
+          "y": 284.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#53",
+        "pos": {
+          "x": 174.0,
+          "y": 314.0
+        },
+        "params": 1
+      },
       {
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#6",
@@ -1316,6 +1430,54 @@
           "y": 595.0
         }
       },
+      {
+        "id": "and",
+        "name": "and#3",
+        "pos": {
+          "x": 90.0,
+          "y": 240.0
+        }
+      },
+      {
+        "id": "and",
+        "name": "and#4",
+        "pos": {
+          "x": 90.0,
+          "y": 265.0
+        }
+      },
+      {
+        "id": "and",
+        "name": "and#5",
+        "pos": {
+          "x": 185.0,
+          "y": 240.0
+        }
+      },
+      {
+        "id": "dff",
+        "name": "dff#0",
+        "pos": {
+          "x": 135.0,
+          "y": 265.0
+        }
+      },
+      {
+        "id": "dff",
+        "name": "dff#1",
+        "pos": {
+          "x": 135.0,
+          "y": 240.0
+        }
+      },
+      {
+        "id": "dff",
+        "name": "dff#2",
+        "pos": {
+          "x": 135.0,
+          "y": 290.0
+        }
+      },
       {
         "id": "dff16",
         "name": "dff16#0",
@@ -1324,6 +1486,14 @@
           "y": 105.0
         }
       },
+      {
+        "id": "dff16",
+        "name": "dff16#1",
+        "pos": {
+          "x": 180.0,
+          "y": 65.0
+        }
+      },
       {
         "id": "dff16_invwe",
         "name": "dff16_invwe#0",
@@ -1583,7 +1753,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#46",
+          "compName": "Splitter#40",
           "pinName": "O2"
         },
         "pin2": {
@@ -1654,7 +1824,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#46",
+          "compName": "Splitter#40",
           "pinName": "O0"
         },
         "pin2": {
@@ -1741,7 +1911,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#14",
+          "compName": "Splitter#8",
           "pinName": "I"
         },
         "pin2": {
@@ -1766,7 +1936,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#15",
+          "compName": "Splitter#9",
           "pinName": "I"
         },
         "name": "unnamedWire#114",
@@ -1835,7 +2005,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O37"
         },
         "name": "unnamedWire#119",
@@ -1915,7 +2085,7 @@
         },
         "pin2": {
           "compName": "NandGate#5",
-          "pinName": "A"
+          "pinName": "B"
         },
         "name": "unnamedWire#121",
         "path": [
@@ -1925,15 +2095,15 @@
           },
           {
             "x": 340.0,
-            "y": 260.0
+            "y": 325.0
           },
           {
-            "x": 180.0,
-            "y": 260.0
+            "x": 55.0,
+            "y": 325.0
           },
           {
-            "x": 180.0,
-            "y": 105.0
+            "x": 55.0,
+            "y": 250.0
           }
         ]
       },
@@ -1989,11 +2159,20 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Am2900MainMemory#0",
-          "pinName": "A"
+          "compName": "dff16#1",
+          "pinName": "D"
         },
         "name": "unnamedWire#125",
-        "path": []
+        "path": [
+          {
+            "x": 170.0,
+            "y": 60.0
+          },
+          {
+            "x": 170.0,
+            "y": 90.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -2001,15 +2180,20 @@
           "pinName": "D"
         },
         "pin2": {
-          "compName": "TriStateBuffer#5",
-          "pinName": "IN"
+          "compName": "WireCrossPoint#51",
+          "pinName": ""
         },
         "name": "unnamedWire#126",
-        "path": []
+        "path": [
+          {
+            "x": 165.0,
+            "y": 120.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "Splitter#46",
+          "compName": "Splitter#40",
           "pinName": "O3"
         },
         "pin2": {
@@ -2173,22 +2357,18 @@
       },
       {
         "pin1": {
-          "compName": "TriStateBuffer#5",
+          "compName": "TriStateBuffer#4",
           "pinName": "OUT"
         },
         "pin2": {
-          "compName": "WireCrossPoint#29",
+          "compName": "WireCrossPoint#50",
           "pinName": ""
         },
         "name": "unnamedWire#135",
         "path": [
           {
-            "x": 230.0,
-            "y": 80.0
-          },
-          {
-            "x": 230.0,
-            "y": 45.0
+            "x": 235.0,
+            "y": 185.0
           }
         ]
       },
@@ -2235,7 +2415,7 @@
           "pinName": "Q"
         },
         "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "I"
         },
         "name": "unnamedWire#138",
@@ -2256,7 +2436,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O22"
         },
         "pin2": {
@@ -2302,11 +2482,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#18",
+          "compName": "Splitter#12",
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O21"
         },
         "name": "unnamedWire#140",
@@ -2314,11 +2494,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O20"
         },
         "pin2": {
-          "compName": "Splitter#18",
+          "compName": "Splitter#12",
           "pinName": "O2"
         },
         "name": "unnamedWire#141",
@@ -2326,11 +2506,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#18",
+          "compName": "Splitter#12",
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O19"
         },
         "name": "unnamedWire#142",
@@ -2338,11 +2518,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O18"
         },
         "pin2": {
-          "compName": "Splitter#18",
+          "compName": "Splitter#12",
           "pinName": "O0"
         },
         "name": "unnamedWire#143",
@@ -2350,7 +2530,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#18",
+          "compName": "Splitter#12",
           "pinName": "I"
         },
         "pin2": {
@@ -2375,11 +2555,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#11",
           "pinName": "O11"
         },
         "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O17"
         },
         "name": "unnamedWire#145",
@@ -2387,11 +2567,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O16"
         },
         "pin2": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#11",
           "pinName": "O10"
         },
         "name": "unnamedWire#146",
@@ -2399,11 +2579,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#11",
           "pinName": "O9"
         },
         "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O15"
         },
         "name": "unnamedWire#147",
@@ -2411,11 +2591,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O14"
         },
         "pin2": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#11",
           "pinName": "O8"
         },
         "name": "unnamedWire#148",
@@ -2423,11 +2603,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#11",
           "pinName": "O7"
         },
         "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O13"
         },
         "name": "unnamedWire#149",
@@ -2456,11 +2636,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O12"
         },
         "pin2": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#11",
           "pinName": "O6"
         },
         "name": "unnamedWire#150",
@@ -2468,11 +2648,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#11",
           "pinName": "O5"
         },
         "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O11"
         },
         "name": "unnamedWire#151",
@@ -2480,11 +2660,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O10"
         },
         "pin2": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#11",
           "pinName": "O4"
         },
         "name": "unnamedWire#152",
@@ -2492,11 +2672,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#11",
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O9"
         },
         "name": "unnamedWire#153",
@@ -2504,11 +2684,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O8"
         },
         "pin2": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#11",
           "pinName": "O2"
         },
         "name": "unnamedWire#154",
@@ -2516,11 +2696,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#11",
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O7"
         },
         "name": "unnamedWire#155",
@@ -2528,11 +2708,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O6"
         },
         "pin2": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#11",
           "pinName": "O0"
         },
         "name": "unnamedWire#156",
@@ -2561,7 +2741,7 @@
           "pinName": "I1"
         },
         "pin2": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#11",
           "pinName": "I"
         },
         "name": "unnamedWire#158",
@@ -2635,11 +2815,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O5"
         },
         "pin2": {
-          "compName": "Splitter#48",
+          "compName": "Splitter#42",
           "pinName": "O3"
         },
         "name": "unnamedWire#161",
@@ -2647,11 +2827,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#46",
+          "compName": "Splitter#40",
           "pinName": "I"
         },
         "pin2": {
-          "compName": "Splitter#48",
+          "compName": "Splitter#42",
           "pinName": "I"
         },
         "name": "unnamedWire#162",
@@ -2689,7 +2869,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O29"
         },
         "pin2": {
@@ -2718,7 +2898,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O30"
         },
         "pin2": {
@@ -2747,11 +2927,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#20",
+          "compName": "Splitter#14",
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O23"
         },
         "name": "unnamedWire#166",
@@ -2759,11 +2939,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#20",
+          "compName": "Splitter#14",
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O25"
         },
         "name": "unnamedWire#167",
@@ -2771,11 +2951,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#20",
+          "compName": "Splitter#14",
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O24"
         },
         "name": "unnamedWire#168",
@@ -2783,11 +2963,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O26"
         },
         "pin2": {
-          "compName": "Splitter#20",
+          "compName": "Splitter#14",
           "pinName": "O3"
         },
         "name": "unnamedWire#169",
@@ -2824,11 +3004,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#20",
+          "compName": "Splitter#14",
           "pinName": "O4"
         },
         "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O27"
         },
         "name": "unnamedWire#170",
@@ -2836,11 +3016,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O28"
         },
         "pin2": {
-          "compName": "Splitter#20",
+          "compName": "Splitter#14",
           "pinName": "O5"
         },
         "name": "unnamedWire#171",
@@ -2848,11 +3028,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#22",
+          "compName": "Splitter#16",
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O31"
         },
         "name": "unnamedWire#172",
@@ -2860,11 +3040,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O32"
         },
         "pin2": {
-          "compName": "Splitter#22",
+          "compName": "Splitter#16",
           "pinName": "O1"
         },
         "name": "unnamedWire#173",
@@ -2872,11 +3052,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#22",
+          "compName": "Splitter#16",
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O33"
         },
         "name": "unnamedWire#174",
@@ -2884,11 +3064,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O34"
         },
         "pin2": {
-          "compName": "Splitter#22",
+          "compName": "Splitter#16",
           "pinName": "O3"
         },
         "name": "unnamedWire#175",
@@ -2896,11 +3076,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#21",
+          "compName": "Splitter#15",
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O35"
         },
         "name": "unnamedWire#176",
@@ -2908,11 +3088,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O36"
         },
         "pin2": {
-          "compName": "Splitter#21",
+          "compName": "Splitter#15",
           "pinName": "O1"
         },
         "name": "unnamedWire#177",
@@ -2920,11 +3100,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#23",
+          "compName": "Splitter#17",
           "pinName": "I"
         },
         "pin2": {
-          "compName": "Splitter#20",
+          "compName": "Splitter#14",
           "pinName": "I"
         },
         "name": "unnamedWire#178",
@@ -2941,11 +3121,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#22",
+          "compName": "Splitter#16",
           "pinName": "I"
         },
         "pin2": {
-          "compName": "Splitter#24",
+          "compName": "Splitter#18",
           "pinName": "I"
         },
         "name": "unnamedWire#179",
@@ -2991,11 +3171,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#25",
+          "compName": "Splitter#19",
           "pinName": "I"
         },
         "pin2": {
-          "compName": "Splitter#21",
+          "compName": "Splitter#15",
           "pinName": "I"
         },
         "name": "unnamedWire#180",
@@ -3012,11 +3192,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#23",
+          "compName": "Splitter#17",
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "Splitter#19",
+          "compName": "Splitter#13",
           "pinName": "O0"
         },
         "name": "unnamedWire#181",
@@ -3024,11 +3204,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#23",
+          "compName": "Splitter#17",
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "Splitter#19",
+          "compName": "Splitter#13",
           "pinName": "O1"
         },
         "name": "unnamedWire#182",
@@ -3036,11 +3216,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#19",
+          "compName": "Splitter#13",
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "Splitter#23",
+          "compName": "Splitter#17",
           "pinName": "O2"
         },
         "name": "unnamedWire#183",
@@ -3048,11 +3228,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#23",
+          "compName": "Splitter#17",
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "Splitter#19",
+          "compName": "Splitter#13",
           "pinName": "O3"
         },
         "name": "unnamedWire#184",
@@ -3060,11 +3240,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#19",
+          "compName": "Splitter#13",
           "pinName": "O4"
         },
         "pin2": {
-          "compName": "Splitter#23",
+          "compName": "Splitter#17",
           "pinName": "O4"
         },
         "name": "unnamedWire#185",
@@ -3072,11 +3252,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#23",
+          "compName": "Splitter#17",
           "pinName": "O5"
         },
         "pin2": {
-          "compName": "Splitter#19",
+          "compName": "Splitter#13",
           "pinName": "O5"
         },
         "name": "unnamedWire#186",
@@ -3084,11 +3264,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#24",
+          "compName": "Splitter#18",
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "Splitter#19",
+          "compName": "Splitter#13",
           "pinName": "O6"
         },
         "name": "unnamedWire#187",
@@ -3096,11 +3276,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#19",
+          "compName": "Splitter#13",
           "pinName": "O7"
         },
         "pin2": {
-          "compName": "Splitter#24",
+          "compName": "Splitter#18",
           "pinName": "O1"
         },
         "name": "unnamedWire#188",
@@ -3108,11 +3288,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#24",
+          "compName": "Splitter#18",
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "Splitter#19",
+          "compName": "Splitter#13",
           "pinName": "O8"
         },
         "name": "unnamedWire#189",
@@ -3149,11 +3329,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#19",
+          "compName": "Splitter#13",
           "pinName": "O9"
         },
         "pin2": {
-          "compName": "Splitter#24",
+          "compName": "Splitter#18",
           "pinName": "O3"
         },
         "name": "unnamedWire#190",
@@ -3161,11 +3341,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#25",
+          "compName": "Splitter#19",
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "Splitter#19",
+          "compName": "Splitter#13",
           "pinName": "O11"
         },
         "name": "unnamedWire#191",
@@ -3173,11 +3353,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#19",
+          "compName": "Splitter#13",
           "pinName": "O12"
         },
         "pin2": {
-          "compName": "Splitter#25",
+          "compName": "Splitter#19",
           "pinName": "O1"
         },
         "name": "unnamedWire#192",
@@ -3185,11 +3365,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#26",
+          "compName": "Splitter#20",
           "pinName": "O15"
         },
         "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O73"
         },
         "name": "unnamedWire#193",
@@ -3197,11 +3377,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O72"
         },
         "pin2": {
-          "compName": "Splitter#26",
+          "compName": "Splitter#20",
           "pinName": "O14"
         },
         "name": "unnamedWire#194",
@@ -3209,11 +3389,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#26",
+          "compName": "Splitter#20",
           "pinName": "O13"
         },
         "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O71"
         },
         "name": "unnamedWire#195",
@@ -3221,11 +3401,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O70"
         },
         "pin2": {
-          "compName": "Splitter#26",
+          "compName": "Splitter#20",
           "pinName": "O12"
         },
         "name": "unnamedWire#196",
@@ -3233,11 +3413,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#26",
+          "compName": "Splitter#20",
           "pinName": "O11"
         },
         "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O69"
         },
         "name": "unnamedWire#197",
@@ -3245,11 +3425,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O68"
         },
         "pin2": {
-          "compName": "Splitter#26",
+          "compName": "Splitter#20",
           "pinName": "O10"
         },
         "name": "unnamedWire#198",
@@ -3257,11 +3437,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#26",
+          "compName": "Splitter#20",
           "pinName": "O9"
         },
         "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O67"
         },
         "name": "unnamedWire#199",
@@ -3319,11 +3499,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O66"
         },
         "pin2": {
-          "compName": "Splitter#26",
+          "compName": "Splitter#20",
           "pinName": "O8"
         },
         "name": "unnamedWire#200",
@@ -3331,11 +3511,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#26",
+          "compName": "Splitter#20",
           "pinName": "O7"
         },
         "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O65"
         },
         "name": "unnamedWire#201",
@@ -3343,11 +3523,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O64"
         },
         "pin2": {
-          "compName": "Splitter#26",
+          "compName": "Splitter#20",
           "pinName": "O6"
         },
         "name": "unnamedWire#202",
@@ -3355,11 +3535,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#26",
+          "compName": "Splitter#20",
           "pinName": "O5"
         },
         "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O63"
         },
         "name": "unnamedWire#203",
@@ -3367,11 +3547,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O62"
         },
         "pin2": {
-          "compName": "Splitter#26",
+          "compName": "Splitter#20",
           "pinName": "O4"
         },
         "name": "unnamedWire#204",
@@ -3379,11 +3559,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#26",
+          "compName": "Splitter#20",
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O61"
         },
         "name": "unnamedWire#205",
@@ -3391,11 +3571,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O60"
         },
         "pin2": {
-          "compName": "Splitter#26",
+          "compName": "Splitter#20",
           "pinName": "O2"
         },
         "name": "unnamedWire#206",
@@ -3403,11 +3583,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#26",
+          "compName": "Splitter#20",
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O59"
         },
         "name": "unnamedWire#207",
@@ -3415,11 +3595,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O58"
         },
         "pin2": {
-          "compName": "Splitter#26",
+          "compName": "Splitter#20",
           "pinName": "O0"
         },
         "name": "unnamedWire#208",
@@ -3427,11 +3607,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#27",
+          "compName": "Splitter#21",
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O57"
         },
         "name": "unnamedWire#209",
@@ -3460,11 +3640,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O56"
         },
         "pin2": {
-          "compName": "Splitter#27",
+          "compName": "Splitter#21",
           "pinName": "O1"
         },
         "name": "unnamedWire#210",
@@ -3472,11 +3652,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#27",
+          "compName": "Splitter#21",
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O55"
         },
         "name": "unnamedWire#211",
@@ -3484,11 +3664,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O54"
         },
         "pin2": {
-          "compName": "Splitter#28",
+          "compName": "Splitter#22",
           "pinName": "O2"
         },
         "name": "unnamedWire#212",
@@ -3496,11 +3676,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#28",
+          "compName": "Splitter#22",
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O53"
         },
         "name": "unnamedWire#213",
@@ -3508,11 +3688,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O52"
         },
         "pin2": {
-          "compName": "Splitter#28",
+          "compName": "Splitter#22",
           "pinName": "O0"
         },
         "name": "unnamedWire#214",
@@ -3520,11 +3700,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#29",
+          "compName": "Splitter#23",
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O51"
         },
         "name": "unnamedWire#215",
@@ -3532,11 +3712,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O50"
         },
         "pin2": {
-          "compName": "Splitter#29",
+          "compName": "Splitter#23",
           "pinName": "O1"
         },
         "name": "unnamedWire#216",
@@ -3544,11 +3724,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#29",
+          "compName": "Splitter#23",
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O49"
         },
         "name": "unnamedWire#217",
@@ -3556,11 +3736,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#30",
+          "compName": "Splitter#24",
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O48"
         },
         "name": "unnamedWire#218",
@@ -3568,11 +3748,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O47"
         },
         "pin2": {
-          "compName": "Splitter#30",
+          "compName": "Splitter#24",
           "pinName": "O2"
         },
         "name": "unnamedWire#219",
@@ -3601,11 +3781,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#30",
+          "compName": "Splitter#24",
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O46"
         },
         "name": "unnamedWire#220",
@@ -3613,11 +3793,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O45"
         },
         "pin2": {
-          "compName": "Splitter#30",
+          "compName": "Splitter#24",
           "pinName": "O0"
         },
         "name": "unnamedWire#221",
@@ -3625,11 +3805,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#31",
+          "compName": "Splitter#25",
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O40"
         },
         "name": "unnamedWire#222",
@@ -3637,11 +3817,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O41"
         },
         "pin2": {
-          "compName": "Splitter#31",
+          "compName": "Splitter#25",
           "pinName": "O1"
         },
         "name": "unnamedWire#223",
@@ -3649,11 +3829,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#31",
+          "compName": "Splitter#25",
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O42"
         },
         "name": "unnamedWire#224",
@@ -3661,11 +3841,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O43"
         },
         "pin2": {
-          "compName": "Splitter#31",
+          "compName": "Splitter#25",
           "pinName": "O3"
         },
         "name": "unnamedWire#225",
@@ -3677,7 +3857,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#19",
+          "compName": "Splitter#13",
           "pinName": "O10"
         },
         "name": "unnamedWire#226",
@@ -3690,11 +3870,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#33",
+          "compName": "Splitter#27",
           "pinName": "I"
         },
         "pin2": {
-          "compName": "Splitter#29",
+          "compName": "Splitter#23",
           "pinName": "I"
         },
         "name": "unnamedWire#227",
@@ -3702,11 +3882,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#34",
+          "compName": "Splitter#28",
           "pinName": "I"
         },
         "pin2": {
-          "compName": "Splitter#28",
+          "compName": "Splitter#22",
           "pinName": "I"
         },
         "name": "unnamedWire#228",
@@ -3714,11 +3894,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#32",
+          "compName": "Splitter#26",
           "pinName": "I"
         },
         "pin2": {
-          "compName": "Splitter#27",
+          "compName": "Splitter#21",
           "pinName": "I"
         },
         "name": "unnamedWire#229",
@@ -3747,11 +3927,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#35",
+          "compName": "Splitter#29",
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "Splitter#32",
+          "compName": "Splitter#26",
           "pinName": "O0"
         },
         "name": "unnamedWire#230",
@@ -3759,11 +3939,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#32",
+          "compName": "Splitter#26",
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "Splitter#35",
+          "compName": "Splitter#29",
           "pinName": "O1"
         },
         "name": "unnamedWire#231",
@@ -3771,11 +3951,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#35",
+          "compName": "Splitter#29",
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "Splitter#32",
+          "compName": "Splitter#26",
           "pinName": "O2"
         },
         "name": "unnamedWire#232",
@@ -3783,11 +3963,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#34",
+          "compName": "Splitter#28",
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "Splitter#35",
+          "compName": "Splitter#29",
           "pinName": "O3"
         },
         "name": "unnamedWire#233",
@@ -3795,11 +3975,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#35",
+          "compName": "Splitter#29",
           "pinName": "O4"
         },
         "pin2": {
-          "compName": "Splitter#34",
+          "compName": "Splitter#28",
           "pinName": "O1"
         },
         "name": "unnamedWire#234",
@@ -3807,11 +3987,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#35",
+          "compName": "Splitter#29",
           "pinName": "O5"
         },
         "pin2": {
-          "compName": "Splitter#34",
+          "compName": "Splitter#28",
           "pinName": "O2"
         },
         "name": "unnamedWire#235",
@@ -3819,11 +3999,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#35",
+          "compName": "Splitter#29",
           "pinName": "O6"
         },
         "pin2": {
-          "compName": "Splitter#33",
+          "compName": "Splitter#27",
           "pinName": "O0"
         },
         "name": "unnamedWire#236",
@@ -3831,7 +4011,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#33",
+          "compName": "Splitter#27",
           "pinName": "O1"
         },
         "pin2": {
@@ -3843,11 +4023,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#35",
+          "compName": "Splitter#29",
           "pinName": "O8"
         },
         "pin2": {
-          "compName": "Splitter#33",
+          "compName": "Splitter#27",
           "pinName": "O2"
         },
         "name": "unnamedWire#238",
@@ -3859,7 +4039,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#35",
+          "compName": "Splitter#29",
           "pinName": "O7"
         },
         "name": "unnamedWire#239",
@@ -3879,7 +4059,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#19",
+          "compName": "Splitter#13",
           "pinName": "I"
         },
         "pin2": {
@@ -3904,32 +4084,28 @@
       },
       {
         "pin1": {
-          "compName": "Am2900MainMemory#0",
-          "pinName": "RW"
+          "compName": "Splitter#10",
+          "pinName": "O0"
         },
         "pin2": {
-          "compName": "Splitter#16",
-          "pinName": "O0"
+          "compName": "WireCrossPoint#47",
+          "pinName": ""
         },
         "name": "unnamedWire#241",
         "path": [
           {
-            "x": 175.0,
-            "y": 100.0
-          },
-          {
-            "x": 175.0,
-            "y": 265.0
+            "x": 345.0,
+            "y": 320.0
           },
           {
-            "x": 345.0,
-            "y": 265.0
+            "x": 60.0,
+            "y": 320.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "Splitter#11",
+          "compName": "Splitter#5",
           "pinName": "I"
         },
         "pin2": {
@@ -3954,11 +4130,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#36",
+          "compName": "Splitter#30",
           "pinName": "O15"
         },
         "pin2": {
-          "compName": "Splitter#42",
+          "compName": "Splitter#36",
           "pinName": "O3"
         },
         "name": "unnamedWire#243",
@@ -3966,11 +4142,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#42",
+          "compName": "Splitter#36",
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "Splitter#36",
+          "compName": "Splitter#30",
           "pinName": "O14"
         },
         "name": "unnamedWire#244",
@@ -3978,11 +4154,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#36",
+          "compName": "Splitter#30",
           "pinName": "O13"
         },
         "pin2": {
-          "compName": "Splitter#42",
+          "compName": "Splitter#36",
           "pinName": "O1"
         },
         "name": "unnamedWire#245",
@@ -3990,11 +4166,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#42",
+          "compName": "Splitter#36",
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "Splitter#36",
+          "compName": "Splitter#30",
           "pinName": "O12"
         },
         "name": "unnamedWire#246",
@@ -4002,11 +4178,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#36",
+          "compName": "Splitter#30",
           "pinName": "O11"
         },
         "pin2": {
-          "compName": "Splitter#43",
+          "compName": "Splitter#37",
           "pinName": "O3"
         },
         "name": "unnamedWire#247",
@@ -4014,11 +4190,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#43",
+          "compName": "Splitter#37",
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "Splitter#36",
+          "compName": "Splitter#30",
           "pinName": "O10"
         },
         "name": "unnamedWire#248",
@@ -4026,11 +4202,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#36",
+          "compName": "Splitter#30",
           "pinName": "O9"
         },
         "pin2": {
-          "compName": "Splitter#43",
+          "compName": "Splitter#37",
           "pinName": "O1"
         },
         "name": "unnamedWire#249",
@@ -4042,7 +4218,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "NandGate#7",
+          "compName": "NandGate#6",
           "pinName": "A"
         },
         "name": "unnamedWire#25",
@@ -4050,11 +4226,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#43",
+          "compName": "Splitter#37",
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "Splitter#36",
+          "compName": "Splitter#30",
           "pinName": "O8"
         },
         "name": "unnamedWire#250",
@@ -4062,11 +4238,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#36",
+          "compName": "Splitter#30",
           "pinName": "O7"
         },
         "pin2": {
-          "compName": "Splitter#44",
+          "compName": "Splitter#38",
           "pinName": "O3"
         },
         "name": "unnamedWire#251",
@@ -4074,11 +4250,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#44",
+          "compName": "Splitter#38",
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "Splitter#36",
+          "compName": "Splitter#30",
           "pinName": "O6"
         },
         "name": "unnamedWire#252",
@@ -4086,11 +4262,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#36",
+          "compName": "Splitter#30",
           "pinName": "O5"
         },
         "pin2": {
-          "compName": "Splitter#44",
+          "compName": "Splitter#38",
           "pinName": "O1"
         },
         "name": "unnamedWire#253",
@@ -4098,11 +4274,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#44",
+          "compName": "Splitter#38",
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "Splitter#36",
+          "compName": "Splitter#30",
           "pinName": "O4"
         },
         "name": "unnamedWire#254",
@@ -4110,11 +4286,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#36",
+          "compName": "Splitter#30",
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "Splitter#45",
+          "compName": "Splitter#39",
           "pinName": "O3"
         },
         "name": "unnamedWire#255",
@@ -4122,11 +4298,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#45",
+          "compName": "Splitter#39",
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "Splitter#36",
+          "compName": "Splitter#30",
           "pinName": "O2"
         },
         "name": "unnamedWire#256",
@@ -4134,11 +4310,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#36",
+          "compName": "Splitter#30",
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "Splitter#45",
+          "compName": "Splitter#39",
           "pinName": "O1"
         },
         "name": "unnamedWire#257",
@@ -4146,11 +4322,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#45",
+          "compName": "Splitter#39",
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "Splitter#36",
+          "compName": "Splitter#30",
           "pinName": "O0"
         },
         "name": "unnamedWire#258",
@@ -4158,11 +4334,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#38",
+          "compName": "Splitter#32",
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "Splitter#37",
+          "compName": "Splitter#31",
           "pinName": "O15"
         },
         "name": "unnamedWire#259",
@@ -4191,11 +4367,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#37",
+          "compName": "Splitter#31",
           "pinName": "O14"
         },
         "pin2": {
-          "compName": "Splitter#38",
+          "compName": "Splitter#32",
           "pinName": "O2"
         },
         "name": "unnamedWire#260",
@@ -4203,11 +4379,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#38",
+          "compName": "Splitter#32",
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "Splitter#37",
+          "compName": "Splitter#31",
           "pinName": "O13"
         },
         "name": "unnamedWire#261",
@@ -4215,11 +4391,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#37",
+          "compName": "Splitter#31",
           "pinName": "O12"
         },
         "pin2": {
-          "compName": "Splitter#38",
+          "compName": "Splitter#32",
           "pinName": "O0"
         },
         "name": "unnamedWire#262",
@@ -4227,11 +4403,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#39",
+          "compName": "Splitter#33",
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "Splitter#37",
+          "compName": "Splitter#31",
           "pinName": "O11"
         },
         "name": "unnamedWire#263",
@@ -4239,11 +4415,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#37",
+          "compName": "Splitter#31",
           "pinName": "O10"
         },
         "pin2": {
-          "compName": "Splitter#39",
+          "compName": "Splitter#33",
           "pinName": "O2"
         },
         "name": "unnamedWire#264",
@@ -4251,11 +4427,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#39",
+          "compName": "Splitter#33",
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "Splitter#37",
+          "compName": "Splitter#31",
           "pinName": "O9"
         },
         "name": "unnamedWire#265",
@@ -4263,11 +4439,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#37",
+          "compName": "Splitter#31",
           "pinName": "O8"
         },
         "pin2": {
-          "compName": "Splitter#39",
+          "compName": "Splitter#33",
           "pinName": "O0"
         },
         "name": "unnamedWire#266",
@@ -4275,11 +4451,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#40",
+          "compName": "Splitter#34",
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "Splitter#37",
+          "compName": "Splitter#31",
           "pinName": "O7"
         },
         "name": "unnamedWire#267",
@@ -4287,11 +4463,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#37",
+          "compName": "Splitter#31",
           "pinName": "O6"
         },
         "pin2": {
-          "compName": "Splitter#40",
+          "compName": "Splitter#34",
           "pinName": "O2"
         },
         "name": "unnamedWire#268",
@@ -4299,11 +4475,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#40",
+          "compName": "Splitter#34",
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "Splitter#37",
+          "compName": "Splitter#31",
           "pinName": "O5"
         },
         "name": "unnamedWire#269",
@@ -4328,11 +4504,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#37",
+          "compName": "Splitter#31",
           "pinName": "O4"
         },
         "pin2": {
-          "compName": "Splitter#40",
+          "compName": "Splitter#34",
           "pinName": "O0"
         },
         "name": "unnamedWire#270",
@@ -4340,11 +4516,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#41",
+          "compName": "Splitter#35",
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "Splitter#37",
+          "compName": "Splitter#31",
           "pinName": "O3"
         },
         "name": "unnamedWire#271",
@@ -4352,11 +4528,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#37",
+          "compName": "Splitter#31",
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "Splitter#41",
+          "compName": "Splitter#35",
           "pinName": "O2"
         },
         "name": "unnamedWire#272",
@@ -4364,11 +4540,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#41",
+          "compName": "Splitter#35",
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "Splitter#37",
+          "compName": "Splitter#31",
           "pinName": "O1"
         },
         "name": "unnamedWire#273",
@@ -4376,11 +4552,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#37",
+          "compName": "Splitter#31",
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "Splitter#41",
+          "compName": "Splitter#35",
           "pinName": "O0"
         },
         "name": "unnamedWire#274",
@@ -4392,7 +4568,7 @@
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "Splitter#36",
+          "compName": "Splitter#30",
           "pinName": "I"
         },
         "name": "unnamedWire#275",
@@ -4409,7 +4585,7 @@
           "pinName": "S"
         },
         "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O74"
         },
         "name": "unnamedWire#276",
@@ -4438,7 +4614,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#26",
+          "compName": "Splitter#20",
           "pinName": "I"
         },
         "pin2": {
@@ -4471,7 +4647,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#37",
+          "compName": "Splitter#31",
           "pinName": "I"
         },
         "pin2": {
@@ -4682,7 +4858,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#46",
+          "compName": "Splitter#40",
           "pinName": "O1"
         },
         "pin2": {
@@ -4694,7 +4870,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O1"
         },
         "pin2": {
@@ -4705,14 +4881,14 @@
         "path": [
           {
             "x": 355.0,
-            "y": 265.0
+            "y": 320.0
           },
           {
-            "x": 480.0,
-            "y": 265.0
+            "x": 485.0,
+            "y": 320.0
           },
           {
-            "x": 480.0,
+            "x": 485.0,
             "y": 185.0
           }
         ]
@@ -4772,11 +4948,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#48",
+          "compName": "Splitter#42",
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O4"
         },
         "name": "unnamedWire#296",
@@ -4784,11 +4960,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "Splitter#48",
+          "compName": "Splitter#42",
           "pinName": "O1"
         },
         "name": "unnamedWire#297",
@@ -4796,11 +4972,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#48",
+          "compName": "Splitter#42",
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O2"
         },
         "name": "unnamedWire#298",
@@ -4877,7 +5053,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#47",
+          "compName": "Splitter#41",
           "pinName": "O3"
         },
         "pin2": {
@@ -4893,7 +5069,7 @@
           "pinName": "I1_2"
         },
         "pin2": {
-          "compName": "Splitter#47",
+          "compName": "Splitter#41",
           "pinName": "O2"
         },
         "name": "unnamedWire#303",
@@ -4901,7 +5077,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#47",
+          "compName": "Splitter#41",
           "pinName": "O1"
         },
         "pin2": {
@@ -4917,7 +5093,7 @@
           "pinName": "I1_4"
         },
         "pin2": {
-          "compName": "Splitter#47",
+          "compName": "Splitter#41",
           "pinName": "O0"
         },
         "name": "unnamedWire#305",
@@ -4925,7 +5101,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#49",
+          "compName": "Splitter#43",
           "pinName": "O3"
         },
         "pin2": {
@@ -4941,7 +5117,7 @@
           "pinName": "I1_2"
         },
         "pin2": {
-          "compName": "Splitter#49",
+          "compName": "Splitter#43",
           "pinName": "O2"
         },
         "name": "unnamedWire#307",
@@ -4949,7 +5125,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#49",
+          "compName": "Splitter#43",
           "pinName": "O1"
         },
         "pin2": {
@@ -4965,7 +5141,7 @@
           "pinName": "I1_4"
         },
         "pin2": {
-          "compName": "Splitter#49",
+          "compName": "Splitter#43",
           "pinName": "O0"
         },
         "name": "unnamedWire#309",
@@ -4990,11 +5166,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#47",
+          "compName": "Splitter#41",
           "pinName": "I"
         },
         "pin2": {
-          "compName": "Splitter#30",
+          "compName": "Splitter#24",
           "pinName": "I"
         },
         "name": "unnamedWire#310",
@@ -5023,11 +5199,11 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#31",
+          "compName": "Splitter#25",
           "pinName": "I"
         },
         "pin2": {
-          "compName": "Splitter#49",
+          "compName": "Splitter#43",
           "pinName": "I"
         },
         "name": "unnamedWire#311",
@@ -5068,7 +5244,7 @@
           "pinName": "S0"
         },
         "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O44"
         },
         "name": "unnamedWire#312",
@@ -5109,7 +5285,7 @@
           "pinName": "S0"
         },
         "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#10",
           "pinName": "O39"
         },
         "name": "unnamedWire#313",
@@ -5150,7 +5326,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#35",
+          "compName": "Splitter#29",
           "pinName": "I"
         },
         "name": "unnamedWire#314",
@@ -5280,7 +5456,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#38",
+          "compName": "Splitter#32",
           "pinName": "I"
         },
         "pin2": {
@@ -5301,7 +5477,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#39",
+          "compName": "Splitter#33",
           "pinName": "I"
         },
         "pin2": {
@@ -5322,7 +5498,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#40",
+          "compName": "Splitter#34",
           "pinName": "I"
         },
         "pin2": {
@@ -5347,7 +5523,7 @@
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "Splitter#41",
+          "compName": "Splitter#35",
           "pinName": "I"
         },
         "name": "unnamedWire#324",
@@ -5368,7 +5544,7 @@
           "pinName": "D"
         },
         "pin2": {
-          "compName": "Splitter#45",
+          "compName": "Splitter#39",
           "pinName": "I"
         },
         "name": "unnamedWire#325",
@@ -5385,7 +5561,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#44",
+          "compName": "Splitter#38",
           "pinName": "I"
         },
         "pin2": {
@@ -5406,7 +5582,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#43",
+          "compName": "Splitter#37",
           "pinName": "I"
         },
         "pin2": {
@@ -5427,7 +5603,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#42",
+          "compName": "Splitter#36",
           "pinName": "I"
         },
         "pin2": {
@@ -5556,17 +5732,17 @@
         },
         "pin2": {
           "compName": "NandGate#5",
-          "pinName": "B"
+          "pinName": "A"
         },
         "name": "unnamedWire#335",
         "path": [
           {
-            "x": 185.0,
+            "x": 55.0,
             "y": 230.0
           },
           {
-            "x": 185.0,
-            "y": 115.0
+            "x": 55.0,
+            "y": 240.0
           }
         ]
       },
@@ -5576,282 +5752,728 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#32",
-          "pinName": ""
+          "compName": "WireCrossPoint#32",
+          "pinName": ""
+        },
+        "name": "unnamedWire#336",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#3",
+          "pinName": "O3"
+        },
+        "pin2": {
+          "compName": "Splitter#4",
+          "pinName": "O7"
+        },
+        "name": "unnamedWire#337",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#31",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#30",
+          "pinName": ""
+        },
+        "name": "unnamedWire#338",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#30",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
+        },
+        "name": "unnamedWire#339",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#20",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "Am2910#0",
+          "pinName": "C"
+        },
+        "name": "unnamedWire#34",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#3",
+          "pinName": "O2"
+        },
+        "pin2": {
+          "compName": "Splitter#4",
+          "pinName": "O6"
+        },
+        "name": "unnamedWire#340",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#3",
+          "pinName": "O1"
+        },
+        "pin2": {
+          "compName": "Splitter#4",
+          "pinName": "O5"
+        },
+        "name": "unnamedWire#341",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#3",
+          "pinName": "O0"
+        },
+        "pin2": {
+          "compName": "Splitter#4",
+          "pinName": "O4"
+        },
+        "name": "unnamedWire#342",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#4",
+          "pinName": "I"
+        },
+        "pin2": {
+          "compName": "mux1_12#0",
+          "pinName": "I0"
+        },
+        "name": "unnamedWire#343",
+        "path": [
+          {
+            "x": 260.0,
+            "y": 440.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#52",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "NandGate#7",
+          "pinName": "B"
+        },
+        "name": "unnamedWire#344",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#10",
+          "pinName": "O38"
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#37",
+          "pinName": ""
+        },
+        "name": "unnamedWire#345",
+        "path": [
+          {
+            "x": 725.0,
+            "y": 805.0
+          },
+          {
+            "x": 825.0,
+            "y": 805.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#38",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#53",
+          "pinName": ""
+        },
+        "name": "unnamedWire#346",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#42",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "dff16#0",
+          "pinName": "C"
+        },
+        "name": "unnamedWire#347",
+        "path": [
+          {
+            "x": 365.0,
+            "y": 110.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#42",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "dff16_invwe#0",
+          "pinName": "C"
+        },
+        "name": "unnamedWire#348",
+        "path": [
+          {
+            "x": 480.0,
+            "y": 290.0
+          },
+          {
+            "x": 480.0,
+            "y": 170.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#43",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "Am2910#0",
+          "pinName": "Y"
+        },
+        "name": "unnamedWire#349",
+        "path": [
+          {
+            "x": 440.0,
+            "y": 565.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "FixedOutput#1",
+          "pinName": "out"
+        },
+        "pin2": {
+          "compName": "Am2904#0",
+          "pinName": "_OECT"
+        },
+        "name": "unnamedWire#35",
+        "path": [
+          {
+            "x": 660.0,
+            "y": 390.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#43",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "BitDisplay#0",
+          "pinName": ""
+        },
+        "name": "unnamedWire#350",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "Am2900MainMemory#0",
+          "pinName": "A"
+        },
+        "pin2": {
+          "compName": "dff16#1",
+          "pinName": "Q"
+        },
+        "name": "unnamedWire#351",
+        "path": [
+          {
+            "x": 170.0,
+            "y": 100.0
+          },
+          {
+            "x": 170.0,
+            "y": 125.0
+          },
+          {
+            "x": 230.0,
+            "y": 125.0
+          },
+          {
+            "x": 230.0,
+            "y": 90.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#44",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#42",
+          "pinName": ""
+        },
+        "name": "unnamedWire#352",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#53",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#44",
+          "pinName": ""
+        },
+        "name": "unnamedWire#353",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#53",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#45",
+          "pinName": ""
+        },
+        "name": "unnamedWire#354",
+        "path": [
+          {
+            "x": 130.0,
+            "y": 315.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#44",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "dff16#1",
+          "pinName": "C"
+        },
+        "name": "unnamedWire#355",
+        "path": [
+          {
+            "x": 175.0,
+            "y": 70.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#45",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "dff#2",
+          "pinName": "C"
+        },
+        "name": "unnamedWire#356",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#45",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#46",
+          "pinName": ""
+        },
+        "name": "unnamedWire#357",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "and#5",
+          "pinName": "Y"
+        },
+        "pin2": {
+          "compName": "TriStateBuffer#4",
+          "pinName": "EN"
+        },
+        "name": "unnamedWire#358",
+        "path": [
+          {
+            "x": 225.0,
+            "y": 245.0
+          },
+          {
+            "x": 225.0,
+            "y": 200.0
+          },
+          {
+            "x": 195.0,
+            "y": 200.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "dff#0",
+          "pinName": "Q"
+        },
+        "pin2": {
+          "compName": "TriStateBuffer#5",
+          "pinName": "EN"
+        },
+        "name": "unnamedWire#359",
+        "path": [
+          {
+            "x": 230.0,
+            "y": 270.0
+          },
+          {
+            "x": 230.0,
+            "y": 170.0
+          },
+          {
+            "x": 195.0,
+            "y": 170.0
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "FixedOutput#2",
+          "pinName": "out"
+        },
+        "pin2": {
+          "compName": "Am2910#0",
+          "pinName": "_RLD"
+        },
+        "name": "unnamedWire#36",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#47",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "WireCrossPoint#52",
+          "pinName": ""
+        },
+        "name": "unnamedWire#360",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#49",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "NandGate#7",
+          "pinName": "A"
         },
-        "name": "unnamedWire#336",
+        "name": "unnamedWire#361",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "O3"
+          "compName": "WireCrossPoint#48",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#4",
-          "pinName": "O7"
+          "compName": "and#3",
+          "pinName": "A"
         },
-        "name": "unnamedWire#337",
+        "name": "unnamedWire#362",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#31",
-          "pinName": ""
+          "compName": "and#4",
+          "pinName": "Y"
         },
         "pin2": {
-          "compName": "WireCrossPoint#30",
-          "pinName": ""
+          "compName": "dff#0",
+          "pinName": "D"
         },
-        "name": "unnamedWire#338",
+        "name": "unnamedWire#363",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#30",
+          "compName": "WireCrossPoint#49",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
+          "compName": "and#3",
+          "pinName": "B"
         },
-        "name": "unnamedWire#339",
-        "path": []
+        "name": "unnamedWire#364",
+        "path": [
+          {
+            "x": 60.0,
+            "y": 260.0
+          },
+          {
+            "x": 80.0,
+            "y": 260.0
+          },
+          {
+            "x": 80.0,
+            "y": 255.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#20",
+          "compName": "WireCrossPoint#48",
           "pinName": ""
         },
         "pin2": {
-          "compName": "Am2910#0",
-          "pinName": "C"
+          "compName": "and#4",
+          "pinName": "A"
         },
-        "name": "unnamedWire#34",
-        "path": []
+        "name": "unnamedWire#365",
+        "path": [
+          {
+            "x": 85.0,
+            "y": 270.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "O2"
+          "compName": "NandGate#5",
+          "pinName": "Y"
         },
         "pin2": {
-          "compName": "Splitter#4",
-          "pinName": "O6"
+          "compName": "WireCrossPoint#48",
+          "pinName": ""
         },
-        "name": "unnamedWire#340",
+        "name": "unnamedWire#366",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "O1"
+          "compName": "and#3",
+          "pinName": "Y"
         },
         "pin2": {
-          "compName": "Splitter#4",
-          "pinName": "O5"
+          "compName": "dff#1",
+          "pinName": "D"
         },
-        "name": "unnamedWire#341",
+        "name": "unnamedWire#367",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#3",
-          "pinName": "O0"
+          "compName": "NandGate#7",
+          "pinName": "Y"
         },
         "pin2": {
-          "compName": "Splitter#4",
-          "pinName": "O4"
+          "compName": "and#4",
+          "pinName": "B"
         },
-        "name": "unnamedWire#342",
+        "name": "unnamedWire#368",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#4",
-          "pinName": "I"
+          "compName": "WireCrossPoint#50",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "mux1_12#0",
-          "pinName": "I0"
+          "compName": "WireCrossPoint#29",
+          "pinName": ""
         },
-        "name": "unnamedWire#343",
+        "name": "unnamedWire#369",
         "path": [
           {
-            "x": 260.0,
-            "y": 440.0
+            "x": 235.0,
+            "y": 45.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "TriStateBuffer#5",
-          "pinName": "EN"
+          "compName": "Am2910#0",
+          "pinName": "CI"
         },
         "pin2": {
-          "compName": "NandGate#5",
-          "pinName": "Y"
+          "compName": "FixedOutput#3",
+          "pinName": "out"
         },
-        "name": "unnamedWire#344",
+        "name": "unnamedWire#37",
         "path": [
           {
-            "x": 215.0,
-            "y": 110.0
+            "x": 480.0,
+            "y": 540.0
+          },
+          {
+            "x": 480.0,
+            "y": 570.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
-          "pinName": "O38"
+          "compName": "WireCrossPoint#51",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#37",
+          "compName": "TriStateBuffer#5",
+          "pinName": "OUT"
+        },
+        "name": "unnamedWire#370",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#51",
           "pinName": ""
         },
-        "name": "unnamedWire#345",
+        "pin2": {
+          "compName": "TriStateBuffer#4",
+          "pinName": "IN"
+        },
+        "name": "unnamedWire#371",
         "path": [
           {
-            "x": 725.0,
-            "y": 805.0
-          },
-          {
-            "x": 825.0,
-            "y": 805.0
+            "x": 165.0,
+            "y": 185.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#38",
-          "pinName": ""
+          "compName": "TriStateBuffer#5",
+          "pinName": "IN"
         },
         "pin2": {
-          "compName": "WireCrossPoint#42",
+          "compName": "WireCrossPoint#50",
           "pinName": ""
         },
-        "name": "unnamedWire#346",
-        "path": [
-          {
-            "x": 175.0,
-            "y": 290.0
-          }
-        ]
+        "name": "unnamedWire#372",
+        "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#42",
+          "compName": "WireCrossPoint#52",
           "pinName": ""
         },
         "pin2": {
-          "compName": "dff16#0",
-          "pinName": "C"
+          "compName": "WireCrossPoint#49",
+          "pinName": ""
         },
-        "name": "unnamedWire#347",
-        "path": [
-          {
-            "x": 365.0,
-            "y": 110.0
-          }
-        ]
+        "name": "unnamedWire#373",
+        "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#42",
+          "compName": "WireCrossPoint#47",
           "pinName": ""
         },
         "pin2": {
-          "compName": "dff16_invwe#0",
-          "pinName": "C"
+          "compName": "dff#2",
+          "pinName": "D"
         },
-        "name": "unnamedWire#348",
-        "path": [
-          {
-            "x": 485.0,
-            "y": 290.0
-          },
-          {
-            "x": 485.0,
-            "y": 170.0
-          }
-        ]
+        "name": "unnamedWire#374",
+        "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#43",
+          "compName": "WireCrossPoint#46",
           "pinName": ""
         },
         "pin2": {
-          "compName": "Am2910#0",
-          "pinName": "Y"
+          "compName": "dff#0",
+          "pinName": "C"
         },
-        "name": "unnamedWire#349",
-        "path": [
-          {
-            "x": 440.0,
-            "y": 565.0
-          }
-        ]
+        "name": "unnamedWire#375",
+        "path": []
       },
       {
         "pin1": {
-          "compName": "FixedOutput#1",
-          "pinName": "out"
+          "compName": "WireCrossPoint#46",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "Am2904#0",
-          "pinName": "_OECT"
+          "compName": "dff#1",
+          "pinName": "C"
         },
-        "name": "unnamedWire#35",
+        "name": "unnamedWire#376",
         "path": [
           {
-            "x": 660.0,
-            "y": 390.0
+            "x": 130.0,
+            "y": 255.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#43",
-          "pinName": ""
+          "compName": "dff#2",
+          "pinName": "Q"
         },
         "pin2": {
-          "compName": "BitDisplay#0",
-          "pinName": ""
+          "compName": "Am2900MainMemory#0",
+          "pinName": "RW"
         },
-        "name": "unnamedWire#350",
-        "path": []
+        "name": "unnamedWire#377",
+        "path": [
+          {
+            "x": 235.0,
+            "y": 295.0
+          },
+          {
+            "x": 235.0,
+            "y": 210.0
+          },
+          {
+            "x": 160.0,
+            "y": 210.0
+          },
+          {
+            "x": 160.0,
+            "y": 140.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "FixedOutput#2",
-          "pinName": "out"
+          "compName": "dff#1",
+          "pinName": "Q"
         },
         "pin2": {
-          "compName": "Am2910#0",
-          "pinName": "_RLD"
+          "compName": "and#5",
+          "pinName": "A"
         },
-        "name": "unnamedWire#36",
+        "name": "unnamedWire#378",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Am2910#0",
-          "pinName": "CI"
+          "compName": "WireCrossPoint#39",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "FixedOutput#3",
-          "pinName": "out"
+          "compName": "and#5",
+          "pinName": "B"
         },
-        "name": "unnamedWire#37",
+        "name": "unnamedWire#379",
         "path": [
           {
-            "x": 480.0,
-            "y": 540.0
-          },
-          {
-            "x": 480.0,
-            "y": 570.0
+            "x": 180.0,
+            "y": 255.0
           }
         ]
       },
@@ -5993,7 +6615,7 @@
           "pinName": "O15"
         },
         "pin2": {
-          "compName": "Splitter#11",
+          "compName": "Splitter#5",
           "pinName": "O7"
         },
         "name": "unnamedWire#46",
@@ -6001,7 +6623,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#11",
+          "compName": "Splitter#5",
           "pinName": "O6"
         },
         "pin2": {
@@ -6017,7 +6639,7 @@
           "pinName": "O13"
         },
         "pin2": {
-          "compName": "Splitter#11",
+          "compName": "Splitter#5",
           "pinName": "O5"
         },
         "name": "unnamedWire#48",
@@ -6025,7 +6647,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#11",
+          "compName": "Splitter#5",
           "pinName": "O4"
         },
         "pin2": {
@@ -6062,7 +6684,7 @@
           "pinName": "O11"
         },
         "pin2": {
-          "compName": "Splitter#11",
+          "compName": "Splitter#5",
           "pinName": "O3"
         },
         "name": "unnamedWire#50",
@@ -6074,7 +6696,7 @@
           "pinName": "O10"
         },
         "pin2": {
-          "compName": "Splitter#11",
+          "compName": "Splitter#5",
           "pinName": "O2"
         },
         "name": "unnamedWire#51",
@@ -6082,7 +6704,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#11",
+          "compName": "Splitter#5",
           "pinName": "O1"
         },
         "pin2": {
@@ -6098,7 +6720,7 @@
           "pinName": "O8"
         },
         "pin2": {
-          "compName": "Splitter#11",
+          "compName": "Splitter#5",
           "pinName": "O0"
         },
         "name": "unnamedWire#53",
@@ -6127,7 +6749,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#12",
+          "compName": "Splitter#6",
           "pinName": "O3"
         },
         "name": "unnamedWire#55",
@@ -6144,7 +6766,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#7",
           "pinName": "O3"
         },
         "name": "unnamedWire#56",
@@ -6152,7 +6774,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#7",
           "pinName": "O2"
         },
         "pin2": {
@@ -6168,7 +6790,7 @@
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#7",
           "pinName": "O1"
         },
         "name": "unnamedWire#58",
@@ -6176,7 +6798,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#7",
           "pinName": "O0"
         },
         "pin2": {
@@ -6209,7 +6831,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#12",
+          "compName": "Splitter#6",
           "pinName": "O0"
         },
         "pin2": {
@@ -6225,7 +6847,7 @@
           "pinName": "O5"
         },
         "pin2": {
-          "compName": "Splitter#12",
+          "compName": "Splitter#6",
           "pinName": "O1"
         },
         "name": "unnamedWire#61",
@@ -6233,7 +6855,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#12",
+          "compName": "Splitter#6",
           "pinName": "O2"
         },
         "pin2": {
@@ -6362,7 +6984,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#13",
+          "compName": "Splitter#7",
           "pinName": "I"
         },
         "pin2": {
@@ -6383,7 +7005,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#12",
+          "compName": "Splitter#6",
           "pinName": "I"
         },
         "pin2": {
@@ -6408,7 +7030,7 @@
           "pinName": "Y1"
         },
         "pin2": {
-          "compName": "Splitter#14",
+          "compName": "Splitter#8",
           "pinName": "O3"
         },
         "name": "unnamedWire#73",
@@ -6416,7 +7038,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#14",
+          "compName": "Splitter#8",
           "pinName": "O2"
         },
         "pin2": {
@@ -6432,7 +7054,7 @@
           "pinName": "Y3"
         },
         "pin2": {
-          "compName": "Splitter#14",
+          "compName": "Splitter#8",
           "pinName": "O1"
         },
         "name": "unnamedWire#75",
@@ -6440,7 +7062,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#14",
+          "compName": "Splitter#8",
           "pinName": "O0"
         },
         "pin2": {
@@ -6456,7 +7078,7 @@
           "pinName": "Y1"
         },
         "pin2": {
-          "compName": "Splitter#15",
+          "compName": "Splitter#9",
           "pinName": "O3"
         },
         "name": "unnamedWire#77",
@@ -6464,7 +7086,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#15",
+          "compName": "Splitter#9",
           "pinName": "O2"
         },
         "pin2": {
@@ -6480,7 +7102,7 @@
           "pinName": "Y3"
         },
         "pin2": {
-          "compName": "Splitter#15",
+          "compName": "Splitter#9",
           "pinName": "O1"
         },
         "name": "unnamedWire#79",
@@ -6509,7 +7131,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#15",
+          "compName": "Splitter#9",
           "pinName": "O0"
         },
         "pin2": {
@@ -6777,7 +7399,7 @@
       },
       {
         "pin1": {
-          "compName": "@c",
+          "compName": "Clock#0",
           "pinName": ""
         },
         "pin2": {
@@ -6805,7 +7427,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "NandGate#7",
+          "compName": "NandGate#6",
           "pinName": "B"
         },
         "name": "unnamedWire#96",
@@ -6830,7 +7452,7 @@
       },
       {
         "pin1": {
-          "compName": "NandGate#7",
+          "compName": "NandGate#6",
           "pinName": "Y"
         },
         "pin2": {