From: Daniel Kirschten <daniel.kirschten@gmx.de>
Date: Thu, 8 Oct 2020 17:00:35 +0000 (+0200)
Subject: Cleaned dlatch4
X-Git-Url: https://mograsim.net/gitweb/?a=commitdiff_plain;h=05a74a7f2c9df8c93282e935d5d1a7ee0cab8e74;p=Mograsim.git

Cleaned dlatch4
---

diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json
index df8e1587..16e3f842 100644
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json
@@ -238,18 +238,6 @@
       {
         "id": "Splitter",
         "name": "Splitter#5",
-        "pos": {
-          "x": 300.0,
-          "y": 695.0
-        },
-        "params": {
-          "logicWidth": 4,
-          "orientation": "LEFT"
-        }
-      },
-      {
-        "id": "Splitter",
-        "name": "Splitter#6",
         "pos": {
           "x": 360.0,
           "y": 450.0
@@ -261,7 +249,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#7",
+        "name": "Splitter#6",
         "pos": {
           "x": 485.0,
           "y": 405.0
@@ -273,7 +261,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#8",
+        "name": "Splitter#7",
         "pos": {
           "x": 110.0,
           "y": 765.0
@@ -285,7 +273,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#9",
+        "name": "Splitter#8",
         "pos": {
           "x": 110.0,
           "y": 800.0
@@ -297,7 +285,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#10",
+        "name": "Splitter#9",
         "pos": {
           "x": 110.0,
           "y": 835.0
@@ -309,7 +297,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#11",
+        "name": "Splitter#10",
         "pos": {
           "x": 135.0,
           "y": 1000.0
@@ -321,7 +309,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#12",
+        "name": "Splitter#11",
         "pos": {
           "x": 485.0,
           "y": 365.0
@@ -333,10 +321,10 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#13",
+        "name": "Splitter#12",
         "pos": {
-          "x": 760.0,
-          "y": 175.0
+          "x": 695.0,
+          "y": 215.0
         },
         "params": {
           "logicWidth": 4,
@@ -345,7 +333,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#14",
+        "name": "Splitter#13",
         "pos": {
           "x": 640.0,
           "y": 215.0
@@ -357,7 +345,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#15",
+        "name": "Splitter#14",
         "pos": {
           "x": 335.0,
           "y": 930.0
@@ -369,7 +357,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#16",
+        "name": "Splitter#15",
         "pos": {
           "x": 240.0,
           "y": 930.0
@@ -381,7 +369,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#17",
+        "name": "Splitter#16",
         "pos": {
           "x": 135.0,
           "y": 965.0
@@ -393,7 +381,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#18",
+        "name": "Splitter#17",
         "pos": {
           "x": 135.0,
           "y": 1035.0
@@ -405,7 +393,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#19",
+        "name": "Splitter#18",
         "pos": {
           "x": 840.0,
           "y": 760.0
@@ -415,6 +403,18 @@
           "orientation": "RIGHT"
         }
       },
+      {
+        "id": "Splitter",
+        "name": "Splitter#19",
+        "pos": {
+          "x": 695.0,
+          "y": 175.0
+        },
+        "params": {
+          "logicWidth": 4,
+          "orientation": "LEFT"
+        }
+      },
       {
         "id": "TriStateBuffer",
         "name": "TriStateBuffer#0",
@@ -718,7 +718,7 @@
         "name": "dlatch4#0",
         "pos": {
           "x": 720.0,
-          "y": 170.0
+          "y": 175.0
         }
       },
       {
@@ -726,7 +726,7 @@
         "name": "dlatch4#1",
         "pos": {
           "x": 260.0,
-          "y": 690.0
+          "y": 675.0
         }
       },
       {
@@ -773,7 +773,7 @@
     "wires": [
       {
         "pin1": {
-          "compName": "Splitter#19",
+          "compName": "Splitter#18",
           "pinName": "O0"
         },
         "pin2": {
@@ -1005,7 +1005,7 @@
           },
           {
             "x": 715.0,
-            "y": 215.0
+            "y": 210.0
           }
         ]
       },
@@ -1015,7 +1015,7 @@
           "pinName": "O7"
         },
         "pin2": {
-          "compName": "Splitter#19",
+          "compName": "Splitter#18",
           "pinName": "O1"
         },
         "name": "unnamedWire#15",
@@ -1034,7 +1034,7 @@
         "path": [
           {
             "x": 255.0,
-            "y": 735.0
+            "y": 710.0
           }
         ]
       },
@@ -1239,7 +1239,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#14",
+          "compName": "Splitter#13",
           "pinName": "O0"
         },
         "pin2": {
@@ -1251,7 +1251,7 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#14",
+          "compName": "Splitter#13",
           "pinName": "I"
         },
         "pin2": {
@@ -1359,36 +1359,36 @@
       },
       {
         "pin1": {
-          "compName": "ram4#0",
-          "pinName": "QA1"
+          "compName": "Splitter#19",
+          "pinName": "O3"
         },
         "pin2": {
-          "compName": "dlatch4#0",
-          "pinName": "D1"
+          "compName": "ram4#0",
+          "pinName": "QA4"
         },
         "name": "unnamedWire#35",
         "path": []
       },
       {
         "pin1": {
-          "compName": "ram4#0",
-          "pinName": "QA2"
+          "compName": "Splitter#19",
+          "pinName": "O2"
         },
         "pin2": {
-          "compName": "dlatch4#0",
-          "pinName": "D2"
+          "compName": "ram4#0",
+          "pinName": "QA3"
         },
         "name": "unnamedWire#36",
         "path": []
       },
       {
         "pin1": {
-          "compName": "ram4#0",
-          "pinName": "QA3"
+          "compName": "Splitter#19",
+          "pinName": "O1"
         },
         "pin2": {
-          "compName": "dlatch4#0",
-          "pinName": "D3"
+          "compName": "ram4#0",
+          "pinName": "QA2"
         },
         "name": "unnamedWire#37",
         "path": []
@@ -1396,11 +1396,11 @@
       {
         "pin1": {
           "compName": "ram4#0",
-          "pinName": "QA4"
+          "pinName": "QA1"
         },
         "pin2": {
-          "compName": "dlatch4#0",
-          "pinName": "D4"
+          "compName": "Splitter#19",
+          "pinName": "O0"
         },
         "name": "unnamedWire#38",
         "path": []
@@ -1408,118 +1408,50 @@
       {
         "pin1": {
           "compName": "ram4#0",
-          "pinName": "QB1"
+          "pinName": "QB4"
         },
         "pin2": {
-          "compName": "dlatch4#1",
-          "pinName": "D1"
+          "compName": "Splitter#12",
+          "pinName": "O3"
         },
         "name": "unnamedWire#39",
-        "path": [
-          {
-            "x": 695.0,
-            "y": 215.0
-          },
-          {
-            "x": 695.0,
-            "y": 575.0
-          },
-          {
-            "x": 250.0,
-            "y": 575.0
-          },
-          {
-            "x": 250.0,
-            "y": 695.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
-          "compName": "ram4#0",
-          "pinName": "QB2"
+          "compName": "Splitter#12",
+          "pinName": "O2"
         },
         "pin2": {
-          "compName": "dlatch4#1",
-          "pinName": "D2"
+          "compName": "ram4#0",
+          "pinName": "QB3"
         },
         "name": "unnamedWire#40",
-        "path": [
-          {
-            "x": 700.0,
-            "y": 225.0
-          },
-          {
-            "x": 700.0,
-            "y": 570.0
-          },
-          {
-            "x": 245.0,
-            "y": 570.0
-          },
-          {
-            "x": 245.0,
-            "y": 705.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
           "compName": "ram4#0",
-          "pinName": "QB3"
+          "pinName": "QB2"
         },
         "pin2": {
-          "compName": "dlatch4#1",
-          "pinName": "D3"
+          "compName": "Splitter#12",
+          "pinName": "O1"
         },
         "name": "unnamedWire#41",
-        "path": [
-          {
-            "x": 705.0,
-            "y": 235.0
-          },
-          {
-            "x": 705.0,
-            "y": 565.0
-          },
-          {
-            "x": 240.0,
-            "y": 565.0
-          },
-          {
-            "x": 240.0,
-            "y": 715.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
-          "compName": "ram4#0",
-          "pinName": "QB4"
+          "compName": "Splitter#12",
+          "pinName": "O0"
         },
         "pin2": {
-          "compName": "dlatch4#1",
-          "pinName": "D4"
+          "compName": "ram4#0",
+          "pinName": "QB1"
         },
         "name": "unnamedWire#42",
-        "path": [
-          {
-            "x": 710.0,
-            "y": 245.0
-          },
-          {
-            "x": 710.0,
-            "y": 560.0
-          },
-          {
-            "x": 235.0,
-            "y": 560.0
-          },
-          {
-            "x": 235.0,
-            "y": 725.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
@@ -1632,86 +1564,79 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#13",
-          "pinName": "O3"
+          "compName": "Splitter#12",
+          "pinName": "I"
         },
         "pin2": {
-          "compName": "dlatch4#0",
-          "pinName": "Q4"
+          "compName": "dlatch4#1",
+          "pinName": "D"
         },
         "name": "unnamedWire#48",
-        "path": []
+        "path": [
+          {
+            "x": 710.0,
+            "y": 230.0
+          },
+          {
+            "x": 710.0,
+            "y": 582.5
+          },
+          {
+            "x": 255.0,
+            "y": 582.5
+          },
+          {
+            "x": 255.0,
+            "y": 690.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "Splitter#13",
-          "pinName": "O2"
+          "compName": "dlatch4#1",
+          "pinName": "Q"
         },
         "pin2": {
-          "compName": "dlatch4#0",
-          "pinName": "Q3"
+          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
+          "pinName": "B"
         },
         "name": "unnamedWire#49",
         "path": []
       },
       {
         "pin1": {
-          "compName": "dlatch4#0",
-          "pinName": "Q2"
-        },
-        "pin2": {
-          "compName": "Splitter#13",
-          "pinName": "O1"
-        },
-        "name": "unnamedWire#50",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "dlatch4#0",
-          "pinName": "Q1"
-        },
-        "pin2": {
-          "compName": "Splitter#13",
-          "pinName": "O0"
-        },
-        "name": "unnamedWire#51",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#12",
+          "compName": "Splitter#11",
           "pinName": "O3"
         },
         "pin2": {
           "compName": "mux1_4#0",
           "pinName": "I0_4"
         },
-        "name": "unnamedWire#52",
+        "name": "unnamedWire#50",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#12",
+          "compName": "Splitter#11",
           "pinName": "O2"
         },
         "pin2": {
           "compName": "mux1_4#0",
           "pinName": "I0_3"
         },
-        "name": "unnamedWire#53",
+        "name": "unnamedWire#51",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#12",
+          "compName": "Splitter#11",
           "pinName": "O1"
         },
         "pin2": {
           "compName": "mux1_4#0",
           "pinName": "I0_2"
         },
-        "name": "unnamedWire#54",
+        "name": "unnamedWire#52",
         "path": []
       },
       {
@@ -1720,10 +1645,10 @@
           "pinName": "I0_1"
         },
         "pin2": {
-          "compName": "Splitter#12",
+          "compName": "Splitter#11",
           "pinName": "O0"
         },
-        "name": "unnamedWire#55",
+        "name": "unnamedWire#53",
         "path": []
       },
       {
@@ -1732,127 +1657,83 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#13",
-          "pinName": "I"
+          "compName": "dlatch4#0",
+          "pinName": "Q"
         },
-        "name": "unnamedWire#56",
+        "name": "unnamedWire#54",
         "path": [
           {
             "x": 340.0,
-            "y": 70.0
+            "y": 130.0
+          },
+          {
+            "x": 765.0,
+            "y": 130.0
           },
           {
-            "x": 770.0,
-            "y": 70.0
+            "x": 765.0,
+            "y": 190.0
           }
         ]
       },
       {
         "pin1": {
-          "compName": "Splitter#14",
+          "compName": "Splitter#13",
           "pinName": "O1"
         },
         "pin2": {
           "compName": "ram4#0",
           "pinName": "B1"
         },
-        "name": "unnamedWire#57",
+        "name": "unnamedWire#55",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#14",
+          "compName": "Splitter#13",
           "pinName": "O2"
         },
         "pin2": {
           "compName": "ram4#0",
           "pinName": "B2"
         },
-        "name": "unnamedWire#58",
+        "name": "unnamedWire#56",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#14",
+          "compName": "Splitter#13",
           "pinName": "O3"
         },
         "pin2": {
           "compName": "ram4#0",
           "pinName": "B3"
         },
-        "name": "unnamedWire#59",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#5",
-          "pinName": "O3"
-        },
-        "pin2": {
-          "compName": "dlatch4#1",
-          "pinName": "Q4"
-        },
-        "name": "unnamedWire#60",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#5",
-          "pinName": "O2"
-        },
-        "pin2": {
-          "compName": "dlatch4#1",
-          "pinName": "Q3"
-        },
-        "name": "unnamedWire#61",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "dlatch4#1",
-          "pinName": "Q2"
-        },
-        "pin2": {
-          "compName": "Splitter#5",
-          "pinName": "O1"
-        },
-        "name": "unnamedWire#62",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "dlatch4#1",
-          "pinName": "Q1"
-        },
-        "pin2": {
-          "compName": "Splitter#5",
-          "pinName": "O0"
-        },
-        "name": "unnamedWire#63",
+        "name": "unnamedWire#57",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#15",
           "pinName": "O3"
         },
         "pin2": {
           "compName": "dff4#0",
           "pinName": "Q4"
         },
-        "name": "unnamedWire#64",
+        "name": "unnamedWire#58",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#15",
           "pinName": "O2"
         },
         "pin2": {
           "compName": "dff4#0",
           "pinName": "Q3"
         },
-        "name": "unnamedWire#65",
+        "name": "unnamedWire#59",
         "path": []
       },
       {
@@ -1861,34 +1742,34 @@
           "pinName": "Q2"
         },
         "pin2": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#15",
           "pinName": "O1"
         },
-        "name": "unnamedWire#66",
+        "name": "unnamedWire#60",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#15",
           "pinName": "O0"
         },
         "pin2": {
           "compName": "dff4#0",
           "pinName": "Q1"
         },
-        "name": "unnamedWire#67",
+        "name": "unnamedWire#61",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#16",
+          "compName": "Splitter#15",
           "pinName": "I"
         },
         "pin2": {
           "compName": "WireCrossPoint#7",
           "pinName": ""
         },
-        "name": "unnamedWire#68",
+        "name": "unnamedWire#62",
         "path": []
       },
       {
@@ -1897,22 +1778,22 @@
           "pinName": "B4"
         },
         "pin2": {
-          "compName": "Splitter#11",
+          "compName": "Splitter#10",
           "pinName": "O3"
         },
-        "name": "unnamedWire#69",
+        "name": "unnamedWire#63",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#11",
+          "compName": "Splitter#10",
           "pinName": "O2"
         },
         "pin2": {
           "compName": "sel3_4#1",
           "pinName": "B3"
         },
-        "name": "unnamedWire#70",
+        "name": "unnamedWire#64",
         "path": []
       },
       {
@@ -1924,7 +1805,7 @@
           "compName": "WireCrossPoint#18",
           "pinName": ""
         },
-        "name": "unnamedWire#71",
+        "name": "unnamedWire#65",
         "path": [
           {
             "x": 80.0,
@@ -1938,26 +1819,26 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#18",
+          "compName": "Splitter#17",
           "pinName": "O2"
         },
         "pin2": {
           "compName": "sel3_4#1",
           "pinName": "C2"
         },
-        "name": "unnamedWire#72",
+        "name": "unnamedWire#66",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#18",
+          "compName": "Splitter#17",
           "pinName": "O1"
         },
         "pin2": {
           "compName": "sel3_4#1",
           "pinName": "C1"
         },
-        "name": "unnamedWire#73",
+        "name": "unnamedWire#67",
         "path": []
       },
       {
@@ -1966,10 +1847,10 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#18",
+          "compName": "Splitter#17",
           "pinName": "I"
         },
-        "name": "unnamedWire#74",
+        "name": "unnamedWire#68",
         "path": []
       },
       {
@@ -1981,7 +1862,7 @@
           "compName": "WireCrossPoint#7",
           "pinName": ""
         },
-        "name": "unnamedWire#75",
+        "name": "unnamedWire#69",
         "path": [
           {
             "x": 130.0,
@@ -2002,7 +1883,7 @@
           "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
           "pinName": "Q"
         },
-        "name": "unnamedWire#76",
+        "name": "unnamedWire#70",
         "path": [
           {
             "x": 325.0,
@@ -2012,14 +1893,14 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#19",
+          "compName": "Splitter#18",
           "pinName": "O2"
         },
         "pin2": {
           "compName": "Splitter#0",
           "pinName": "O8"
         },
-        "name": "unnamedWire#77",
+        "name": "unnamedWire#71",
         "path": []
       },
       {
@@ -2031,7 +1912,7 @@
           "compName": "WireCrossPoint#19",
           "pinName": ""
         },
-        "name": "unnamedWire#78",
+        "name": "unnamedWire#72",
         "path": [
           {
             "x": 75.0,
@@ -2045,14 +1926,14 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#16",
           "pinName": "I"
         },
         "pin2": {
           "compName": "WireCrossPoint#8",
           "pinName": ""
         },
-        "name": "unnamedWire#79",
+        "name": "unnamedWire#73",
         "path": [
           {
             "x": 130.0,
@@ -2069,7 +1950,7 @@
           "compName": "WireCrossPoint#7",
           "pinName": ""
         },
-        "name": "unnamedWire#80",
+        "name": "unnamedWire#74",
         "path": []
       },
       {
@@ -2078,46 +1959,46 @@
           "pinName": "B2"
         },
         "pin2": {
-          "compName": "Splitter#11",
+          "compName": "Splitter#10",
           "pinName": "O1"
         },
-        "name": "unnamedWire#81",
+        "name": "unnamedWire#75",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#11",
+          "compName": "Splitter#10",
           "pinName": "O0"
         },
         "pin2": {
           "compName": "sel3_4#1",
           "pinName": "B1"
         },
-        "name": "unnamedWire#82",
+        "name": "unnamedWire#76",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#16",
           "pinName": "O0"
         },
         "pin2": {
           "compName": "sel3_4#1",
           "pinName": "A2"
         },
-        "name": "unnamedWire#83",
+        "name": "unnamedWire#77",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#18",
+          "compName": "Splitter#17",
           "pinName": "O3"
         },
         "pin2": {
           "compName": "sel3_4#1",
           "pinName": "C3"
         },
-        "name": "unnamedWire#84",
+        "name": "unnamedWire#78",
         "path": []
       },
       {
@@ -2129,7 +2010,7 @@
           "compName": "_submodelinterface",
           "pinName": "D"
         },
-        "name": "unnamedWire#85",
+        "name": "unnamedWire#79",
         "path": [
           {
             "x": 505.0,
@@ -2154,7 +2035,7 @@
           "compName": "dff4#0",
           "pinName": "D1"
         },
-        "name": "unnamedWire#86",
+        "name": "unnamedWire#80",
         "path": []
       },
       {
@@ -2166,7 +2047,7 @@
           "compName": "dff4#0",
           "pinName": "D2"
         },
-        "name": "unnamedWire#87",
+        "name": "unnamedWire#81",
         "path": []
       },
       {
@@ -2178,7 +2059,7 @@
           "compName": "dff4#0",
           "pinName": "D3"
         },
-        "name": "unnamedWire#88",
+        "name": "unnamedWire#82",
         "path": []
       },
       {
@@ -2190,7 +2071,7 @@
           "compName": "dff4#0",
           "pinName": "D4"
         },
-        "name": "unnamedWire#89",
+        "name": "unnamedWire#83",
         "path": []
       },
       {
@@ -2202,7 +2083,7 @@
           "compName": "_submodelinterface",
           "pinName": "Cn+4"
         },
-        "name": "unnamedWire#90",
+        "name": "unnamedWire#84",
         "path": [
           {
             "x": 615.0,
@@ -2223,7 +2104,7 @@
           "compName": "_submodelinterface",
           "pinName": "OVR"
         },
-        "name": "unnamedWire#91",
+        "name": "unnamedWire#85",
         "path": [
           {
             "x": 610.0,
@@ -2252,7 +2133,7 @@
           "compName": "TriStateBuffer#3",
           "pinName": "IN"
         },
-        "name": "unnamedWire#92",
+        "name": "unnamedWire#86",
         "path": [
           {
             "x": 365.0,
@@ -2262,14 +2143,14 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#6",
+          "compName": "Splitter#5",
           "pinName": "O0"
         },
         "pin2": {
           "compName": "or4#0",
           "pinName": "A1"
         },
-        "name": "unnamedWire#93",
+        "name": "unnamedWire#87",
         "path": []
       },
       {
@@ -2281,7 +2162,7 @@
           "compName": "WireCrossPoint#11",
           "pinName": ""
         },
-        "name": "unnamedWire#94",
+        "name": "unnamedWire#88",
         "path": []
       },
       {
@@ -2293,7 +2174,7 @@
           "compName": "TriStateBuffer#3",
           "pinName": "EN"
         },
-        "name": "unnamedWire#95",
+        "name": "unnamedWire#89",
         "path": []
       },
       {
@@ -2305,7 +2186,7 @@
           "compName": "sel3_4#0",
           "pinName": "C4"
         },
-        "name": "unnamedWire#96",
+        "name": "unnamedWire#90",
         "path": [
           {
             "x": 435.0,
@@ -2338,7 +2219,7 @@
           "compName": "_submodelinterface",
           "pinName": "RAMn+3"
         },
-        "name": "unnamedWire#97",
+        "name": "unnamedWire#91",
         "path": [
           {
             "x": 455.0,
@@ -2352,86 +2233,86 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#6",
+          "compName": "Splitter#5",
           "pinName": "O1"
         },
         "pin2": {
           "compName": "or4#0",
           "pinName": "A2"
         },
-        "name": "unnamedWire#98",
+        "name": "unnamedWire#92",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#6",
+          "compName": "Splitter#5",
           "pinName": "O2"
         },
         "pin2": {
           "compName": "or4#0",
           "pinName": "A3"
         },
-        "name": "unnamedWire#99",
+        "name": "unnamedWire#93",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#6",
+          "compName": "Splitter#5",
           "pinName": "O3"
         },
         "pin2": {
           "compName": "or4#0",
           "pinName": "A4"
         },
-        "name": "unnamedWire#100",
+        "name": "unnamedWire#94",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#7",
+          "compName": "Splitter#6",
           "pinName": "O0"
         },
         "pin2": {
           "compName": "mux1_4#0",
           "pinName": "I1_1"
         },
-        "name": "unnamedWire#101",
+        "name": "unnamedWire#95",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#7",
+          "compName": "Splitter#6",
           "pinName": "O1"
         },
         "pin2": {
           "compName": "mux1_4#0",
           "pinName": "I1_2"
         },
-        "name": "unnamedWire#102",
+        "name": "unnamedWire#96",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#7",
+          "compName": "Splitter#6",
           "pinName": "O2"
         },
         "pin2": {
           "compName": "mux1_4#0",
           "pinName": "I1_3"
         },
-        "name": "unnamedWire#103",
+        "name": "unnamedWire#97",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#7",
+          "compName": "Splitter#6",
           "pinName": "O3"
         },
         "pin2": {
           "compName": "mux1_4#0",
           "pinName": "I1_4"
         },
-        "name": "unnamedWire#104",
+        "name": "unnamedWire#98",
         "path": []
       },
       {
@@ -2440,10 +2321,10 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#6",
+          "compName": "Splitter#5",
           "pinName": "I"
         },
-        "name": "unnamedWire#105",
+        "name": "unnamedWire#99",
         "path": []
       },
       {
@@ -2452,10 +2333,10 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#7",
+          "compName": "Splitter#6",
           "pinName": "I"
         },
-        "name": "unnamedWire#106",
+        "name": "unnamedWire#100",
         "path": [
           {
             "x": 355.0,
@@ -2472,7 +2353,7 @@
           "compName": "WireCrossPoint#13",
           "pinName": ""
         },
-        "name": "unnamedWire#107",
+        "name": "unnamedWire#101",
         "path": []
       },
       {
@@ -2484,7 +2365,7 @@
           "compName": "WireCrossPoint#25",
           "pinName": ""
         },
-        "name": "unnamedWire#108",
+        "name": "unnamedWire#102",
         "path": [
           {
             "x": 380.0,
@@ -2501,7 +2382,7 @@
           "compName": "WireCrossPoint#13",
           "pinName": ""
         },
-        "name": "unnamedWire#109",
+        "name": "unnamedWire#103",
         "path": [
           {
             "x": 105.0,
@@ -2515,10 +2396,10 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#8",
+          "compName": "Splitter#7",
           "pinName": "I"
         },
-        "name": "unnamedWire#110",
+        "name": "unnamedWire#104",
         "path": []
       },
       {
@@ -2527,70 +2408,70 @@
           "pinName": "A4"
         },
         "pin2": {
-          "compName": "Splitter#8",
+          "compName": "Splitter#7",
           "pinName": "O2"
         },
-        "name": "unnamedWire#111",
+        "name": "unnamedWire#105",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#8",
+          "compName": "Splitter#7",
           "pinName": "O1"
         },
         "pin2": {
           "compName": "sel3_4#0",
           "pinName": "A3"
         },
-        "name": "unnamedWire#112",
+        "name": "unnamedWire#106",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#8",
+          "compName": "Splitter#7",
           "pinName": "O0"
         },
         "pin2": {
           "compName": "sel3_4#0",
           "pinName": "A2"
         },
-        "name": "unnamedWire#113",
+        "name": "unnamedWire#107",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#9",
+          "compName": "Splitter#8",
           "pinName": "O0"
         },
         "pin2": {
           "compName": "sel3_4#0",
           "pinName": "B1"
         },
-        "name": "unnamedWire#114",
+        "name": "unnamedWire#108",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#9",
+          "compName": "Splitter#8",
           "pinName": "O1"
         },
         "pin2": {
           "compName": "sel3_4#0",
           "pinName": "B2"
         },
-        "name": "unnamedWire#115",
+        "name": "unnamedWire#109",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#9",
+          "compName": "Splitter#8",
           "pinName": "O2"
         },
         "pin2": {
           "compName": "sel3_4#0",
           "pinName": "B3"
         },
-        "name": "unnamedWire#116",
+        "name": "unnamedWire#110",
         "path": []
       },
       {
@@ -2602,7 +2483,7 @@
           "compName": "WireCrossPoint#18",
           "pinName": ""
         },
-        "name": "unnamedWire#117",
+        "name": "unnamedWire#111",
         "path": [
           {
             "x": 100.0,
@@ -2612,26 +2493,26 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#9",
+          "compName": "Splitter#8",
           "pinName": "O3"
         },
         "pin2": {
           "compName": "sel3_4#0",
           "pinName": "B4"
         },
-        "name": "unnamedWire#118",
+        "name": "unnamedWire#112",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#9",
+          "compName": "Splitter#8",
           "pinName": "I"
         },
         "pin2": {
           "compName": "WireCrossPoint#15",
           "pinName": ""
         },
-        "name": "unnamedWire#119",
+        "name": "unnamedWire#113",
         "path": []
       },
       {
@@ -2643,43 +2524,43 @@
           "compName": "WireCrossPoint#14",
           "pinName": ""
         },
-        "name": "unnamedWire#120",
+        "name": "unnamedWire#114",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#9",
           "pinName": "O3"
         },
         "pin2": {
           "compName": "sel3_4#0",
           "pinName": "C3"
         },
-        "name": "unnamedWire#121",
+        "name": "unnamedWire#115",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#9",
           "pinName": "O2"
         },
         "pin2": {
           "compName": "sel3_4#0",
           "pinName": "C2"
         },
-        "name": "unnamedWire#122",
+        "name": "unnamedWire#116",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#9",
           "pinName": "O1"
         },
         "pin2": {
           "compName": "sel3_4#0",
           "pinName": "C1"
         },
-        "name": "unnamedWire#123",
+        "name": "unnamedWire#117",
         "path": []
       },
       {
@@ -2691,7 +2572,7 @@
           "compName": "WireCrossPoint#16",
           "pinName": ""
         },
-        "name": "unnamedWire#124",
+        "name": "unnamedWire#118",
         "path": []
       },
       {
@@ -2700,46 +2581,46 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#10",
+          "compName": "Splitter#9",
           "pinName": "I"
         },
-        "name": "unnamedWire#125",
+        "name": "unnamedWire#119",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#16",
           "pinName": "O1"
         },
         "pin2": {
           "compName": "sel3_4#1",
           "pinName": "A3"
         },
-        "name": "unnamedWire#126",
+        "name": "unnamedWire#120",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#17",
+          "compName": "Splitter#16",
           "pinName": "O2"
         },
         "pin2": {
           "compName": "sel3_4#1",
           "pinName": "A4"
         },
-        "name": "unnamedWire#127",
+        "name": "unnamedWire#121",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#11",
+          "compName": "Splitter#10",
           "pinName": "I"
         },
         "pin2": {
           "compName": "WireCrossPoint#16",
           "pinName": ""
         },
-        "name": "unnamedWire#128",
+        "name": "unnamedWire#122",
         "path": [
           {
             "x": 105.0,
@@ -2756,7 +2637,7 @@
           "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
           "pinName": "F"
         },
-        "name": "unnamedWire#129",
+        "name": "unnamedWire#123",
         "path": [
           {
             "x": 610.0,
@@ -2774,43 +2655,22 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#12",
+          "compName": "Splitter#11",
           "pinName": "I"
         },
-        "name": "unnamedWire#130",
+        "name": "unnamedWire#124",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Am2901ALUInclSourceDecodeInclFunctionDecode#0",
-          "pinName": "B"
-        },
-        "pin2": {
-          "compName": "Splitter#5",
-          "pinName": "I"
-        },
-        "name": "unnamedWire#131",
-        "path": [
-          {
-            "x": 315.0,
-            "y": 690.0
-          },
-          {
-            "x": 315.0,
-            "y": 710.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#15",
+          "compName": "Splitter#14",
           "pinName": "O0"
         },
         "pin2": {
           "compName": "TriStateBuffer#0",
           "pinName": "IN"
         },
-        "name": "unnamedWire#132",
+        "name": "unnamedWire#125",
         "path": []
       },
       {
@@ -2822,7 +2682,7 @@
           "compName": "ram4#0",
           "pinName": "D1"
         },
-        "name": "unnamedWire#133",
+        "name": "unnamedWire#126",
         "path": [
           {
             "x": 195.0,
@@ -2843,7 +2703,7 @@
           "compName": "ram4#0",
           "pinName": "D2"
         },
-        "name": "unnamedWire#134",
+        "name": "unnamedWire#127",
         "path": [
           {
             "x": 200.0,
@@ -2864,7 +2724,7 @@
           "compName": "ram4#0",
           "pinName": "D3"
         },
-        "name": "unnamedWire#135",
+        "name": "unnamedWire#128",
         "path": [
           {
             "x": 205.0,
@@ -2885,7 +2745,7 @@
           "compName": "ram4#0",
           "pinName": "D4"
         },
-        "name": "unnamedWire#136",
+        "name": "unnamedWire#129",
         "path": [
           {
             "x": 210.0,
@@ -2906,7 +2766,7 @@
           "compName": "and#0",
           "pinName": "A"
         },
-        "name": "unnamedWire#137",
+        "name": "unnamedWire#130",
         "path": []
       },
       {
@@ -2918,7 +2778,7 @@
           "compName": "and#0",
           "pinName": "B"
         },
-        "name": "unnamedWire#138"
+        "name": "unnamedWire#131"
       },
       {
         "pin1": {
@@ -2929,7 +2789,7 @@
           "compName": "ram4#0",
           "pinName": "WE"
         },
-        "name": "unnamedWire#139",
+        "name": "unnamedWire#132",
         "path": [
           {
             "x": 630.0,
@@ -2950,7 +2810,7 @@
           "compName": "dff4#0",
           "pinName": "WE"
         },
-        "name": "unnamedWire#140",
+        "name": "unnamedWire#133",
         "path": [
           {
             "x": 450.0,
@@ -2979,7 +2839,7 @@
           "compName": "mux1_4#0",
           "pinName": "S0"
         },
-        "name": "unnamedWire#141",
+        "name": "unnamedWire#134",
         "path": [
           {
             "x": 435.0,
@@ -2993,14 +2853,14 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#15",
+          "compName": "Splitter#14",
           "pinName": "O3"
         },
         "pin2": {
           "compName": "TriStateBuffer#2",
           "pinName": "IN"
         },
-        "name": "unnamedWire#142",
+        "name": "unnamedWire#135",
         "path": []
       },
       {
@@ -3012,7 +2872,7 @@
           "compName": "Splitter#1",
           "pinName": "I"
         },
-        "name": "unnamedWire#143",
+        "name": "unnamedWire#136",
         "path": []
       },
       {
@@ -3024,7 +2884,7 @@
           "compName": "Splitter#1",
           "pinName": "O2"
         },
-        "name": "unnamedWire#144",
+        "name": "unnamedWire#137",
         "path": [
           {
             "x": 555.0,
@@ -3057,7 +2917,7 @@
           "compName": "WireCrossPoint#17",
           "pinName": ""
         },
-        "name": "unnamedWire#145",
+        "name": "unnamedWire#138",
         "path": []
       },
       {
@@ -3069,7 +2929,7 @@
           "compName": "NandGate#1",
           "pinName": "A"
         },
-        "name": "unnamedWire#146",
+        "name": "unnamedWire#139",
         "path": [
           {
             "x": 415.0,
@@ -3086,7 +2946,7 @@
           "compName": "NandGate#1",
           "pinName": "B"
         },
-        "name": "unnamedWire#147",
+        "name": "unnamedWire#140",
         "path": [
           {
             "x": 415.0,
@@ -3103,7 +2963,7 @@
           "compName": "_submodelinterface",
           "pinName": "F\u003d0"
         },
-        "name": "unnamedWire#148",
+        "name": "unnamedWire#141",
         "path": [
           {
             "x": 445.0,
@@ -3132,7 +2992,7 @@
           "compName": "mux1_4#0",
           "pinName": "Y1"
         },
-        "name": "unnamedWire#149",
+        "name": "unnamedWire#142",
         "path": [
           {
             "x": 765.0,
@@ -3165,7 +3025,7 @@
           "compName": "TriStateBuffer#0",
           "pinName": "OUT"
         },
-        "name": "unnamedWire#150",
+        "name": "unnamedWire#143",
         "path": [
           {
             "x": 100.0,
@@ -3187,10 +3047,10 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#15",
+          "compName": "Splitter#14",
           "pinName": "I"
         },
-        "name": "unnamedWire#151",
+        "name": "unnamedWire#144",
         "path": []
       },
       {
@@ -3202,7 +3062,7 @@
           "compName": "sel3_4#0",
           "pinName": "A1"
         },
-        "name": "unnamedWire#152",
+        "name": "unnamedWire#145",
         "path": [
           {
             "x": 100.0,
@@ -3219,7 +3079,7 @@
           "compName": "TriStateBuffer#1",
           "pinName": "OUT"
         },
-        "name": "unnamedWire#153",
+        "name": "unnamedWire#146",
         "path": [
           {
             "x": 100.0,
@@ -3240,7 +3100,7 @@
           "compName": "Splitter#1",
           "pinName": "O3"
         },
-        "name": "unnamedWire#154",
+        "name": "unnamedWire#147",
         "path": [
           {
             "x": 550.0,
@@ -3265,7 +3125,7 @@
           "compName": "WireCrossPoint#5",
           "pinName": ""
         },
-        "name": "unnamedWire#155",
+        "name": "unnamedWire#148",
         "path": []
       },
       {
@@ -3277,7 +3137,7 @@
           "compName": "TriStateBuffer#1",
           "pinName": "EN"
         },
-        "name": "unnamedWire#156",
+        "name": "unnamedWire#149",
         "path": [
           {
             "x": 395.0,
@@ -3298,7 +3158,7 @@
           "compName": "TriStateBuffer#0",
           "pinName": "EN"
         },
-        "name": "unnamedWire#157",
+        "name": "unnamedWire#150",
         "path": []
       },
       {
@@ -3310,7 +3170,7 @@
           "compName": "WireCrossPoint#20",
           "pinName": ""
         },
-        "name": "unnamedWire#158",
+        "name": "unnamedWire#151",
         "path": []
       },
       {
@@ -3322,7 +3182,7 @@
           "compName": "WireCrossPoint#3",
           "pinName": ""
         },
-        "name": "unnamedWire#159",
+        "name": "unnamedWire#152",
         "path": []
       },
       {
@@ -3334,7 +3194,7 @@
           "compName": "WireCrossPoint#23",
           "pinName": ""
         },
-        "name": "unnamedWire#160",
+        "name": "unnamedWire#153",
         "path": []
       },
       {
@@ -3346,7 +3206,7 @@
           "compName": "WireCrossPoint#23",
           "pinName": ""
         },
-        "name": "unnamedWire#161",
+        "name": "unnamedWire#154",
         "path": []
       },
       {
@@ -3358,7 +3218,7 @@
           "compName": "WireCrossPoint#24",
           "pinName": ""
         },
-        "name": "unnamedWire#162",
+        "name": "unnamedWire#155",
         "path": [
           {
             "x": 145.0,
@@ -3379,7 +3239,7 @@
           "compName": "TriStateBuffer#2",
           "pinName": "OUT"
         },
-        "name": "unnamedWire#163",
+        "name": "unnamedWire#156",
         "path": [
           {
             "x": 425.0,
@@ -3396,7 +3256,7 @@
           "compName": "_submodelinterface",
           "pinName": "Qn+3"
         },
-        "name": "unnamedWire#164",
+        "name": "unnamedWire#157",
         "path": [
           {
             "x": 425.0,
@@ -3413,19 +3273,19 @@
           "compName": "WireCrossPoint#25",
           "pinName": ""
         },
-        "name": "unnamedWire#165",
+        "name": "unnamedWire#158",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#19",
+          "compName": "Splitter#18",
           "pinName": "I"
         },
         "pin2": {
           "compName": "Am2901DestDecode#0",
           "pinName": "I"
         },
-        "name": "unnamedWire#166",
+        "name": "unnamedWire#159",
         "path": [
           {
             "x": 835.0,
@@ -3444,6 +3304,18 @@
             "y": 175.0
           }
         ]
+      },
+      {
+        "pin1": {
+          "compName": "Splitter#19",
+          "pinName": "I"
+        },
+        "pin2": {
+          "compName": "dlatch4#0",
+          "pinName": "D"
+        },
+        "name": "unnamedWire#160",
+        "path": []
       }
     ],
     "version": "0.1.1"
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch4.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch4.json
index bcac03d0..d7b5651f 100644
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch4.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/dlatch4.json
@@ -1,98 +1,68 @@
 {
-  "width": 35.0,
-  "height": 50.0,
+  "width": 40.0,
+  "height": 40.0,
   "interfacePins": [
     {
       "location": {
         "x": 0.0,
-        "y": 45.0
+        "y": 35.0
       },
       "name": "C",
       "logicWidth": 1,
       "usage": "INPUT"
     },
-    {
-      "location": {
-        "x": 0.0,
-        "y": 5.0
-      },
-      "name": "D1",
-      "logicWidth": 1,
-      "usage": "INPUT"
-    },
     {
       "location": {
         "x": 0.0,
         "y": 15.0
       },
-      "name": "D2",
-      "logicWidth": 1,
+      "name": "D",
+      "logicWidth": 4,
       "usage": "INPUT"
     },
     {
       "location": {
-        "x": 0.0,
-        "y": 25.0
-      },
-      "name": "D3",
-      "logicWidth": 1,
-      "usage": "INPUT"
-    },
-    {
-      "location": {
-        "x": 0.0,
-        "y": 35.0
-      },
-      "name": "D4",
-      "logicWidth": 1,
-      "usage": "INPUT"
-    },
-    {
-      "location": {
-        "x": 35.0,
-        "y": 5.0
-      },
-      "name": "Q1",
-      "logicWidth": 1,
-      "usage": "OUTPUT"
-    },
-    {
-      "location": {
-        "x": 35.0,
+        "x": 40.0,
         "y": 15.0
       },
-      "name": "Q2",
-      "logicWidth": 1,
-      "usage": "OUTPUT"
-    },
-    {
-      "location": {
-        "x": 35.0,
-        "y": 25.0
-      },
-      "name": "Q3",
-      "logicWidth": 1,
-      "usage": "OUTPUT"
-    },
-    {
-      "location": {
-        "x": 35.0,
-        "y": 35.0
-      },
-      "name": "Q4",
-      "logicWidth": 1,
+      "name": "Q",
+      "logicWidth": 4,
       "usage": "OUTPUT"
     }
   ],
   "innerScale": 0.4,
   "submodel": {
     "components": [
+      {
+        "id": "Splitter",
+        "name": "Splitter#0",
+        "pos": {
+          "x": 85.0,
+          "y": 22.5
+        },
+        "params": {
+          "logicWidth": 4,
+          "orientation": "LEFT"
+        }
+      },
+      {
+        "id": "Splitter",
+        "name": "Splitter#1",
+        "pos": {
+          "x": 5.0,
+          "y": 22.5
+        },
+        "params": {
+          "logicWidth": 4,
+          "orientation": "RIGHT"
+        }
+      },
       {
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#0",
         "pos": {
-          "x": 14.0,
-          "y": 46.5
+          "x": 29.0,
+          "y": 41.5
         },
         "params": 1
       },
@@ -100,8 +70,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#1",
         "pos": {
-          "x": 14.0,
-          "y": 71.5
+          "x": 29.0,
+          "y": 66.5
         },
         "params": 1
       },
@@ -109,8 +79,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#2",
         "pos": {
-          "x": 14.0,
-          "y": 96.5
+          "x": 29.0,
+          "y": 86.5
         },
         "params": 1
       },
@@ -118,32 +88,32 @@
         "id": "dlatch",
         "name": "dlatch#0",
         "pos": {
-          "x": 30.0,
-          "y": 7.5
+          "x": 35.0,
+          "y": 2.5
         }
       },
       {
         "id": "dlatch",
         "name": "dlatch#1",
         "pos": {
-          "x": 30.0,
-          "y": 32.5
+          "x": 35.0,
+          "y": 27.5
         }
       },
       {
         "id": "dlatch",
         "name": "dlatch#2",
         "pos": {
-          "x": 30.0,
-          "y": 57.5
+          "x": 35.0,
+          "y": 52.5
         }
       },
       {
         "id": "dlatch",
         "name": "dlatch#3",
         "pos": {
-          "x": 30.0,
-          "y": 82.5
+          "x": 35.0,
+          "y": 77.5
         }
       }
     ],
@@ -158,12 +128,7 @@
           "pinName": ""
         },
         "name": "unnamedWire#0",
-        "path": [
-          {
-            "x": 15.0,
-            "y": 112.5
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
@@ -175,7 +140,12 @@
           "pinName": "E"
         },
         "name": "unnamedWire#1",
-        "path": []
+        "path": [
+          {
+            "x": 30.0,
+            "y": 92.5
+          }
+        ]
       },
       {
         "pin1": {
@@ -237,58 +207,85 @@
         "name": "unnamedWire#6",
         "path": [
           {
-            "x": 15.0,
-            "y": 22.5
+            "x": 30.0,
+            "y": 17.5
           }
         ]
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D1"
+          "compName": "Splitter#1",
+          "pinName": "O3"
         },
         "pin2": {
           "compName": "dlatch#0",
           "pinName": "D"
         },
         "name": "unnamedWire#7",
-        "path": []
+        "path": [
+          {
+            "x": 20.0,
+            "y": 22.5
+          },
+          {
+            "x": 20.0,
+            "y": 7.5
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D2"
-        },
-        "pin2": {
           "compName": "dlatch#1",
           "pinName": "D"
         },
+        "pin2": {
+          "compName": "Splitter#1",
+          "pinName": "O2"
+        },
         "name": "unnamedWire#8",
         "path": []
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D3"
+          "compName": "Splitter#1",
+          "pinName": "O1"
         },
         "pin2": {
           "compName": "dlatch#2",
           "pinName": "D"
         },
         "name": "unnamedWire#9",
-        "path": []
+        "path": [
+          {
+            "x": 25.0,
+            "y": 42.5
+          },
+          {
+            "x": 25.0,
+            "y": 57.5
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D4"
-        },
-        "pin2": {
           "compName": "dlatch#3",
           "pinName": "D"
         },
+        "pin2": {
+          "compName": "Splitter#1",
+          "pinName": "O0"
+        },
         "name": "unnamedWire#10",
-        "path": []
+        "path": [
+          {
+            "x": 20.0,
+            "y": 82.5
+          },
+          {
+            "x": 20.0,
+            "y": 52.5
+          }
+        ]
       },
       {
         "pin1": {
@@ -296,11 +293,20 @@
           "pinName": "Q"
         },
         "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Q1"
+          "compName": "Splitter#0",
+          "pinName": "O3"
         },
         "name": "unnamedWire#11",
-        "path": []
+        "path": [
+          {
+            "x": 80.0,
+            "y": 7.5
+          },
+          {
+            "x": 80.0,
+            "y": 22.5
+          }
+        ]
       },
       {
         "pin1": {
@@ -308,34 +314,76 @@
           "pinName": "Q"
         },
         "pin2": {
-          "compName": "_submodelinterface",
-          "pinName": "Q2"
+          "compName": "Splitter#0",
+          "pinName": "O2"
         },
         "name": "unnamedWire#12",
         "path": []
       },
       {
         "pin1": {
+          "compName": "Splitter#0",
+          "pinName": "O1"
+        },
+        "pin2": {
           "compName": "dlatch#2",
           "pinName": "Q"
         },
+        "name": "unnamedWire#13",
+        "path": [
+          {
+            "x": 75.0,
+            "y": 42.5
+          },
+          {
+            "x": 75.0,
+            "y": 57.5
+          }
+        ]
+      },
+      {
+        "pin1": {
+          "compName": "dlatch#3",
+          "pinName": "Q"
+        },
         "pin2": {
+          "compName": "Splitter#0",
+          "pinName": "O0"
+        },
+        "name": "unnamedWire#14",
+        "path": [
+          {
+            "x": 80.0,
+            "y": 82.5
+          },
+          {
+            "x": 80.0,
+            "y": 52.5
+          }
+        ]
+      },
+      {
+        "pin1": {
           "compName": "_submodelinterface",
-          "pinName": "Q3"
+          "pinName": "D"
         },
-        "name": "unnamedWire#13",
+        "pin2": {
+          "compName": "Splitter#1",
+          "pinName": "I"
+        },
+        "name": "unnamedWire#15",
         "path": []
       },
       {
         "pin1": {
-          "compName": "dlatch#3",
-          "pinName": "Q"
+          "compName": "Splitter#0",
+          "pinName": "I"
         },
         "pin2": {
           "compName": "_submodelinterface",
-          "pinName": "Q4"
+          "pinName": "Q"
         },
-        "name": "unnamedWire#14",
+        "name": "unnamedWire#16",
         "path": []
       }
     ],
@@ -374,28 +422,28 @@
       "q1": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "dlatch#0",
+          "delegateTarget": "dlatch#3",
           "subStateID": "q"
         }
       },
       "q2": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "dlatch#1",
+          "delegateTarget": "dlatch#2",
           "subStateID": "q"
         }
       },
       "q3": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "dlatch#2",
+          "delegateTarget": "dlatch#1",
           "subStateID": "q"
         }
       },
       "q4": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "dlatch#3",
+          "delegateTarget": "dlatch#0",
           "subStateID": "q"
         }
       }
diff --git a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram2.json b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram2.json
index 3312bfb4..64d509c7 100644
--- a/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram2.json
+++ b/plugins/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/ram2.json
@@ -186,18 +186,6 @@
       {
         "id": "Splitter",
         "name": "Splitter#2",
-        "pos": {
-          "x": 95.0,
-          "y": 330.0
-        },
-        "params": {
-          "logicWidth": 4,
-          "orientation": "LEFT"
-        }
-      },
-      {
-        "id": "Splitter",
-        "name": "Splitter#3",
         "pos": {
           "x": 285.0,
           "y": 705.0
@@ -209,7 +197,7 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#4",
+        "name": "Splitter#3",
         "pos": {
           "x": 285.0,
           "y": 635.0
@@ -221,34 +209,10 @@
       },
       {
         "id": "Splitter",
-        "name": "Splitter#5",
-        "pos": {
-          "x": 95.0,
-          "y": 435.0
-        },
-        "params": {
-          "logicWidth": 4,
-          "orientation": "LEFT"
-        }
-      },
-      {
-        "id": "Splitter",
-        "name": "Splitter#6",
-        "pos": {
-          "x": 95.0,
-          "y": 540.0
-        },
-        "params": {
-          "logicWidth": 4,
-          "orientation": "LEFT"
-        }
-      },
-      {
-        "id": "Splitter",
-        "name": "Splitter#7",
+        "name": "Splitter#4",
         "pos": {
-          "x": 95.0,
-          "y": 645.0
+          "x": 32.5,
+          "y": 617.5
         },
         "params": {
           "logicWidth": 4,
@@ -294,114 +258,33 @@
       {
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#4",
-        "pos": {
-          "x": 34.0,
-          "y": 539.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#5",
-        "pos": {
-          "x": 39.0,
-          "y": 649.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#6",
-        "pos": {
-          "x": 44.0,
-          "y": 664.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#7",
         "pos": {
           "x": 49.0,
-          "y": 674.0
+          "y": 629.0
         },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#8",
-        "pos": {
-          "x": 34.0,
-          "y": 434.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#9",
-        "pos": {
-          "x": 39.0,
-          "y": 444.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#10",
-        "pos": {
-          "x": 44.0,
-          "y": 454.0
-        },
-        "params": 1
+        "params": 4
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#11",
+        "name": "WireCrossPoint#5",
         "pos": {
           "x": 49.0,
-          "y": 464.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#12",
-        "pos": {
-          "x": 34.0,
-          "y": 549.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#13",
-        "pos": {
-          "x": 39.0,
-          "y": 549.0
-        },
-        "params": 1
-      },
-      {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#14",
-        "pos": {
-          "x": 44.0,
-          "y": 559.0
+          "y": 554.0
         },
-        "params": 1
+        "params": 4
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#15",
+        "name": "WireCrossPoint#6",
         "pos": {
           "x": 49.0,
-          "y": 569.0
+          "y": 449.0
         },
-        "params": 1
+        "params": 4
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#16",
+        "name": "WireCrossPoint#7",
         "pos": {
           "x": 109.0,
           "y": 344.0
@@ -410,7 +293,7 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#17",
+        "name": "WireCrossPoint#8",
         "pos": {
           "x": 109.0,
           "y": 449.0
@@ -419,7 +302,7 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#18",
+        "name": "WireCrossPoint#9",
         "pos": {
           "x": 109.0,
           "y": 554.0
@@ -428,7 +311,7 @@
       },
       {
         "id": "WireCrossPoint",
-        "name": "WireCrossPoint#19",
+        "name": "WireCrossPoint#10",
         "pos": {
           "x": 109.0,
           "y": 659.0
@@ -528,7 +411,7 @@
         "name": "dlatch4#0",
         "pos": {
           "x": 55.0,
-          "y": 325.0
+          "y": 330.0
         }
       },
       {
@@ -536,7 +419,7 @@
         "name": "dlatch4#1",
         "pos": {
           "x": 55.0,
-          "y": 430.0
+          "y": 435.0
         }
       },
       {
@@ -544,7 +427,7 @@
         "name": "dlatch4#2",
         "pos": {
           "x": 55.0,
-          "y": 535.0
+          "y": 540.0
         }
       },
       {
@@ -552,7 +435,7 @@
         "name": "dlatch4#3",
         "pos": {
           "x": 55.0,
-          "y": 640.0
+          "y": 645.0
         }
       }
     ],
@@ -770,7 +653,7 @@
         "path": [
           {
             "x": 30.0,
-            "y": 370.0
+            "y": 365.0
           },
           {
             "x": 30.0,
@@ -795,7 +678,7 @@
           },
           {
             "x": 25.0,
-            "y": 475.0
+            "y": 470.0
           }
         ]
       },
@@ -816,7 +699,7 @@
           },
           {
             "x": 20.0,
-            "y": 580.0
+            "y": 575.0
           }
         ]
       },
@@ -837,564 +720,222 @@
           },
           {
             "x": 15.0,
-            "y": 685.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D1"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#12",
-          "pinName": ""
-        },
-        "name": "unnamedWire#17",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D2"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
-        },
-        "name": "unnamedWire#18",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "_submodelinterface",
-          "pinName": "D3"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#6",
-          "pinName": ""
-        },
-        "name": "unnamedWire#19",
-        "path": [
-          {
-            "x": 45.0,
-            "y": 750.0
+            "y": 680.0
           }
         ]
       },
       {
         "pin1": {
           "compName": "_submodelinterface",
-          "pinName": "D4"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#7",
-          "pinName": ""
-        },
-        "name": "unnamedWire#20",
-        "path": [
-          {
-            "x": 50.0,
-            "y": 850.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#8",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "dlatch4#0",
           "pinName": "D1"
         },
-        "name": "unnamedWire#21",
-        "path": [
-          {
-            "x": 35.0,
-            "y": 330.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#9",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "dlatch4#0",
-          "pinName": "D2"
-        },
-        "name": "unnamedWire#22",
-        "path": [
-          {
-            "x": 40.0,
-            "y": 340.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#10",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "dlatch4#0",
-          "pinName": "D3"
-        },
-        "name": "unnamedWire#23",
-        "path": [
-          {
-            "x": 45.0,
-            "y": 350.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#11",
-          "pinName": ""
-        },
         "pin2": {
-          "compName": "dlatch4#0",
-          "pinName": "D4"
-        },
-        "name": "unnamedWire#24",
-        "path": [
-          {
-            "x": 50.0,
-            "y": 360.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#8",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "dlatch4#1",
-          "pinName": "D1"
-        },
-        "name": "unnamedWire#25",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#9",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "dlatch4#1",
-          "pinName": "D2"
-        },
-        "name": "unnamedWire#26",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#10",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "dlatch4#1",
-          "pinName": "D3"
-        },
-        "name": "unnamedWire#27",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#11",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "dlatch4#1",
-          "pinName": "D4"
-        },
-        "name": "unnamedWire#28",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#8",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
-        },
-        "name": "unnamedWire#29",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#12",
-          "pinName": ""
-        },
-        "name": "unnamedWire#30",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#9",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#13",
-          "pinName": ""
-        },
-        "name": "unnamedWire#31",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#10",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#14",
-          "pinName": ""
-        },
-        "name": "unnamedWire#32",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#11",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#15",
-          "pinName": ""
-        },
-        "name": "unnamedWire#33",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#4",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "dlatch4#2",
-          "pinName": "D1"
-        },
-        "name": "unnamedWire#34",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#13",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "dlatch4#2",
-          "pinName": "D2"
-        },
-        "name": "unnamedWire#35",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#14",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "dlatch4#2",
-          "pinName": "D3"
-        },
-        "name": "unnamedWire#36",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#15",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "dlatch4#2",
-          "pinName": "D4"
-        },
-        "name": "unnamedWire#37",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#13",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
-        },
-        "name": "unnamedWire#38",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#14",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#6",
-          "pinName": ""
-        },
-        "name": "unnamedWire#39",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#15",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#7",
-          "pinName": ""
-        },
-        "name": "unnamedWire#40",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#12",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "dlatch4#3",
-          "pinName": "D1"
-        },
-        "name": "unnamedWire#41",
-        "path": [
-          {
-            "x": 35.0,
-            "y": 645.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "dlatch4#3",
-          "pinName": "D2"
-        },
-        "name": "unnamedWire#42",
-        "path": [
-          {
-            "x": 40.0,
-            "y": 655.0
-          }
-        ]
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#6",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "dlatch4#3",
-          "pinName": "D3"
+          "compName": "Splitter#4",
+          "pinName": "O0"
         },
-        "name": "unnamedWire#43",
+        "name": "unnamedWire#17",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#7",
-          "pinName": ""
+          "compName": "Splitter#4",
+          "pinName": "O1"
         },
         "pin2": {
-          "compName": "dlatch4#3",
-          "pinName": "D4"
+          "compName": "_submodelinterface",
+          "pinName": "D2"
         },
-        "name": "unnamedWire#44",
+        "name": "unnamedWire#18",
         "path": []
       },
       {
         "pin1": {
-          "compName": "dlatch4#0",
-          "pinName": "Q4"
+          "compName": "Splitter#4",
+          "pinName": "O2"
         },
         "pin2": {
-          "compName": "Splitter#2",
-          "pinName": "O3"
+          "compName": "_submodelinterface",
+          "pinName": "D3"
         },
-        "name": "unnamedWire#45",
+        "name": "unnamedWire#19",
         "path": []
       },
       {
         "pin1": {
-          "compName": "dlatch4#0",
-          "pinName": "Q3"
+          "compName": "_submodelinterface",
+          "pinName": "D4"
         },
         "pin2": {
-          "compName": "Splitter#2",
-          "pinName": "O2"
+          "compName": "Splitter#4",
+          "pinName": "O3"
         },
-        "name": "unnamedWire#46",
+        "name": "unnamedWire#20",
         "path": []
       },
       {
         "pin1": {
-          "compName": "dlatch4#0",
-          "pinName": "Q2"
+          "compName": "Splitter#4",
+          "pinName": "I"
         },
         "pin2": {
-          "compName": "Splitter#2",
-          "pinName": "O1"
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
         },
-        "name": "unnamedWire#47",
+        "name": "unnamedWire#21",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "O0"
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "dlatch4#0",
-          "pinName": "Q1"
+          "compName": "dlatch4#3",
+          "pinName": "D"
         },
-        "name": "unnamedWire#48",
-        "path": []
+        "name": "unnamedWire#22",
+        "path": [
+          {
+            "x": 50.0,
+            "y": 660.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "dlatch4#1",
-          "pinName": "Q1"
+          "compName": "WireCrossPoint#4",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#5",
-          "pinName": "O0"
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
         },
-        "name": "unnamedWire#49",
+        "name": "unnamedWire#23",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#5",
-          "pinName": "O1"
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "dlatch4#1",
-          "pinName": "Q2"
+          "compName": "dlatch4#2",
+          "pinName": "D"
         },
-        "name": "unnamedWire#50",
+        "name": "unnamedWire#24",
         "path": []
       },
       {
         "pin1": {
-          "compName": "dlatch4#1",
-          "pinName": "Q3"
+          "compName": "WireCrossPoint#5",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#5",
-          "pinName": "O2"
+          "compName": "WireCrossPoint#6",
+          "pinName": ""
         },
-        "name": "unnamedWire#51",
+        "name": "unnamedWire#25",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#5",
-          "pinName": "O3"
+          "compName": "dlatch4#1",
+          "pinName": "D"
         },
         "pin2": {
-          "compName": "dlatch4#1",
-          "pinName": "Q4"
+          "compName": "WireCrossPoint#6",
+          "pinName": ""
         },
-        "name": "unnamedWire#52",
+        "name": "unnamedWire#26",
         "path": []
       },
       {
         "pin1": {
-          "compName": "dlatch4#2",
-          "pinName": "Q4"
+          "compName": "WireCrossPoint#6",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#6",
-          "pinName": "O3"
+          "compName": "dlatch4#0",
+          "pinName": "D"
         },
-        "name": "unnamedWire#53",
-        "path": []
+        "name": "unnamedWire#27",
+        "path": [
+          {
+            "x": 50.0,
+            "y": 345.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "dlatch4#2",
-          "pinName": "Q3"
+          "compName": "WireCrossPoint#7",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#6",
-          "pinName": "O2"
+          "compName": "dlatch4#0",
+          "pinName": "Q"
         },
-        "name": "unnamedWire#54",
+        "name": "unnamedWire#28",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#6",
-          "pinName": "O1"
+          "compName": "dlatch4#1",
+          "pinName": "Q"
         },
         "pin2": {
-          "compName": "dlatch4#2",
-          "pinName": "Q2"
+          "compName": "WireCrossPoint#8",
+          "pinName": ""
         },
-        "name": "unnamedWire#55",
+        "name": "unnamedWire#29",
         "path": []
       },
       {
         "pin1": {
           "compName": "dlatch4#2",
-          "pinName": "Q1"
+          "pinName": "Q"
         },
         "pin2": {
-          "compName": "Splitter#6",
-          "pinName": "O0"
+          "compName": "WireCrossPoint#9",
+          "pinName": ""
         },
-        "name": "unnamedWire#56",
+        "name": "unnamedWire#30",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#19",
-          "pinName": ""
+          "compName": "dlatch4#3",
+          "pinName": "Q"
         },
         "pin2": {
-          "compName": "Splitter#7",
-          "pinName": "I"
+          "compName": "WireCrossPoint#10",
+          "pinName": ""
         },
-        "name": "unnamedWire#57",
+        "name": "unnamedWire#31",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#19",
+          "compName": "WireCrossPoint#10",
           "pinName": ""
         },
         "pin2": {
           "compName": "andor414#5",
           "pinName": "A"
         },
-        "name": "unnamedWire#58",
+        "name": "unnamedWire#32",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#19",
+          "compName": "WireCrossPoint#10",
           "pinName": ""
         },
         "pin2": {
           "compName": "andor414#2",
           "pinName": "A"
         },
-        "name": "unnamedWire#59",
+        "name": "unnamedWire#33",
         "path": [
           {
             "x": 110.0,
@@ -1402,18 +943,6 @@
           }
         ]
       },
-      {
-        "pin1": {
-          "compName": "Splitter#7",
-          "pinName": "O3"
-        },
-        "pin2": {
-          "compName": "dlatch4#3",
-          "pinName": "Q4"
-        },
-        "name": "unnamedWire#60",
-        "path": []
-      },
       {
         "pin1": {
           "compName": "demux2#0",
@@ -1423,7 +952,7 @@
           "compName": "and41#1",
           "pinName": "B"
         },
-        "name": "unnamedWire#61",
+        "name": "unnamedWire#34",
         "path": [
           {
             "x": 210.0,
@@ -1444,7 +973,7 @@
           "compName": "andor414#0",
           "pinName": "B"
         },
-        "name": "unnamedWire#62",
+        "name": "unnamedWire#35",
         "path": [
           {
             "x": 205.0,
@@ -1465,7 +994,7 @@
           "compName": "andor414#1",
           "pinName": "B"
         },
-        "name": "unnamedWire#63",
+        "name": "unnamedWire#36",
         "path": [
           {
             "x": 200.0,
@@ -1486,7 +1015,7 @@
           "compName": "andor414#2",
           "pinName": "B"
         },
-        "name": "unnamedWire#64",
+        "name": "unnamedWire#37",
         "path": [
           {
             "x": 195.0,
@@ -1507,7 +1036,7 @@
           "compName": "and41#2",
           "pinName": "B"
         },
-        "name": "unnamedWire#65",
+        "name": "unnamedWire#38",
         "path": [
           {
             "x": 130.0,
@@ -1524,7 +1053,7 @@
           "compName": "andor414#3",
           "pinName": "B"
         },
-        "name": "unnamedWire#66",
+        "name": "unnamedWire#39",
         "path": [
           {
             "x": 125.0,
@@ -1541,7 +1070,7 @@
           "compName": "andor414#4",
           "pinName": "B"
         },
-        "name": "unnamedWire#67",
+        "name": "unnamedWire#40",
         "path": [
           {
             "x": 120.0,
@@ -1558,7 +1087,7 @@
           "compName": "andor414#5",
           "pinName": "B"
         },
-        "name": "unnamedWire#68",
+        "name": "unnamedWire#41",
         "path": [
           {
             "x": 115.0,
@@ -1568,26 +1097,14 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#2",
-          "pinName": "I"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#16",
-          "pinName": ""
-        },
-        "name": "unnamedWire#69",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#16",
+          "compName": "WireCrossPoint#7",
           "pinName": ""
         },
         "pin2": {
           "compName": "and41#2",
           "pinName": "A"
         },
-        "name": "unnamedWire#70",
+        "name": "unnamedWire#42",
         "path": []
       },
       {
@@ -1596,10 +1113,10 @@
           "pinName": "A"
         },
         "pin2": {
-          "compName": "WireCrossPoint#16",
+          "compName": "WireCrossPoint#7",
           "pinName": ""
         },
-        "name": "unnamedWire#71",
+        "name": "unnamedWire#43",
         "path": [
           {
             "x": 110.0,
@@ -1616,7 +1133,7 @@
           "compName": "andor414#3",
           "pinName": "C"
         },
-        "name": "unnamedWire#72",
+        "name": "unnamedWire#44",
         "path": [
           {
             "x": 175.0,
@@ -1638,38 +1155,26 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#5",
-          "pinName": "I"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#17",
-          "pinName": ""
-        },
-        "name": "unnamedWire#73",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#17",
+          "compName": "WireCrossPoint#8",
           "pinName": ""
         },
         "pin2": {
           "compName": "andor414#3",
           "pinName": "A"
         },
-        "name": "unnamedWire#74",
+        "name": "unnamedWire#45",
         "path": []
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#17",
+          "compName": "WireCrossPoint#8",
           "pinName": ""
         },
         "pin2": {
           "compName": "andor414#0",
           "pinName": "A"
         },
-        "name": "unnamedWire#75",
+        "name": "unnamedWire#46",
         "path": [
           {
             "x": 110.0,
@@ -1679,50 +1184,14 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#18",
+          "compName": "WireCrossPoint#9",
           "pinName": ""
         },
         "pin2": {
           "compName": "andor414#4",
           "pinName": "A"
         },
-        "name": "unnamedWire#76",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "dlatch4#3",
-          "pinName": "Q3"
-        },
-        "pin2": {
-          "compName": "Splitter#7",
-          "pinName": "O2"
-        },
-        "name": "unnamedWire#77",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "dlatch4#3",
-          "pinName": "Q2"
-        },
-        "pin2": {
-          "compName": "Splitter#7",
-          "pinName": "O1"
-        },
-        "name": "unnamedWire#78",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "Splitter#7",
-          "pinName": "O0"
-        },
-        "pin2": {
-          "compName": "dlatch4#3",
-          "pinName": "Q1"
-        },
-        "name": "unnamedWire#79",
+        "name": "unnamedWire#47",
         "path": []
       },
       {
@@ -1734,7 +1203,7 @@
           "compName": "andor414#4",
           "pinName": "C"
         },
-        "name": "unnamedWire#80",
+        "name": "unnamedWire#48",
         "path": [
           {
             "x": 175.0,
@@ -1763,7 +1232,7 @@
           "compName": "andor414#5",
           "pinName": "C"
         },
-        "name": "unnamedWire#81",
+        "name": "unnamedWire#49",
         "path": [
           {
             "x": 175.0,
@@ -1789,10 +1258,10 @@
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "Splitter#3",
+          "compName": "Splitter#2",
           "pinName": "I"
         },
-        "name": "unnamedWire#82",
+        "name": "unnamedWire#50",
         "path": [
           {
             "x": 175.0,
@@ -1806,14 +1275,14 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#3",
+          "compName": "Splitter#2",
           "pinName": "O0"
         },
         "pin2": {
           "compName": "_submodelinterface",
           "pinName": "QB1"
         },
-        "name": "unnamedWire#83",
+        "name": "unnamedWire#51",
         "path": [
           {
             "x": 335.0,
@@ -1827,26 +1296,14 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#6",
-          "pinName": "I"
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#18",
-          "pinName": ""
-        },
-        "name": "unnamedWire#84",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#18",
+          "compName": "WireCrossPoint#9",
           "pinName": ""
         },
         "pin2": {
           "compName": "andor414#1",
           "pinName": "A"
         },
-        "name": "unnamedWire#85",
+        "name": "unnamedWire#52",
         "path": [
           {
             "x": 110.0,
@@ -1863,7 +1320,7 @@
           "compName": "andor414#0",
           "pinName": "C"
         },
-        "name": "unnamedWire#86",
+        "name": "unnamedWire#53",
         "path": [
           {
             "x": 275.0,
@@ -1892,7 +1349,7 @@
           "compName": "andor414#1",
           "pinName": "C"
         },
-        "name": "unnamedWire#87",
+        "name": "unnamedWire#54",
         "path": [
           {
             "x": 275.0,
@@ -1921,7 +1378,7 @@
           "compName": "andor414#2",
           "pinName": "C"
         },
-        "name": "unnamedWire#88",
+        "name": "unnamedWire#55",
         "path": [
           {
             "x": 275.0,
@@ -1947,22 +1404,22 @@
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "Splitter#4",
+          "compName": "Splitter#3",
           "pinName": "I"
         },
-        "name": "unnamedWire#89",
+        "name": "unnamedWire#56",
         "path": []
       },
       {
         "pin1": {
-          "compName": "Splitter#4",
+          "compName": "Splitter#3",
           "pinName": "O0"
         },
         "pin2": {
           "compName": "_submodelinterface",
           "pinName": "QA1"
         },
-        "name": "unnamedWire#90",
+        "name": "unnamedWire#57",
         "path": [
           {
             "x": 315.0,
@@ -1980,10 +1437,10 @@
           "pinName": "QA2"
         },
         "pin2": {
-          "compName": "Splitter#4",
+          "compName": "Splitter#3",
           "pinName": "O1"
         },
-        "name": "unnamedWire#91",
+        "name": "unnamedWire#58",
         "path": [
           {
             "x": 312.5,
@@ -1997,14 +1454,14 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#4",
+          "compName": "Splitter#3",
           "pinName": "O2"
         },
         "pin2": {
           "compName": "_submodelinterface",
           "pinName": "QA3"
         },
-        "name": "unnamedWire#92",
+        "name": "unnamedWire#59",
         "path": [
           {
             "x": 305.0,
@@ -2022,10 +1479,10 @@
           "pinName": "QA4"
         },
         "pin2": {
-          "compName": "Splitter#4",
+          "compName": "Splitter#3",
           "pinName": "O3"
         },
-        "name": "unnamedWire#93",
+        "name": "unnamedWire#60",
         "path": [
           {
             "x": 300.0,
@@ -2043,10 +1500,10 @@
           "pinName": "QB2"
         },
         "pin2": {
-          "compName": "Splitter#3",
+          "compName": "Splitter#2",
           "pinName": "O1"
         },
-        "name": "unnamedWire#94",
+        "name": "unnamedWire#61",
         "path": [
           {
             "x": 330.0,
@@ -2060,14 +1517,14 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#3",
+          "compName": "Splitter#2",
           "pinName": "O2"
         },
         "pin2": {
           "compName": "_submodelinterface",
           "pinName": "QB3"
         },
-        "name": "unnamedWire#95",
+        "name": "unnamedWire#62",
         "path": [
           {
             "x": 325.0,
@@ -2085,10 +1542,10 @@
           "pinName": "QB4"
         },
         "pin2": {
-          "compName": "Splitter#3",
+          "compName": "Splitter#2",
           "pinName": "O3"
         },
-        "name": "unnamedWire#96",
+        "name": "unnamedWire#63",
         "path": [
           {
             "x": 320.0,
@@ -2109,7 +1566,7 @@
           "compName": "and41#0",
           "pinName": "Y"
         },
-        "name": "unnamedWire#97",
+        "name": "unnamedWire#64",
         "path": [
           {
             "x": 190.0,
@@ -2130,7 +1587,7 @@
           "compName": "and41#0",
           "pinName": "A"
         },
-        "name": "unnamedWire#98",
+        "name": "unnamedWire#65",
         "path": []
       }
     ],