Started layouting the Am2904

[Mograsim.git] / net.mograsim.logic.model.am2900 / components / net / mograsim / logic / model / am2900 / components / am2904 / Am2904.json

diff --git a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904.json b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904.json
index d32bca2..a204e43 100644 (file)
--- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904.json
+++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2904/Am2904.json
@@ -4,8 +4,8 @@
   "interfacePins": [
     {
       "location": {
-        "x": 0.0,
-        "y": 5.0
+        "x": 55.0,
+        "y": 0.0
       },
       "name": "C",
       "logicWidth": 1,
@@ -14,7 +14,7 @@
     {
       "location": {
         "x": 120.0,
-        "y": 108.0
+        "y": 85.0
       },
       "name": "C0",
       "logicWidth": 1,
@@ -23,7 +23,7 @@
     {
       "location": {
         "x": 120.0,
-        "y": 60.0
+        "y": 54.0
       },
       "name": "CT",
       "logicWidth": 1,
@@ -32,7 +32,7 @@
     {
       "location": {
         "x": 0.0,
-        "y": 110.0
+        "y": 85.0
       },
       "name": "Cx",
       "logicWidth": 1,
@@ -41,7 +41,7 @@
     {
       "location": {
         "x": 0.0,
-        "y": 61.0
+        "y": 42.0
       },
       "name": "I",
       "logicWidth": 13,
@@ -104,7 +104,7 @@
     {
       "location": {
         "x": 120.0,
-        "y": 118.0
+        "y": 120.0
       },
       "name": "SIO0",
       "logicWidth": 1,
@@ -122,7 +122,7 @@
     {
       "location": {
         "x": 120.0,
-        "y": 17.0
+        "y": 10.0
       },
       "name": "YC",
       "logicWidth": 1,
@@ -131,7 +131,7 @@
     {
       "location": {
         "x": 120.0,
-        "y": 21.0
+        "y": 15.0
       },
       "name": "YN",
       "logicWidth": 1,
@@ -140,7 +140,7 @@
     {
       "location": {
         "x": 120.0,
-        "y": 25.0
+        "y": 20.0
       },
       "name": "YOVR",
       "logicWidth": 1,
@@ -149,7 +149,7 @@
     {
       "location": {
         "x": 120.0,
-        "y": 11.0
+        "y": 5.0
       },
       "name": "YZ",
       "logicWidth": 1,
@@ -157,8 +157,8 @@
     },
     {
       "location": {
-        "x": 0.0,
-        "y": 30.0
+        "x": 5.0,
+        "y": 0.0
       },
       "name": "_CEM",
       "logicWidth": 1,
@@ -166,8 +166,8 @@
     },
     {
       "location": {
-        "x": 0.0,
-        "y": 33.0
+        "x": 45.0,
+        "y": 0.0
       },
       "name": "_CEmu",
       "logicWidth": 1,
@@ -175,8 +175,8 @@
     },
     {
       "location": {
-        "x": 0.0,
-        "y": 38.0
+        "x": 15.0,
+        "y": 0.0
       },
       "name": "_EC",
       "logicWidth": 1,
@@ -184,8 +184,8 @@
     },
     {
       "location": {
-        "x": 0.0,
-        "y": 40.0
+        "x": 20.0,
+        "y": 0.0
       },
       "name": "_EN",
       "logicWidth": 1,
@@ -193,8 +193,8 @@
     },
     {
       "location": {
-        "x": 0.0,
-        "y": 42.0
+        "x": 25.0,
+        "y": 0.0
       },
       "name": "_EOVR",
       "logicWidth": 1,
@@ -202,8 +202,8 @@
     },
     {
       "location": {
-        "x": 0.0,
-        "y": 36.0
+        "x": 10.0,
+        "y": 0.0
       },
       "name": "_EZ",
       "logicWidth": 1,
@@ -211,8 +211,8 @@
     },
     {
       "location": {
-        "x": 120.0,
-        "y": 51.0
+        "x": 113.0,
+        "y": 0.0
       },
       "name": "_OECT",
       "logicWidth": 1,
@@ -220,7 +220,7 @@
     },
     {
       "location": {
-        "x": 61.0,
+        "x": 90.0,
         "y": 0.0
       },
       "name": "_OEY",
@@ -230,7 +230,7 @@
     {
       "location": {
         "x": 0.0,
-        "y": 83.0
+        "y": 110.0
       },
       "name": "_SE",
       "logicWidth": 1,
@@ -242,238 +242,50 @@
     "components": [
       {
         "id": "Am2904MSR",
-        "name": "DeserializedSubmodelComponent#0",
-        "pos": {
-          "x": 225.0,
-          "y": 95.0
-        }
-      },
-      {
-        "id": "Am2904muSR",
-        "name": "DeserializedSubmodelComponent#1",
-        "pos": {
-          "x": 270.0,
-          "y": 250.0
-        }
-      },
-      {
-        "id": "xor",
-        "name": "DeserializedSubmodelComponent#10",
-        "pos": {
-          "x": 455.0,
-          "y": 355.0
-        }
-      },
-      {
-        "id": "mux1",
-        "name": "DeserializedSubmodelComponent#11",
-        "pos": {
-          "x": 265.0,
-          "y": 515.0
-        }
-      },
-      {
-        "id": "xor",
-        "name": "DeserializedSubmodelComponent#12",
-        "pos": {
-          "x": 315.0,
-          "y": 505.0
-        }
-      },
-      {
-        "id": "mux1",
-        "name": "DeserializedSubmodelComponent#13",
-        "pos": {
-          "x": 365.0,
-          "y": 485.0
-        }
-      },
-      {
-        "id": "mux1",
-        "name": "DeserializedSubmodelComponent#14",
-        "pos": {
-          "x": 415.0,
-          "y": 465.0
-        }
-      },
-      {
-        "id": "mux2",
-        "name": "DeserializedSubmodelComponent#15",
-        "pos": {
-          "x": 435.0,
-          "y": 575.0
-        }
-      },
-      {
-        "id": "mux2",
-        "name": "DeserializedSubmodelComponent#16",
-        "pos": {
-          "x": 435.0,
-          "y": 655.0
-        }
-      },
-      {
-        "id": "mux1",
-        "name": "DeserializedSubmodelComponent#17",
-        "pos": {
-          "x": 190.0,
-          "y": 460.0
-        }
-      },
-      {
-        "id": "mux1",
-        "name": "DeserializedSubmodelComponent#18",
-        "pos": {
-          "x": 135.0,
-          "y": 470.0
-        }
-      },
-      {
-        "id": "and",
-        "name": "DeserializedSubmodelComponent#2",
-        "pos": {
-          "x": 380.0,
-          "y": 125.0
-        }
-      },
-      {
-        "id": "xor",
-        "name": "DeserializedSubmodelComponent#21",
-        "pos": {
-          "x": 250.0,
-          "y": 820.0
-        }
-      },
-      {
-        "id": "mux2",
-        "name": "DeserializedSubmodelComponent#22",
-        "pos": {
-          "x": 120.0,
-          "y": 720.0
-        }
-      },
-      {
-        "id": "mux3",
-        "name": "DeserializedSubmodelComponent#23",
-        "pos": {
-          "x": 300.0,
-          "y": 715.0
-        }
-      },
-      {
-        "id": "mux1_4",
-        "name": "DeserializedSubmodelComponent#3",
-        "pos": {
-          "x": 470.0,
-          "y": 160.0
-        }
-      },
-      {
-        "id": "not4",
-        "name": "DeserializedSubmodelComponent#4",
-        "pos": {
-          "x": 135.0,
-          "y": 40.0
-        }
-      },
-      {
-        "id": "mux1_4",
-        "name": "DeserializedSubmodelComponent#5",
-        "pos": {
-          "x": 415.0,
-          "y": 210.0
-        }
-      },
-      {
-        "id": "Am2904TestLogic",
-        "name": "DeserializedSubmodelComponent#6",
-        "pos": {
-          "x": 225.0,
-          "y": 340.0
-        }
-      },
-      {
-        "id": "mux3",
-        "name": "DeserializedSubmodelComponent#7",
-        "pos": {
-          "x": 300.0,
-          "y": 310.0
-        }
-      },
-      {
-        "id": "xor",
-        "name": "DeserializedSubmodelComponent#8",
-        "pos": {
-          "x": 495.0,
-          "y": 295.0
-        }
-      },
-      {
-        "id": "mux1",
-        "name": "DeserializedSubmodelComponent#9",
+        "name": "Am2904MSR#0",
         "pos": {
-          "x": 450.0,
-          "y": 310.0
+          "x": 205.0,
+          "y": 90.0
         }
       },
       {
         "id": "Am2904RegCTInstrDecode",
         "name": "Am2904RegCTInstrDecode#0",
         "pos": {
-          "x": 50.0,
-          "y": 240.0
+          "x": 180.0,
+          "y": 190.0
         }
       },
       {
         "id": "Am2904ShiftInstrDecode",
         "name": "Am2904ShiftInstrDecode#0",
         "pos": {
-          "x": 50.0,
-          "y": 360.0
+          "x": 100.0,
+          "y": 495.0
         }
       },
       {
-        "id": "BitDisplay",
-        "name": "BitDisplay#0",
-        "pos": {
-          "x": 530.0,
-          "y": 70.0
-        },
-        "params": 4
-      },
-      {
-        "id": "BitDisplay",
-        "name": "BitDisplay#1",
-        "pos": {
-          "x": 565.0,
-          "y": 180.0
-        },
-        "params": 4
-      },
-      {
-        "id": "BitDisplay",
-        "name": "BitDisplay#2",
+        "id": "Am2904TestLogic",
+        "name": "Am2904TestLogic#0",
         "pos": {
-          "x": 530.0,
-          "y": 200.0
-        },
-        "params": 4
+          "x": 260.0,
+          "y": 330.0
+        }
       },
       {
-        "id": "BitDisplay",
-        "name": "BitDisplay#3",
+        "id": "Am2904muSR",
+        "name": "Am2904muSR#0",
         "pos": {
-          "x": 560.0,
-          "y": 150.0
-        },
-        "params": 1
+          "x": 350.0,
+          "y": 95.0
+        }
       },
       {
         "id": "Merger",
         "name": "Merger#0",
         "pos": {
-          "x": 25.0,
-          "y": 315.0
+          "x": 20.0,
+          "y": 220.0
         },
         "params": 6
       },
@@ -481,8 +293,8 @@
         "id": "Merger",
         "name": "Merger#1",
         "pos": {
-          "x": 25.0,
-          "y": 265.0
+          "x": 20.0,
+          "y": 170.0
         },
         "params": 5
       },
@@ -499,8 +311,8 @@
         "id": "Merger",
         "name": "Merger#3",
         "pos": {
-          "x": 510.0,
-          "y": 165.0
+          "x": 520.0,
+          "y": 95.0
         },
         "params": 4
       },
@@ -508,8 +320,8 @@
         "id": "Merger",
         "name": "Merger#4",
         "pos": {
-          "x": 25.0,
-          "y": 245.0
+          "x": 20.0,
+          "y": 150.0
         },
         "params": 2
       },
@@ -517,8 +329,8 @@
         "id": "NandGate",
         "name": "NandGate#0",
         "pos": {
-          "x": 190.0,
-          "y": 145.0
+          "x": 230.0,
+          "y": 10.0
         },
         "params": 1
       },
@@ -526,7 +338,7 @@
         "id": "NandGate",
         "name": "NandGate#1",
         "pos": {
-          "x": 130.0,
+          "x": 140.0,
           "y": 5.0
         },
         "params": 1
@@ -535,17 +347,17 @@
         "id": "NandGate",
         "name": "NandGate#10",
         "pos": {
-          "x": 340.0,
-          "y": 120.0
+          "x": 455.0,
+          "y": 60.0
         },
         "params": 1
       },
       {
         "id": "NandGate",
-        "name": "NandGate#12",
+        "name": "NandGate#11",
         "pos": {
-          "x": 540.0,
-          "y": 265.0
+          "x": 555.0,
+          "y": 235.0
         },
         "params": 1
       },
@@ -553,8 +365,8 @@
         "id": "NandGate",
         "name": "NandGate#2",
         "pos": {
-          "x": 225.0,
-          "y": 195.0
+          "x": 325.0,
+          "y": 55.0
         },
         "params": 1
       },
@@ -562,8 +374,8 @@
         "id": "NandGate",
         "name": "NandGate#3",
         "pos": {
-          "x": 225.0,
-          "y": 215.0
+          "x": 325.0,
+          "y": 75.0
         },
         "params": 1
       },
@@ -571,8 +383,8 @@
         "id": "NandGate",
         "name": "NandGate#4",
         "pos": {
-          "x": 225.0,
-          "y": 155.0
+          "x": 325.0,
+          "y": 15.0
         },
         "params": 1
       },
@@ -580,8 +392,8 @@
         "id": "NandGate",
         "name": "NandGate#5",
         "pos": {
-          "x": 225.0,
-          "y": 175.0
+          "x": 325.0,
+          "y": 35.0
         },
         "params": 1
       },
@@ -589,7 +401,7 @@
         "id": "NandGate",
         "name": "NandGate#6",
         "pos": {
-          "x": 205.0,
+          "x": 185.0,
           "y": 70.0
         },
         "params": 1
@@ -598,7 +410,7 @@
         "id": "NandGate",
         "name": "NandGate#7",
         "pos": {
-          "x": 205.0,
+          "x": 185.0,
           "y": 50.0
         },
         "params": 1
@@ -607,7 +419,7 @@
         "id": "NandGate",
         "name": "NandGate#8",
         "pos": {
-          "x": 205.0,
+          "x": 185.0,
           "y": 30.0
         },
         "params": 1
@@ -616,7 +428,7 @@
         "id": "NandGate",
         "name": "NandGate#9",
         "pos": {
-          "x": 205.0,
+          "x": 185.0,
           "y": 10.0
         },
         "params": 1
@@ -625,8 +437,8 @@
         "id": "Splitter",
         "name": "Splitter#0",
         "pos": {
-          "x": 10.0,
-          "y": 245.0
+          "x": 5.0,
+          "y": 150.0
         },
         "params": 13
       },
@@ -634,8 +446,8 @@
         "id": "Splitter",
         "name": "Splitter#1",
         "pos": {
-          "x": 555.0,
-          "y": 80.0
+          "x": 575.0,
+          "y": 40.0
         },
         "params": 4
       },
@@ -643,8 +455,8 @@
         "id": "Splitter",
         "name": "Splitter#10",
         "pos": {
-          "x": 420.0,
-          "y": 410.0
+          "x": 445.0,
+          "y": 300.0
         },
         "params": 4
       },
@@ -688,8 +500,8 @@
         "id": "Splitter",
         "name": "Splitter#15",
         "pos": {
-          "x": 120.0,
-          "y": 455.0
+          "x": 430.0,
+          "y": 535.0
         },
         "params": 2
       },
@@ -697,8 +509,8 @@
         "id": "Splitter",
         "name": "Splitter#2",
         "pos": {
-          "x": 395.0,
-          "y": 195.0
+          "x": 440.0,
+          "y": 95.0
         },
         "params": 2
       },
@@ -706,8 +518,8 @@
         "id": "Splitter",
         "name": "Splitter#3",
         "pos": {
-          "x": 450.0,
-          "y": 175.0
+          "x": 465.0,
+          "y": 105.0
         },
         "params": 4
       },
@@ -715,8 +527,8 @@
         "id": "Splitter",
         "name": "Splitter#4",
         "pos": {
-          "x": 395.0,
-          "y": 225.0
+          "x": 425.0,
+          "y": 155.0
         },
         "params": 4
       },
@@ -724,8 +536,8 @@
         "id": "Splitter",
         "name": "Splitter#5",
         "pos": {
-          "x": 395.0,
-          "y": 265.0
+          "x": 425.0,
+          "y": 195.0
         },
         "params": 4
       },
@@ -733,8 +545,8 @@
         "id": "Splitter",
         "name": "Splitter#6",
         "pos": {
-          "x": 285.0,
-          "y": 320.0
+          "x": 320.0,
+          "y": 310.0
         },
         "params": 3
       },
@@ -742,8 +554,8 @@
         "id": "Splitter",
         "name": "Splitter#7",
         "pos": {
-          "x": 420.0,
-          "y": 325.0
+          "x": 445.0,
+          "y": 340.0
         },
         "params": 4
       },
@@ -751,8 +563,8 @@
         "id": "Splitter",
         "name": "Splitter#8",
         "pos": {
-          "x": 420.0,
-          "y": 365.0
+          "x": 445.0,
+          "y": 380.0
         },
         "params": 4
       },
@@ -760,8 +572,8 @@
         "id": "Splitter",
         "name": "Splitter#9",
         "pos": {
-          "x": 240.0,
-          "y": 475.0
+          "x": 255.0,
+          "y": 430.0
         },
         "params": 4
       },
@@ -769,8 +581,8 @@
         "id": "TriStateBuffer",
         "name": "TriStateBuffer#0",
         "pos": {
-          "x": 535.0,
-          "y": 165.0
+          "x": 540.0,
+          "y": 75.0
         },
         "params": {
           "logicWidth": 4,
@@ -829,8 +641,8 @@
         "id": "TriStateBuffer",
         "name": "TriStateBuffer#5",
         "pos": {
-          "x": 560.0,
-          "y": 290.0
+          "x": 575.0,
+          "y": 260.0
         },
         "params": {
           "logicWidth": 1,
@@ -841,8 +653,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#0",
         "pos": {
-          "x": 165.0,
-          "y": 150.0
+          "x": 275.0,
+          "y": 60.0
         },
         "params": 1
       },
@@ -850,8 +662,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#1",
         "pos": {
-          "x": 180.0,
-          "y": 135.0
+          "x": 190.0,
+          "y": 140.0
         },
         "params": 4
       },
@@ -859,7 +671,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#10",
         "pos": {
-          "x": 195.0,
+          "x": 180.0,
           "y": 55.0
         },
         "params": 1
@@ -868,7 +680,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#11",
         "pos": {
-          "x": 195.0,
+          "x": 180.0,
           "y": 15.0
         },
         "params": 1
@@ -877,7 +689,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#12",
         "pos": {
-          "x": 195.0,
+          "x": 180.0,
           "y": 35.0
         },
         "params": 1
@@ -886,8 +698,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#13",
         "pos": {
-          "x": 330.0,
-          "y": 125.0
+          "x": 450.0,
+          "y": 65.0
         },
         "params": 1
       },
@@ -895,8 +707,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#14",
         "pos": {
-          "x": 520.0,
-          "y": 190.0
+          "x": 535.0,
+          "y": 110.0
         },
         "params": 4
       },
@@ -904,8 +716,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#15",
         "pos": {
-          "x": 255.0,
-          "y": 265.0
+          "x": 335.0,
+          "y": 175.0
         },
         "params": 4
       },
@@ -913,8 +725,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#16",
         "pos": {
-          "x": 255.0,
-          "y": 255.0
+          "x": 385.0,
+          "y": 165.0
         },
         "params": 4
       },
@@ -922,8 +734,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#17",
         "pos": {
-          "x": 360.0,
-          "y": 495.0
+          "x": 350.0,
+          "y": 440.0
         },
         "params": 1
       },
@@ -949,8 +761,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#2",
         "pos": {
-          "x": 295.0,
-          "y": 120.0
+          "x": 330.0,
+          "y": 125.0
         },
         "params": 4
       },
@@ -976,8 +788,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#22",
         "pos": {
-          "x": 250.0,
-          "y": 540.0
+          "x": 270.0,
+          "y": 515.0
         },
         "params": 1
       },
@@ -985,7 +797,7 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#23",
         "pos": {
-          "x": 330.0,
+          "x": 325.0,
           "y": 640.0
         },
         "params": 1
@@ -1021,8 +833,8 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#27",
         "pos": {
-          "x": 440.0,
-          "y": 385.0
+          "x": 470.0,
+          "y": 400.0
         },
         "params": 1
       },
@@ -1030,8 +842,17 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#28",
         "pos": {
-          "x": 440.0,
-          "y": 345.0
+          "x": 465.0,
+          "y": 350.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#29",
+        "pos": {
+          "x": 550.0,
+          "y": 570.0
         },
         "params": 1
       },
@@ -1039,17 +860,26 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#3",
         "pos": {
-          "x": 335.0,
-          "y": 270.0
+          "x": 405.0,
+          "y": 120.0
         },
         "params": 4
       },
       {
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#30",
+        "pos": {
+          "x": 85.0,
+          "y": 590.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#31",
         "pos": {
           "x": 550.0,
-          "y": 570.0
+          "y": 240.0
         },
         "params": 1
       },
@@ -1057,73 +887,225 @@
         "id": "WireCrossPoint",
         "name": "WireCrossPoint#32",
         "pos": {
-          "x": 85.0,
-          "y": 590.0
+          "x": 405.0,
+          "y": 170.0
+        },
+        "params": 4
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#33",
+        "pos": {
+          "x": 390.0,
+          "y": 210.0
+        },
+        "params": 4
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#4",
+        "pos": {
+          "x": 225.0,
+          "y": 15.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#5",
+        "pos": {
+          "x": 570.0,
+          "y": 55.0
+        },
+        "params": 4
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#6",
+        "pos": {
+          "x": 135.0,
+          "y": 20.0
         },
         "params": 1
       },
       {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#33",
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#7",
+        "pos": {
+          "x": 320.0,
+          "y": 40.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#8",
+        "pos": {
+          "x": 320.0,
+          "y": 20.0
+        },
+        "params": 1
+      },
+      {
+        "id": "WireCrossPoint",
+        "name": "WireCrossPoint#9",
+        "pos": {
+          "x": 320.0,
+          "y": 60.0
+        },
+        "params": 1
+      },
+      {
+        "id": "and",
+        "name": "and#0",
+        "pos": {
+          "x": 495.0,
+          "y": 65.0
+        }
+      },
+      {
+        "id": "mux1",
+        "name": "mux1#0",
+        "pos": {
+          "x": 495.0,
+          "y": 275.0
+        }
+      },
+      {
+        "id": "mux1",
+        "name": "mux1#1",
+        "pos": {
+          "x": 275.0,
+          "y": 475.0
+        }
+      },
+      {
+        "id": "mux1",
+        "name": "mux1#2",
+        "pos": {
+          "x": 355.0,
+          "y": 445.0
+        }
+      },
+      {
+        "id": "mux1",
+        "name": "mux1#3",
+        "pos": {
+          "x": 395.0,
+          "y": 425.0
+        }
+      },
+      {
+        "id": "mux1",
+        "name": "mux1#4",
+        "pos": {
+          "x": 490.0,
+          "y": 530.0
+        }
+      },
+      {
+        "id": "mux1",
+        "name": "mux1#5",
+        "pos": {
+          "x": 445.0,
+          "y": 540.0
+        }
+      },
+      {
+        "id": "mux1_4",
+        "name": "mux1_4#0",
+        "pos": {
+          "x": 480.0,
+          "y": 90.0
+        }
+      },
+      {
+        "id": "mux1_4",
+        "name": "mux1_4#1",
+        "pos": {
+          "x": 440.0,
+          "y": 140.0
+        }
+      },
+      {
+        "id": "mux2",
+        "name": "mux2#0",
+        "pos": {
+          "x": 435.0,
+          "y": 575.0
+        }
+      },
+      {
+        "id": "mux2",
+        "name": "mux2#1",
+        "pos": {
+          "x": 435.0,
+          "y": 655.0
+        }
+      },
+      {
+        "id": "mux2",
+        "name": "mux2#2",
+        "pos": {
+          "x": 120.0,
+          "y": 720.0
+        }
+      },
+      {
+        "id": "mux3",
+        "name": "mux3#0",
         "pos": {
-          "x": 530.0,
-          "y": 270.0
-        },
-        "params": 1
+          "x": 335.0,
+          "y": 300.0
+        }
       },
       {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#4",
+        "id": "mux3",
+        "name": "mux3#1",
         "pos": {
-          "x": 150.0,
-          "y": 160.0
-        },
-        "params": 1
+          "x": 300.0,
+          "y": 715.0
+        }
       },
       {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#5",
+        "id": "not4",
+        "name": "not4#0",
         "pos": {
-          "x": 530.0,
-          "y": 100.0
-        },
-        "params": 4
+          "x": 130.0,
+          "y": 40.0
+        }
       },
       {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#6",
+        "id": "xor",
+        "name": "xor#0",
         "pos": {
-          "x": 120.0,
-          "y": 15.0
-        },
-        "params": 1
+          "x": 535.0,
+          "y": 265.0
+        }
       },
       {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#7",
+        "id": "xor",
+        "name": "xor#1",
         "pos": {
-          "x": 215.0,
-          "y": 180.0
-        },
-        "params": 1
+          "x": 475.0,
+          "y": 315.0
+        }
       },
       {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#8",
+        "id": "xor",
+        "name": "xor#2",
         "pos": {
-          "x": 215.0,
-          "y": 160.0
-        },
-        "params": 1
+          "x": 315.0,
+          "y": 465.0
+        }
       },
       {
-        "id": "WireCrossPoint",
-        "name": "WireCrossPoint#9",
+        "id": "xor",
+        "name": "xor#3",
         "pos": {
-          "x": 215.0,
-          "y": 200.0
-        },
-        "params": 1
+          "x": 250.0,
+          "y": 820.0
+        }
       }
     ],
     "wires": [
@@ -1137,16 +1119,7 @@
           "pinName": ""
         },
         "name": "unnamedWire#0",
-        "path": [
-          {
-            "x": 5.0,
-            "y": 25.0
-          },
-          {
-            "x": 5.0,
-            "y": 10.0
-          }
-        ]
+        "path": []
       },
       {
         "pin1": {
@@ -1154,11 +1127,20 @@
           "pinName": "muSR_MUX"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "Am2904muSR#0",
           "pinName": "MUX"
         },
         "name": "unnamedWire#1",
-        "path": []
+        "path": [
+          {
+            "x": 325.0,
+            "y": 200.0
+          },
+          {
+            "x": 325.0,
+            "y": 115.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -1178,7 +1160,7 @@
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "mux1_4#0",
           "pinName": "I0_4"
         },
         "name": "unnamedWire#100",
@@ -1202,7 +1184,7 @@
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "mux1_4#1",
           "pinName": "I0_1"
         },
         "name": "unnamedWire#102",
@@ -1210,7 +1192,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "mux1_4#1",
           "pinName": "I0_2"
         },
         "pin2": {
@@ -1226,7 +1208,7 @@
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "mux1_4#1",
           "pinName": "I0_3"
         },
         "name": "unnamedWire#104",
@@ -1234,7 +1216,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "mux1_4#1",
           "pinName": "I0_4"
         },
         "pin2": {
@@ -1246,15 +1228,20 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#4",
-          "pinName": "I"
+          "compName": "WireCrossPoint#16",
+          "pinName": ""
         },
         "pin2": {
           "compName": "WireCrossPoint#2",
           "pinName": ""
         },
         "name": "unnamedWire#106",
-        "path": []
+        "path": [
+          {
+            "x": 330.0,
+            "y": 165.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -1262,7 +1249,7 @@
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "mux1_4#1",
           "pinName": "I1_4"
         },
         "name": "unnamedWire#107",
@@ -1270,7 +1257,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "mux1_4#1",
           "pinName": "I1_3"
         },
         "pin2": {
@@ -1286,7 +1273,7 @@
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "mux1_4#1",
           "pinName": "I1_2"
         },
         "name": "unnamedWire#109",
@@ -1306,7 +1293,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "mux1_4#1",
           "pinName": "I1_1"
         },
         "pin2": {
@@ -1318,15 +1305,28 @@
       },
       {
         "pin1": {
-          "compName": "Splitter#5",
+          "compName": "Splitter#7",
           "pinName": "I"
         },
         "pin2": {
-          "compName": "WireCrossPoint#1",
+          "compName": "WireCrossPoint#33",
           "pinName": ""
         },
         "name": "unnamedWire#111",
-        "path": []
+        "path": [
+          {
+            "x": 435.0,
+            "y": 355.0
+          },
+          {
+            "x": 435.0,
+            "y": 245.0
+          },
+          {
+            "x": 390.0,
+            "y": 245.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -1338,7 +1338,12 @@
           "pinName": "IN"
         },
         "name": "unnamedWire#112",
-        "path": []
+        "path": [
+          {
+            "x": 535.0,
+            "y": 85.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -1346,19 +1351,40 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "Am2904TestLogic#0",
           "pinName": "I"
         },
         "name": "unnamedWire#113",
-        "path": []
+        "path": [
+          {
+            "x": 535.0,
+            "y": 260.0
+          },
+          {
+            "x": 385.0,
+            "y": 260.0
+          },
+          {
+            "x": 385.0,
+            "y": 290.0
+          },
+          {
+            "x": 255.0,
+            "y": 290.0
+          },
+          {
+            "x": 255.0,
+            "y": 380.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "Am2904TestLogic#0",
           "pinName": "Y111"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "mux3#0",
           "pinName": "I111"
         },
         "name": "unnamedWire#114",
@@ -1366,11 +1392,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "mux3#0",
           "pinName": "I110"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "Am2904TestLogic#0",
           "pinName": "Y110"
         },
         "name": "unnamedWire#115",
@@ -1378,11 +1404,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "Am2904TestLogic#0",
           "pinName": "Y101"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "mux3#0",
           "pinName": "I101"
         },
         "name": "unnamedWire#116",
@@ -1390,11 +1416,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "mux3#0",
           "pinName": "I100"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "Am2904TestLogic#0",
           "pinName": "Y100"
         },
         "name": "unnamedWire#117",
@@ -1402,11 +1428,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "Am2904TestLogic#0",
           "pinName": "Y011"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "mux3#0",
           "pinName": "I011"
         },
         "name": "unnamedWire#118",
@@ -1414,11 +1440,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "Am2904TestLogic#0",
           "pinName": "Y010"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "mux3#0",
           "pinName": "I010"
         },
         "name": "unnamedWire#119",
@@ -1438,11 +1464,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "mux3#0",
           "pinName": "I001"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "Am2904TestLogic#0",
           "pinName": "Y001"
         },
         "name": "unnamedWire#120",
@@ -1450,11 +1476,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#6",
+          "compName": "Am2904TestLogic#0",
           "pinName": "Y000"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "mux3#0",
           "pinName": "I000"
         },
         "name": "unnamedWire#121",
@@ -1462,7 +1488,7 @@
       },
       {
         "pin1": {
-          "compName": "NandGate#12",
+          "compName": "NandGate#11",
           "pinName": "Y"
         },
         "pin2": {
@@ -1470,15 +1496,20 @@
           "pinName": "EN"
         },
         "name": "unnamedWire#122",
-        "path": []
+        "path": [
+          {
+            "x": 585.0,
+            "y": 245.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#9",
+          "compName": "mux1#0",
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#8",
+          "compName": "xor#0",
           "pinName": "B"
         },
         "name": "unnamedWire#123",
@@ -1494,7 +1525,12 @@
           "pinName": "CT_MUX"
         },
         "name": "unnamedWire#124",
-        "path": []
+        "path": [
+          {
+            "x": 210.0,
+            "y": 320.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -1502,7 +1538,7 @@
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "mux3#0",
           "pinName": "S0"
         },
         "name": "unnamedWire#125",
@@ -1510,7 +1546,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "mux3#0",
           "pinName": "S1"
         },
         "pin2": {
@@ -1526,7 +1562,7 @@
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "mux3#0",
           "pinName": "S2"
         },
         "name": "unnamedWire#127",
@@ -1538,23 +1574,37 @@
           "pinName": "CT_EXP"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#9",
+          "compName": "mux1#0",
           "pinName": "S0"
         },
         "name": "unnamedWire#128",
-        "path": []
+        "path": [
+          {
+            "x": 230.0,
+            "y": 280.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#7",
+          "compName": "mux3#0",
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#9",
+          "compName": "mux1#0",
           "pinName": "I0"
         },
         "name": "unnamedWire#129",
-        "path": []
+        "path": [
+          {
+            "x": 420.0,
+            "y": 310.0
+          },
+          {
+            "x": 420.0,
+            "y": 290.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -1570,7 +1620,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#8",
+          "compName": "xor#0",
           "pinName": "A"
         },
         "pin2": {
@@ -1578,19 +1628,49 @@
           "pinName": "CT_INV"
         },
         "name": "unnamedWire#130",
-        "path": []
+        "path": [
+          {
+            "x": 415.0,
+            "y": 270.0
+          },
+          {
+            "x": 415.0,
+            "y": 285.0
+          },
+          {
+            "x": 220.0,
+            "y": 285.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#10",
+          "compName": "xor#1",
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#9",
+          "compName": "mux1#0",
           "pinName": "I1"
         },
         "name": "unnamedWire#131",
-        "path": []
+        "path": [
+          {
+            "x": 515.0,
+            "y": 320.0
+          },
+          {
+            "x": 515.0,
+            "y": 310.0
+          },
+          {
+            "x": 490.0,
+            "y": 310.0
+          },
+          {
+            "x": 490.0,
+            "y": 300.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -1598,23 +1678,33 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "Am2904muSR#0",
           "pinName": "I"
         },
         "name": "unnamedWire#132",
-        "path": []
+        "path": [
+          {
+            "x": 335.0,
+            "y": 135.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#15",
+          "compName": "WireCrossPoint#33",
           "pinName": ""
         },
         "pin2": {
-          "compName": "Splitter#7",
-          "pinName": "I"
+          "compName": "WireCrossPoint#15",
+          "pinName": ""
         },
         "name": "unnamedWire#133",
-        "path": []
+        "path": [
+          {
+            "x": 390.0,
+            "y": 175.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -1642,12 +1732,12 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#16",
+          "compName": "WireCrossPoint#3",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
-          "pinName": "M"
+          "compName": "WireCrossPoint#32",
+          "pinName": ""
         },
         "name": "unnamedWire#136",
         "path": []
@@ -1662,7 +1752,20 @@
           "pinName": "I"
         },
         "name": "unnamedWire#137",
-        "path": []
+        "path": [
+          {
+            "x": 385.0,
+            "y": 250.0
+          },
+          {
+            "x": 430.0,
+            "y": 250.0
+          },
+          {
+            "x": 430.0,
+            "y": 395.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -1670,11 +1773,32 @@
           "pinName": "OEN"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "and#0",
           "pinName": "B"
         },
         "name": "unnamedWire#138",
-        "path": []
+        "path": [
+          {
+            "x": 240.0,
+            "y": 185.0
+          },
+          {
+            "x": 410.0,
+            "y": 185.0
+          },
+          {
+            "x": 410.0,
+            "y": 85.0
+          },
+          {
+            "x": 485.0,
+            "y": 85.0
+          },
+          {
+            "x": 485.0,
+            "y": 80.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -1722,7 +1846,16 @@
           "pinName": "I12-11"
         },
         "name": "unnamedWire#141",
-        "path": []
+        "path": [
+          {
+            "x": 105.0,
+            "y": 155.0
+          },
+          {
+            "x": 105.0,
+            "y": 220.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -1734,11 +1867,16 @@
           "pinName": "I"
         },
         "name": "unnamedWire#142",
-        "path": []
+        "path": [
+          {
+            "x": 250.0,
+            "y": 445.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#11",
+          "compName": "mux1#1",
           "pinName": "I1"
         },
         "pin2": {
@@ -1746,23 +1884,37 @@
           "pinName": ""
         },
         "name": "unnamedWire#143",
-        "path": []
+        "path": [
+          {
+            "x": 270.0,
+            "y": 500.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "Splitter#10",
-          "pinName": "I"
+          "compName": "WireCrossPoint#32",
+          "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#3",
-          "pinName": ""
+          "compName": "Am2904MSR#0",
+          "pinName": "mu"
         },
         "name": "unnamedWire#144",
-        "path": []
+        "path": [
+          {
+            "x": 185.0,
+            "y": 170.0
+          },
+          {
+            "x": 185.0,
+            "y": 100.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#11",
+          "compName": "mux1#1",
           "pinName": "I0"
         },
         "pin2": {
@@ -1770,7 +1922,24 @@
           "pinName": "O2"
         },
         "name": "unnamedWire#145",
-        "path": []
+        "path": [
+          {
+            "x": 265.0,
+            "y": 490.0
+          },
+          {
+            "x": 265.0,
+            "y": 510.0
+          },
+          {
+            "x": 460.0,
+            "y": 510.0
+          },
+          {
+            "x": 460.0,
+            "y": 310.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -1778,19 +1947,28 @@
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#11",
+          "compName": "mux1#1",
           "pinName": "S0"
         },
         "name": "unnamedWire#146",
-        "path": []
+        "path": [
+          {
+            "x": 270.0,
+            "y": 450.0
+          },
+          {
+            "x": 270.0,
+            "y": 480.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#11",
+          "compName": "mux1#1",
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#12",
+          "compName": "xor#2",
           "pinName": "B"
         },
         "name": "unnamedWire#147",
@@ -1798,7 +1976,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#12",
+          "compName": "xor#2",
           "pinName": "A"
         },
         "pin2": {
@@ -1806,7 +1984,16 @@
           "pinName": "O0"
         },
         "name": "unnamedWire#148",
-        "path": []
+        "path": [
+          {
+            "x": 290.0,
+            "y": 470.0
+          },
+          {
+            "x": 290.0,
+            "y": 460.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -1830,7 +2017,16 @@
           "pinName": "I5-0"
         },
         "name": "unnamedWire#15",
-        "path": []
+        "path": [
+          {
+            "x": 105.0,
+            "y": 245.0
+          },
+          {
+            "x": 105.0,
+            "y": 240.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -1838,19 +2034,24 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#13",
+          "compName": "mux1#2",
           "pinName": "S0"
         },
         "name": "unnamedWire#150",
-        "path": []
+        "path": [
+          {
+            "x": 350.0,
+            "y": 450.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#12",
+          "compName": "xor#2",
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#13",
+          "compName": "mux1#2",
           "pinName": "I1"
         },
         "name": "unnamedWire#151",
@@ -1858,7 +2059,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#13",
+          "compName": "mux1#2",
           "pinName": "I0"
         },
         "pin2": {
@@ -1866,15 +2067,32 @@
           "pinName": "Cx"
         },
         "name": "unnamedWire#152",
-        "path": []
+        "path": [
+          {
+            "x": 300.0,
+            "y": 460.0
+          },
+          {
+            "x": 300.0,
+            "y": 465.0
+          },
+          {
+            "x": 240.0,
+            "y": 465.0
+          },
+          {
+            "x": 240.0,
+            "y": 425.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#13",
+          "compName": "mux1#2",
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#14",
+          "compName": "mux1#3",
           "pinName": "I1"
         },
         "name": "unnamedWire#153",
@@ -1882,7 +2100,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#14",
+          "compName": "mux1#3",
           "pinName": "I0"
         },
         "pin2": {
@@ -1894,7 +2112,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#14",
+          "compName": "mux1#3",
           "pinName": "S0"
         },
         "pin2": {
@@ -1906,7 +2124,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#14",
+          "compName": "mux1#3",
           "pinName": "Y"
         },
         "pin2": {
@@ -1914,7 +2132,16 @@
           "pinName": "C0"
         },
         "name": "unnamedWire#156",
-        "path": []
+        "path": [
+          {
+            "x": 560.0,
+            "y": 430.0
+          },
+          {
+            "x": 560.0,
+            "y": 425.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -1964,12 +2191,12 @@
         "name": "unnamedWire#16",
         "path": [
           {
-            "x": 40.0,
-            "y": 385.0
+            "x": 75.0,
+            "y": 520.0
           },
           {
-            "x": 40.0,
-            "y": 285.0
+            "x": 75.0,
+            "y": 190.0
           }
         ]
       },
@@ -2039,7 +2266,7 @@
           "pinName": "IN"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#15",
+          "compName": "mux2#0",
           "pinName": "Y"
         },
         "name": "unnamedWire#165",
@@ -2063,7 +2290,7 @@
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#15",
+          "compName": "mux2#0",
           "pinName": "I00"
         },
         "name": "unnamedWire#167",
@@ -2075,7 +2302,7 @@
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#15",
+          "compName": "mux2#0",
           "pinName": "S1"
         },
         "name": "unnamedWire#168",
@@ -2083,7 +2310,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#15",
+          "compName": "mux2#0",
           "pinName": "S0"
         },
         "pin2": {
@@ -2103,7 +2330,16 @@
           "pinName": "I0"
         },
         "name": "unnamedWire#17",
-        "path": []
+        "path": [
+          {
+            "x": 10.0,
+            "y": 125.0
+          },
+          {
+            "x": 10.0,
+            "y": 95.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -2111,7 +2347,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#15",
+          "compName": "mux2#0",
           "pinName": "I01"
         },
         "name": "unnamedWire#170",
@@ -2123,7 +2359,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#15",
+          "compName": "mux2#0",
           "pinName": "I10"
         },
         "name": "unnamedWire#171",
@@ -2139,7 +2375,16 @@
           "pinName": ""
         },
         "name": "unnamedWire#172",
-        "path": []
+        "path": [
+          {
+            "x": 485.0,
+            "y": 390.0
+          },
+          {
+            "x": 485.0,
+            "y": 515.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -2159,7 +2404,7 @@
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#16",
+          "compName": "mux2#1",
           "pinName": "S0"
         },
         "name": "unnamedWire#174",
@@ -2167,7 +2412,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#16",
+          "compName": "mux2#1",
           "pinName": "S1"
         },
         "pin2": {
@@ -2183,7 +2428,7 @@
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#16",
+          "compName": "mux2#1",
           "pinName": "I00"
         },
         "name": "unnamedWire#176",
@@ -2191,7 +2436,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#16",
+          "compName": "mux2#1",
           "pinName": "Y"
         },
         "pin2": {
@@ -2219,7 +2464,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#16",
+          "compName": "mux2#1",
           "pinName": "I01"
         },
         "name": "unnamedWire#179",
@@ -2235,7 +2480,16 @@
           "pinName": "I1"
         },
         "name": "unnamedWire#18",
-        "path": []
+        "path": [
+          {
+            "x": 5.0,
+            "y": 100.0
+          },
+          {
+            "x": 5.0,
+            "y": 85.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -2243,7 +2497,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#16",
+          "compName": "mux2#1",
           "pinName": "I10"
         },
         "name": "unnamedWire#180",
@@ -2255,7 +2509,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#16",
+          "compName": "mux2#1",
           "pinName": "I11"
         },
         "name": "unnamedWire#181",
@@ -2263,7 +2517,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#15",
+          "compName": "mux2#0",
           "pinName": "I11"
         },
         "pin2": {
@@ -2291,7 +2545,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#23",
+          "compName": "mux3#1",
           "pinName": "S0"
         },
         "name": "unnamedWire#184",
@@ -2315,7 +2569,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#23",
+          "compName": "mux3#1",
           "pinName": "I000"
         },
         "name": "unnamedWire#186",
@@ -2323,7 +2577,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#23",
+          "compName": "mux3#1",
           "pinName": "I001"
         },
         "pin2": {
@@ -2351,7 +2605,7 @@
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#23",
+          "compName": "mux3#1",
           "pinName": "S2"
         },
         "name": "unnamedWire#189",
@@ -2375,7 +2629,7 @@
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#23",
+          "compName": "mux3#1",
           "pinName": "S1"
         },
         "name": "unnamedWire#190",
@@ -2383,7 +2637,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#23",
+          "compName": "mux3#1",
           "pinName": "I010"
         },
         "pin2": {
@@ -2399,7 +2653,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#23",
+          "compName": "mux3#1",
           "pinName": "I011"
         },
         "name": "unnamedWire#192",
@@ -2407,7 +2661,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#23",
+          "compName": "mux3#1",
           "pinName": "I100"
         },
         "pin2": {
@@ -2419,11 +2673,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#21",
+          "compName": "xor#3",
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#23",
+          "compName": "mux3#1",
           "pinName": "I111"
         },
         "name": "unnamedWire#194",
@@ -2439,11 +2693,16 @@
           "pinName": ""
         },
         "name": "unnamedWire#195",
-        "path": []
+        "path": [
+          {
+            "x": 470.0,
+            "y": 445.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#23",
+          "compName": "mux3#1",
           "pinName": "I110"
         },
         "pin2": {
@@ -2451,11 +2710,20 @@
           "pinName": "O1"
         },
         "name": "unnamedWire#196",
-        "path": []
+        "path": [
+          {
+            "x": 475.0,
+            "y": 445.0
+          },
+          {
+            "x": 475.0,
+            "y": 360.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#22",
+          "compName": "mux2#2",
           "pinName": "I01"
         },
         "pin2": {
@@ -2467,7 +2735,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#22",
+          "compName": "mux2#2",
           "pinName": "I10"
         },
         "pin2": {
@@ -2483,7 +2751,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#23",
+          "compName": "mux3#1",
           "pinName": "I101"
         },
         "name": "unnamedWire#199",
@@ -2495,11 +2763,20 @@
           "pinName": "muSR_OVRRET"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "Am2904muSR#0",
           "pinName": "OVRRET"
         },
         "name": "unnamedWire#2",
-        "path": []
+        "path": [
+          {
+            "x": 345.0,
+            "y": 210.0
+          },
+          {
+            "x": 345.0,
+            "y": 155.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -2511,7 +2788,16 @@
           "pinName": "I3"
         },
         "name": "unnamedWire#20",
-        "path": []
+        "path": [
+          {
+            "x": 5.0,
+            "y": 50.0
+          },
+          {
+            "x": 5.0,
+            "y": 65.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -2519,11 +2805,16 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#10",
+          "compName": "xor#1",
           "pinName": "B"
         },
         "name": "unnamedWire#200",
-        "path": []
+        "path": [
+          {
+            "x": 470.0,
+            "y": 330.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -2531,7 +2822,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#22",
+          "compName": "mux2#2",
           "pinName": "I11"
         },
         "name": "unnamedWire#201",
@@ -2539,7 +2830,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#32",
+          "compName": "WireCrossPoint#30",
           "pinName": ""
         },
         "pin2": {
@@ -2555,7 +2846,7 @@
           "pinName": "OE0"
         },
         "pin2": {
-          "compName": "WireCrossPoint#30",
+          "compName": "WireCrossPoint#29",
           "pinName": ""
         },
         "name": "unnamedWire#203",
@@ -2567,11 +2858,16 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#10",
+          "compName": "xor#1",
           "pinName": "A"
         },
         "name": "unnamedWire#204",
-        "path": []
+        "path": [
+          {
+            "x": 465.0,
+            "y": 320.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -2579,15 +2875,20 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#21",
+          "compName": "xor#3",
           "pinName": "A"
         },
         "name": "unnamedWire#205",
-        "path": []
+        "path": [
+          {
+            "x": 465.0,
+            "y": 445.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#21",
+          "compName": "xor#3",
           "pinName": "B"
         },
         "pin2": {
@@ -2595,11 +2896,20 @@
           "pinName": "O0"
         },
         "name": "unnamedWire#206",
-        "path": []
+        "path": [
+          {
+            "x": 480.0,
+            "y": 445.0
+          },
+          {
+            "x": 480.0,
+            "y": 370.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#22",
+          "compName": "mux2#2",
           "pinName": "Y"
         },
         "pin2": {
@@ -2615,7 +2925,7 @@
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#22",
+          "compName": "mux2#2",
           "pinName": "S1"
         },
         "name": "unnamedWire#208",
@@ -2627,7 +2937,7 @@
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#22",
+          "compName": "mux2#2",
           "pinName": "S0"
         },
         "name": "unnamedWire#209",
@@ -2639,11 +2949,20 @@
           "pinName": "muSR_CINV"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "Am2904muSR#0",
           "pinName": "CINV"
         },
         "name": "unnamedWire#21",
-        "path": []
+        "path": [
+          {
+            "x": 340.0,
+            "y": 220.0
+          },
+          {
+            "x": 340.0,
+            "y": 145.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -2663,7 +2982,7 @@
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#22",
+          "compName": "mux2#2",
           "pinName": "I00"
         },
         "name": "unnamedWire#211",
@@ -2675,7 +2994,7 @@
           "pinName": "IN"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#23",
+          "compName": "mux3#1",
           "pinName": "Y"
         },
         "name": "unnamedWire#212",
@@ -2699,7 +3018,7 @@
           "pinName": "EN"
         },
         "pin2": {
-          "compName": "WireCrossPoint#30",
+          "compName": "WireCrossPoint#29",
           "pinName": ""
         },
         "name": "unnamedWire#214",
@@ -2707,7 +3026,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#30",
+          "compName": "WireCrossPoint#29",
           "pinName": ""
         },
         "pin2": {
@@ -2717,13 +3036,50 @@
         "name": "unnamedWire#215",
         "path": []
       },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#2",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "Am2904muSR#0",
+          "pinName": "M"
+        },
+        "name": "unnamedWire#216",
+        "path": []
+      },
+      {
+        "pin1": {
+          "compName": "WireCrossPoint#32",
+          "pinName": ""
+        },
+        "pin2": {
+          "compName": "Splitter#10",
+          "pinName": "I"
+        },
+        "name": "unnamedWire#217",
+        "path": [
+          {
+            "x": 405.0,
+            "y": 240.0
+          },
+          {
+            "x": 440.0,
+            "y": 240.0
+          },
+          {
+            "x": 440.0,
+            "y": 315.0
+          }
+        ]
+      },
       {
         "pin1": {
           "compName": "TriStateBuffer#2",
           "pinName": "EN"
         },
         "pin2": {
-          "compName": "WireCrossPoint#32",
+          "compName": "WireCrossPoint#30",
           "pinName": ""
         },
         "name": "unnamedWire#218",
@@ -2731,7 +3087,7 @@
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#32",
+          "compName": "WireCrossPoint#30",
           "pinName": ""
         },
         "pin2": {
@@ -2751,15 +3107,24 @@
           "pinName": ""
         },
         "name": "unnamedWire#22",
-        "path": []
+        "path": [
+          {
+            "x": 105.0,
+            "y": 80.0
+          },
+          {
+            "x": 105.0,
+            "y": 140.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#18",
+          "compName": "mux1#5",
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#17",
+          "compName": "mux1#4",
           "pinName": "I0"
         },
         "name": "unnamedWire#221",
@@ -2767,19 +3132,48 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#17",
+          "compName": "mux1#4",
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "Am2904MSR#0",
           "pinName": "COVD_V"
         },
         "name": "unnamedWire#222",
-        "path": []
+        "path": [
+          {
+            "x": 530.0,
+            "y": 535.0
+          },
+          {
+            "x": 530.0,
+            "y": 525.0
+          },
+          {
+            "x": 230.0,
+            "y": 530.0
+          },
+          {
+            "x": 230.0,
+            "y": 310.0
+          },
+          {
+            "x": 295.0,
+            "y": 310.0
+          },
+          {
+            "x": 295.0,
+            "y": 85.0
+          },
+          {
+            "x": 275.0,
+            "y": 85.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#17",
+          "compName": "mux1#4",
           "pinName": "I1"
         },
         "pin2": {
@@ -2791,7 +3185,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#18",
+          "compName": "mux1#5",
           "pinName": "I0"
         },
         "pin2": {
@@ -2807,7 +3201,7 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#18",
+          "compName": "mux1#5",
           "pinName": "I1"
         },
         "name": "unnamedWire#225",
@@ -2831,7 +3225,7 @@
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#18",
+          "compName": "mux1#5",
           "pinName": "S0"
         },
         "name": "unnamedWire#227",
@@ -2843,31 +3237,19 @@
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#17",
+          "compName": "mux1#4",
           "pinName": "S0"
         },
         "name": "unnamedWire#228",
         "path": []
       },
-      {
-        "pin1": {
-          "compName": "BitDisplay#0",
-          "pinName": ""
-        },
-        "pin2": {
-          "compName": "WireCrossPoint#5",
-          "pinName": ""
-        },
-        "name": "unnamedWire#229",
-        "path": []
-      },
       {
         "pin1": {
           "compName": "WireCrossPoint#1",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "Am2904MSR#0",
           "pinName": "I"
         },
         "name": "unnamedWire#23",
@@ -2875,47 +3257,11 @@
       },
       {
         "pin1": {
-          "compName": "TriStateBuffer#0",
-          "pinName": "OUT"
-        },
-        "pin2": {
-          "compName": "BitDisplay#1",
-          "pinName": ""
-        },
-        "name": "unnamedWire#230",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "TriStateBuffer#0",
-          "pinName": "IN"
-        },
-        "pin2": {
-          "compName": "BitDisplay#2",
-          "pinName": ""
-        },
-        "name": "unnamedWire#231",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "TriStateBuffer#0",
-          "pinName": "EN"
-        },
-        "pin2": {
-          "compName": "BitDisplay#3",
-          "pinName": ""
-        },
-        "name": "unnamedWire#232",
-        "path": []
-      },
-      {
-        "pin1": {
-          "compName": "WireCrossPoint#33",
+          "compName": "WireCrossPoint#31",
           "pinName": ""
         },
         "pin2": {
-          "compName": "NandGate#12",
+          "compName": "NandGate#11",
           "pinName": "A"
         },
         "name": "unnamedWire#233",
@@ -2923,19 +3269,24 @@
       },
       {
         "pin1": {
-          "compName": "NandGate#12",
+          "compName": "NandGate#11",
           "pinName": "B"
         },
         "pin2": {
-          "compName": "WireCrossPoint#33",
+          "compName": "WireCrossPoint#31",
           "pinName": ""
         },
         "name": "unnamedWire#234",
-        "path": []
+        "path": [
+          {
+            "x": 550.0,
+            "y": 250.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#33",
+          "compName": "WireCrossPoint#31",
           "pinName": ""
         },
         "pin2": {
@@ -2943,7 +3294,16 @@
           "pinName": "_OECT"
         },
         "name": "unnamedWire#235",
-        "path": []
+        "path": [
+          {
+            "x": 550.0,
+            "y": 215.0
+          },
+          {
+            "x": 565.0,
+            "y": 215.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -2963,7 +3323,7 @@
           "pinName": "IN"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#8",
+          "compName": "xor#0",
           "pinName": "Y"
         },
         "name": "unnamedWire#237",
@@ -2979,11 +3339,16 @@
           "pinName": ""
         },
         "name": "unnamedWire#24",
-        "path": []
+        "path": [
+          {
+            "x": 190.0,
+            "y": 175.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "Am2904MSR#0",
           "pinName": "Q"
         },
         "pin2": {
@@ -2991,23 +3356,37 @@
           "pinName": ""
         },
         "name": "unnamedWire#25",
-        "path": []
+        "path": [
+          {
+            "x": 300.0,
+            "y": 110.0
+          },
+          {
+            "x": 300.0,
+            "y": 125.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#2",
+          "compName": "WireCrossPoint#16",
           "pinName": ""
         },
         "pin2": {
-          "compName": "WireCrossPoint#16",
-          "pinName": ""
+          "compName": "Splitter#4",
+          "pinName": "I"
         },
         "name": "unnamedWire#26",
-        "path": []
+        "path": [
+          {
+            "x": 425.0,
+            "y": 165.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "Am2904muSR#0",
           "pinName": "Q"
         },
         "pin2": {
@@ -3015,16 +3394,21 @@
           "pinName": ""
         },
         "name": "unnamedWire#27",
-        "path": []
+        "path": [
+          {
+            "x": 405.0,
+            "y": 105.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "WireCrossPoint#3",
+          "compName": "WireCrossPoint#33",
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
-          "pinName": "mu"
+          "compName": "Splitter#5",
+          "pinName": "I"
         },
         "name": "unnamedWire#28",
         "path": []
@@ -3035,11 +3419,16 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "Am2904MSR#0",
           "pinName": "C"
         },
         "name": "unnamedWire#29",
-        "path": []
+        "path": [
+          {
+            "x": 255.0,
+            "y": 60.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3059,11 +3448,20 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "Am2904muSR#0",
           "pinName": "C"
         },
         "name": "unnamedWire#30",
-        "path": []
+        "path": [
+          {
+            "x": 300.0,
+            "y": 60.0
+          },
+          {
+            "x": 300.0,
+            "y": 105.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3071,11 +3469,16 @@
           "pinName": "MSR_MUX"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "Am2904MSR#0",
           "pinName": "MUX"
         },
         "name": "unnamedWire#31",
-        "path": []
+        "path": [
+          {
+            "x": 200.0,
+            "y": 160.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3083,11 +3486,32 @@
           "pinName": "MC_EN"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "Am2904MSR#0",
           "pinName": "COVD_EN"
         },
         "name": "unnamedWire#32",
-        "path": []
+        "path": [
+          {
+            "x": 225.0,
+            "y": 570.0
+          },
+          {
+            "x": 225.0,
+            "y": 305.0
+          },
+          {
+            "x": 290.0,
+            "y": 305.0
+          },
+          {
+            "x": 290.0,
+            "y": 80.0
+          },
+          {
+            "x": 265.0,
+            "y": 80.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3111,7 +3535,12 @@
           "pinName": "B"
         },
         "name": "unnamedWire#34",
-        "path": []
+        "path": [
+          {
+            "x": 225.0,
+            "y": 25.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3219,7 +3648,12 @@
           "pinName": ""
         },
         "name": "unnamedWire#42",
-        "path": []
+        "path": [
+          {
+            "x": 320.0,
+            "y": 80.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3227,11 +3661,16 @@
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "Am2904muSR#0",
           "pinName": "_EOVR"
         },
         "name": "unnamedWire#43",
-        "path": []
+        "path": [
+          {
+            "x": 390.0,
+            "y": 85.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3239,15 +3678,20 @@
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "Am2904muSR#0",
           "pinName": "_EN"
         },
         "name": "unnamedWire#44",
-        "path": []
+        "path": [
+          {
+            "x": 380.0,
+            "y": 65.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "Am2904muSR#0",
           "pinName": "_EC"
         },
         "pin2": {
@@ -3255,7 +3699,12 @@
           "pinName": "Y"
         },
         "name": "unnamedWire#45",
-        "path": []
+        "path": [
+          {
+            "x": 370.0,
+            "y": 45.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3263,11 +3712,16 @@
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#1",
+          "compName": "Am2904muSR#0",
           "pinName": "_EZ"
         },
         "name": "unnamedWire#46",
-        "path": []
+        "path": [
+          {
+            "x": 360.0,
+            "y": 25.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3279,7 +3733,16 @@
           "pinName": "muSR_WEZ"
         },
         "name": "unnamedWire#47",
-        "path": []
+        "path": [
+          {
+            "x": 305.0,
+            "y": 30.0
+          },
+          {
+            "x": 305.0,
+            "y": 230.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3291,7 +3754,16 @@
           "pinName": "B"
         },
         "name": "unnamedWire#48",
-        "path": []
+        "path": [
+          {
+            "x": 310.0,
+            "y": 240.0
+          },
+          {
+            "x": 310.0,
+            "y": 50.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3303,7 +3775,16 @@
           "pinName": "YZ"
         },
         "name": "unnamedWire#49",
-        "path": []
+        "path": [
+          {
+            "x": 595.0,
+            "y": 40.0
+          },
+          {
+            "x": 595.0,
+            "y": 25.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3339,7 +3820,16 @@
           "pinName": "YN"
         },
         "name": "unnamedWire#51",
-        "path": []
+        "path": [
+          {
+            "x": 595.0,
+            "y": 60.0
+          },
+          {
+            "x": 595.0,
+            "y": 75.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3351,7 +3841,16 @@
           "pinName": "O0"
         },
         "name": "unnamedWire#52",
-        "path": []
+        "path": [
+          {
+            "x": 590.0,
+            "y": 100.0
+          },
+          {
+            "x": 590.0,
+            "y": 70.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3371,11 +3870,28 @@
           "pinName": ""
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "Am2904MSR#0",
           "pinName": "Y"
         },
         "name": "unnamedWire#54",
-        "path": []
+        "path": [
+          {
+            "x": 415.0,
+            "y": 55.0
+          },
+          {
+            "x": 415.0,
+            "y": 180.0
+          },
+          {
+            "x": 195.0,
+            "y": 180.0
+          },
+          {
+            "x": 195.0,
+            "y": 120.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3387,7 +3903,12 @@
           "pinName": "A"
         },
         "name": "unnamedWire#55",
-        "path": []
+        "path": [
+          {
+            "x": 135.0,
+            "y": 10.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3411,7 +3932,12 @@
           "pinName": ""
         },
         "name": "unnamedWire#57",
-        "path": []
+        "path": [
+          {
+            "x": 25.0,
+            "y": 20.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3423,7 +3949,16 @@
           "pinName": "muSR_WEN"
         },
         "name": "unnamedWire#58",
-        "path": []
+        "path": [
+          {
+            "x": 315.0,
+            "y": 70.0
+          },
+          {
+            "x": 315.0,
+            "y": 250.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3435,7 +3970,16 @@
           "pinName": "B"
         },
         "name": "unnamedWire#59",
-        "path": []
+        "path": [
+          {
+            "x": 320.0,
+            "y": 260.0
+          },
+          {
+            "x": 320.0,
+            "y": 90.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3459,7 +4003,12 @@
           "pinName": "A"
         },
         "name": "unnamedWire#60",
-        "path": []
+        "path": [
+          {
+            "x": 180.0,
+            "y": 75.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3527,15 +4076,20 @@
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "Am2904MSR#0",
           "pinName": "_EOVR"
         },
         "name": "unnamedWire#66",
-        "path": []
+        "path": [
+          {
+            "x": 245.0,
+            "y": 80.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "Am2904MSR#0",
           "pinName": "_EN"
         },
         "pin2": {
@@ -3543,7 +4097,12 @@
           "pinName": "Y"
         },
         "name": "unnamedWire#67",
-        "path": []
+        "path": [
+          {
+            "x": 235.0,
+            "y": 60.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3551,11 +4110,16 @@
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "Am2904MSR#0",
           "pinName": "_EC"
         },
         "name": "unnamedWire#68",
-        "path": []
+        "path": [
+          {
+            "x": 225.0,
+            "y": 40.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3563,11 +4127,16 @@
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#0",
+          "compName": "Am2904MSR#0",
           "pinName": "_EZ"
         },
         "name": "unnamedWire#69",
-        "path": []
+        "path": [
+          {
+            "x": 215.0,
+            "y": 20.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3595,7 +4164,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "not4#0",
           "pinName": "Y1"
         },
         "pin2": {
@@ -3603,7 +4172,16 @@
           "pinName": "B"
         },
         "name": "unnamedWire#71",
-        "path": []
+        "path": [
+          {
+            "x": 170.0,
+            "y": 45.0
+          },
+          {
+            "x": 170.0,
+            "y": 25.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3611,15 +4189,24 @@
           "pinName": "B"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "not4#0",
           "pinName": "Y2"
         },
         "name": "unnamedWire#72",
-        "path": []
+        "path": [
+          {
+            "x": 175.0,
+            "y": 45.0
+          },
+          {
+            "x": 175.0,
+            "y": 55.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "not4#0",
           "pinName": "Y3"
         },
         "pin2": {
@@ -3631,7 +4218,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "not4#0",
           "pinName": "Y4"
         },
         "pin2": {
@@ -3639,11 +4226,20 @@
           "pinName": "B"
         },
         "name": "unnamedWire#74",
-        "path": []
+        "path": [
+          {
+            "x": 175.0,
+            "y": 75.0
+          },
+          {
+            "x": 175.0,
+            "y": 85.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "not4#0",
           "pinName": "A1"
         },
         "pin2": {
@@ -3651,7 +4247,12 @@
           "pinName": "_EZ"
         },
         "name": "unnamedWire#75",
-        "path": []
+        "path": [
+          {
+            "x": 50.0,
+            "y": 45.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3659,15 +4260,20 @@
           "pinName": "_EC"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "not4#0",
           "pinName": "A2"
         },
         "name": "unnamedWire#76",
-        "path": []
+        "path": [
+          {
+            "x": 75.0,
+            "y": 55.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "not4#0",
           "pinName": "A3"
         },
         "pin2": {
@@ -3675,7 +4281,12 @@
           "pinName": "_EN"
         },
         "name": "unnamedWire#77",
-        "path": []
+        "path": [
+          {
+            "x": 100.0,
+            "y": 65.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3683,11 +4294,16 @@
           "pinName": "_EOVR"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#4",
+          "compName": "not4#0",
           "pinName": "A4"
         },
         "name": "unnamedWire#78",
-        "path": []
+        "path": [
+          {
+            "x": 125.0,
+            "y": 75.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3699,7 +4315,12 @@
           "pinName": ""
         },
         "name": "unnamedWire#79",
-        "path": []
+        "path": [
+          {
+            "x": 570.0,
+            "y": 85.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3735,7 +4356,12 @@
           "pinName": ""
         },
         "name": "unnamedWire#81",
-        "path": []
+        "path": [
+          {
+            "x": 450.0,
+            "y": 75.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3755,7 +4381,7 @@
           "pinName": "Y"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "and#0",
           "pinName": "A"
         },
         "name": "unnamedWire#83",
@@ -3763,7 +4389,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#2",
+          "compName": "and#0",
           "pinName": "Y"
         },
         "pin2": {
@@ -3771,15 +4397,20 @@
           "pinName": "EN"
         },
         "name": "unnamedWire#84",
-        "path": []
+        "path": [
+          {
+            "x": 550.0,
+            "y": 70.0
+          }
+        ]
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "mux1_4#1",
           "pinName": "Y1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "mux1_4#0",
           "pinName": "I1_1"
         },
         "name": "unnamedWire#85",
@@ -3787,11 +4418,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "mux1_4#0",
           "pinName": "I1_2"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "mux1_4#1",
           "pinName": "Y2"
         },
         "name": "unnamedWire#86",
@@ -3799,11 +4430,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "mux1_4#1",
           "pinName": "Y3"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "mux1_4#0",
           "pinName": "I1_3"
         },
         "name": "unnamedWire#87",
@@ -3811,11 +4442,11 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "mux1_4#0",
           "pinName": "I1_4"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "mux1_4#1",
           "pinName": "Y4"
         },
         "name": "unnamedWire#88",
@@ -3827,7 +4458,7 @@
           "pinName": "I0"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "mux1_4#0",
           "pinName": "Y4"
         },
         "name": "unnamedWire#89",
@@ -3847,7 +4478,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "mux1_4#0",
           "pinName": "Y3"
         },
         "pin2": {
@@ -3863,7 +4494,7 @@
           "pinName": "I2"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "mux1_4#0",
           "pinName": "Y2"
         },
         "name": "unnamedWire#91",
@@ -3871,7 +4502,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "mux1_4#0",
           "pinName": "Y1"
         },
         "pin2": {
@@ -3883,13 +4514,13 @@
       },
       {
         "pin1": {
-          "compName": "Merger#3",
-          "pinName": "O"
-        },
-        "pin2": {
           "compName": "WireCrossPoint#14",
           "pinName": ""
         },
+        "pin2": {
+          "compName": "Merger#3",
+          "pinName": "O"
+        },
         "name": "unnamedWire#93",
         "path": []
       },
@@ -3903,7 +4534,28 @@
           "pinName": "I"
         },
         "name": "unnamedWire#94",
-        "path": []
+        "path": [
+          {
+            "x": 190.0,
+            "y": 275.0
+          },
+          {
+            "x": 360.0,
+            "y": 275.0
+          },
+          {
+            "x": 360.0,
+            "y": 225.0
+          },
+          {
+            "x": 420.0,
+            "y": 225.0
+          },
+          {
+            "x": 420.0,
+            "y": 100.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3911,11 +4563,28 @@
           "pinName": "O0"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#5",
+          "compName": "mux1_4#1",
           "pinName": "S0"
         },
         "name": "unnamedWire#95",
-        "path": []
+        "path": [
+          {
+            "x": 455.0,
+            "y": 105.0
+          },
+          {
+            "x": 455.0,
+            "y": 135.0
+          },
+          {
+            "x": 435.0,
+            "y": 135.0
+          },
+          {
+            "x": 435.0,
+            "y": 145.0
+          }
+        ]
       },
       {
         "pin1": {
@@ -3923,7 +4592,7 @@
           "pinName": "O1"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "mux1_4#0",
           "pinName": "S0"
         },
         "name": "unnamedWire#96",
@@ -3935,7 +4604,7 @@
           "pinName": "O3"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "mux1_4#0",
           "pinName": "I0_1"
         },
         "name": "unnamedWire#97",
@@ -3947,7 +4616,7 @@
           "pinName": "O2"
         },
         "pin2": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "mux1_4#0",
           "pinName": "I0_2"
         },
         "name": "unnamedWire#98",
@@ -3955,7 +4624,7 @@
       },
       {
         "pin1": {
-          "compName": "DeserializedSubmodelComponent#3",
+          "compName": "mux1_4#0",
           "pinName": "I0_3"
         },
         "pin2": {
@@ -3983,13 +4652,13 @@
       "musr": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "DeserializedSubmodelComponent#1"
+          "delegateTarget": "Am2904muSR#0"
         }
       },
       "msr": {
         "id": "delegating",
         "params": {
-          "delegateTarget": "DeserializedSubmodelComponent#0"
+          "delegateTarget": "Am2904MSR#0"
         }
       }
     },