From 35133604f9a06afeba0f4118d08c1d8c9327e602 Mon Sep 17 00:00:00 2001
From: Tamas Szabo <tamas.szabo@itemis.de>
Date: Wed, 27 Jan 2016 12:21:17 +0100
Subject: [PATCH 1/4] graph utilities based cycle detection

---
 .../models/com/mbeddr/platform/build.mps      |   6 +
 .../languages/com.mbeddr.core.base/base.mpl   |   2 +
 .../languageModels/behavior.mps               | 673 +++++++++++++++---
 .../languageModels/typesystem.mps             |  93 ++-
 .../languageModels/typesystem.mps             |  69 --
 .../languageModels/behavior.mps               | 264 +++++--
 .../tests/ts/core/importing@tests.mps         |  53 ++
 7 files changed, 938 insertions(+), 222 deletions(-)

diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps
index c3067e25899..4396c6e25ee 100755
--- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps
+++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps
@@ -9134,6 +9134,12 @@
             <ref role="3bR37D" to="90a9:7klUZA6XM5K" resolve="de.slisson.mps.conditionalEditor.runtime" />
           </node>
         </node>
+        <node concept="1SiIV0" id="4e_ywBK8_oI" role="3bR37C">
+          <node concept="3bR9La" id="4e_ywBK8_oJ" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" node="5GUwywcVeK8" resolve="com.mbeddr.mpsutil.common" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="7Pr7tifzjKW" role="3989C9">
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/base.mpl b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/base.mpl
index 0d51d6a6412..5ad89be5e63 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/base.mpl
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/base.mpl
@@ -90,6 +90,7 @@
     <dependency reexport="false">34e84b8f-afa8-4364-abcd-a279fddddbe7(jetbrains.mps.editor.runtime)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">9d368018-badb-4569-9884-4b463e4f6696(de.slisson.mps.conditionalEditor.runtime)</dependency>
+    <dependency reexport="false">c7a315e6-1d93-4186-85bc-2dfafd1ccc21(com.mbeddr.mpsutil.common)</dependency>
   </dependencies>
   <usedDevKits>
     <usedDevKit>fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)</usedDevKit>
@@ -157,6 +158,7 @@
     <module reference="63e0e566-5131-447e-90e3-12ea330e1a00(com.mbeddr.mpsutil.blutil)" version="0" />
     <module reference="a482b416-d0c9-473f-8f67-725ed642b3f3(com.mbeddr.mpsutil.breadcrumb)" version="0" />
     <module reference="fd28f7ed-d277-425b-a282-684ac4cbead6(com.mbeddr.mpsutil.breadcrumb.runtime)" version="0" />
+    <module reference="c7a315e6-1d93-4186-85bc-2dfafd1ccc21(com.mbeddr.mpsutil.common)" version="0" />
     <module reference="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62(com.mbeddr.mpsutil.jung)" version="0" />
     <module reference="1338ba73-5059-479b-a929-de86597a62b8(com.mbeddr.mpsutil.jung.pluginSolution)" version="0" />
     <module reference="b4d28e19-7d2d-47e9-943e-3a41f97a0e52(com.mbeddr.mpsutil.plantuml.node)" version="0" />
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/behavior.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/behavior.mps
index 03618f988f3..6036d493bfd 100755
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/behavior.mps
@@ -61,6 +61,8 @@
     <import index="wcxw" ref="r:b9f36c08-4a75-4513-9277-a390d3426e0f(jetbrains.mps.editor.runtime.impl.cellActions)" />
     <import index="p15z" ref="63e0e566-5131-447e-90e3-12ea330e1a00/r:ac36bf27-36e9-407d-ba8e-953c68088e41(com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.behavior)" />
     <import index="hba4" ref="63e0e566-5131-447e-90e3-12ea330e1a00/r:f5bd2ad9-cd54-4408-b815-07f9f306f074(com.mbeddr.mpsutil.blutil/com.mbeddr.mpsutil.blutil.structure)" />
+    <import index="gtp9" ref="r:007d0985-20e2-4d70-80f1-d0de1aff1076(com.mbeddr.mpsutil.common.graph)" />
+    <import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
     <import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" implicit="true" />
     <import index="z8iw" ref="r:dfdf3542-dbcf-43df-870a-3c3504b3c840(jetbrains.mps.baseLanguage.collections.custom)" implicit="true" />
   </imports>
@@ -250,7 +252,7 @@
         <child id="1068580123161" name="ifTrue" index="3clFbx" />
         <child id="1206060520071" name="elsifClauses" index="3eNLev" />
       </concept>
-      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" index="3clFbS">
+      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
       <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
@@ -384,12 +386,21 @@
       <concept id="5858074156537516430" name="jetbrains.mps.baseLanguage.javadoc.structure.ReturnBlockDocTag" flags="ng" index="x79VA">
         <property id="5858074156537516431" name="text" index="x79VB" />
       </concept>
+      <concept id="6832197706140518104" name="jetbrains.mps.baseLanguage.javadoc.structure.DocMethodParameterReference" flags="ng" index="zr_55" />
+      <concept id="6832197706140518103" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseParameterReference" flags="ng" index="zr_5a">
+        <reference id="6832197706140518108" name="param" index="zr_51" />
+      </concept>
       <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
         <child id="8465538089690331502" name="body" index="TZ5H$" />
         <child id="5383422241790532083" name="tags" index="3nqlJM" />
       </concept>
       <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv">
         <child id="5858074156537516440" name="return" index="x79VK" />
+        <child id="8465538089690917625" name="param" index="TUOzN" />
+      </concept>
+      <concept id="8465538089690881930" name="jetbrains.mps.baseLanguage.javadoc.structure.ParameterBlockDocTag" flags="ng" index="TUZQ0">
+        <property id="8465538089690881934" name="text" index="TUZQ4" />
+        <child id="6832197706140518123" name="parameter" index="zr_5Q" />
       </concept>
       <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
         <child id="8970989240999019149" name="part" index="1dT_Ay" />
@@ -578,10 +589,12 @@
       <concept id="1235566831861" name="jetbrains.mps.baseLanguage.collections.structure.AllOperation" flags="nn" index="2HxqBE" />
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
         <child id="1237721435807" name="elementType" index="HW$YZ" />
-        <child id="1562299158920737514" name="initSize" index="3lWHg$" />
       </concept>
+      <concept id="1227008614712" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListCreator" flags="nn" index="2Jqq0_" />
       <concept id="1227022159410" name="jetbrains.mps.baseLanguage.collections.structure.AddFirstElementOperation" flags="nn" index="2Ke4WJ" />
+      <concept id="1227022179634" name="jetbrains.mps.baseLanguage.collections.structure.AddLastElementOperation" flags="nn" index="2Ke9KJ" />
       <concept id="1227022210526" name="jetbrains.mps.baseLanguage.collections.structure.ClearAllElementsOperation" flags="nn" index="2Kehj3" />
+      <concept id="1227026082377" name="jetbrains.mps.baseLanguage.collections.structure.RemoveFirstElementOperation" flags="nn" index="2Kt2Hk" />
       <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1205679737078" name="jetbrains.mps.baseLanguage.collections.structure.SortOperation" flags="nn" index="2S7cBI">
         <child id="1205679832066" name="ascending" index="2S7zOq" />
@@ -627,6 +640,10 @@
       <concept id="8293956702609956630" name="jetbrains.mps.baseLanguage.collections.structure.MultiForEachVariableReference" flags="nn" index="3M$PaV">
         <reference id="8293956702609966325" name="variable" index="3M$S_o" />
       </concept>
+      <concept id="5686963296372573083" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerType" flags="in" index="3O5elB">
+        <child id="5686963296372573084" name="elementType" index="3O5elw" />
+      </concept>
+      <concept id="5686963296372475025" name="jetbrains.mps.baseLanguage.collections.structure.QueueType" flags="in" index="3O6Q9H" />
       <concept id="1180964022718" name="jetbrains.mps.baseLanguage.collections.structure.ConcatOperation" flags="nn" index="3QWeyG" />
     </language>
   </registry>
@@ -5624,17 +5641,42 @@
     <node concept="13i0hz" id="59HbAIP5xBI" role="13h7CS">
       <property role="13i0iv" value="false" />
       <property role="13i0it" value="false" />
-      <property role="TrG5h" value="cycleRelevantReferencedElements" />
-      <ref role="13i0hy" node="59HbAIOYveX" resolve="cycleRelevantReferencedElements" />
+      <property role="TrG5h" value="getDependenciesRelevantForCycleDetection" />
+      <ref role="13i0hy" node="59HbAIOYveX" resolve="getDependenciesRelevantForCycleDetection" />
       <node concept="3Tm1VV" id="59HbAIP5xBJ" role="1B3o_S" />
       <node concept="3clFbS" id="59HbAIP5xBN" role="3clF47">
-        <node concept="3clFbF" id="59HbAIP5JNJ" role="3cqZAp">
-          <node concept="2OqwBi" id="59HbAIPkOyK" role="3clFbG">
-            <node concept="BsUDl" id="59HbAIP5JNI" role="2Oq$k0">
-              <ref role="37wK5l" node="M5_ycCRbK2" resolve="allReferencedChunks" />
+        <node concept="3cpWs6" id="17fjvcLDz8V" role="3cqZAp">
+          <node concept="2OqwBi" id="17fjvcLDzNh" role="3cqZAk">
+            <node concept="2OqwBi" id="17fjvcLEqE1" role="2Oq$k0">
+              <node concept="2OqwBi" id="17fjvcLDzjl" role="2Oq$k0">
+                <node concept="13iPFW" id="17fjvcLDzbr" role="2Oq$k0" />
+                <node concept="2qgKlT" id="17fjvcLDzIC" role="2OqNvi">
+                  <ref role="37wK5l" node="6clJcrJYPM5" resolve="dependencies" />
+                </node>
+              </node>
+              <node concept="3$u5V9" id="17fjvcLEqPI" role="2OqNvi">
+                <node concept="1bVj0M" id="17fjvcLEqPK" role="23t8la">
+                  <node concept="3clFbS" id="17fjvcLEqPL" role="1bW5cS">
+                    <node concept="3clFbF" id="17fjvcLEqVq" role="3cqZAp">
+                      <node concept="2OqwBi" id="17fjvcLEr01" role="3clFbG">
+                        <node concept="37vLTw" id="17fjvcLEqVp" role="2Oq$k0">
+                          <ref role="3cqZAo" node="17fjvcLEqPM" resolve="it" />
+                        </node>
+                        <node concept="2qgKlT" id="17fjvcLErcR" role="2OqNvi">
+                          <ref role="37wK5l" node="6clJcrJZN1z" resolve="chunk" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="Rh6nW" id="17fjvcLEqPM" role="1bW2Oz">
+                    <property role="TrG5h" value="it" />
+                    <node concept="2jxLKc" id="17fjvcLEqPN" role="1tU5fm" />
+                  </node>
+                </node>
+              </node>
             </node>
-            <node concept="v3k3i" id="59HbAIPkR20" role="2OqNvi">
-              <node concept="chp4Y" id="59HbAIPkR6b" role="v3oSu">
+            <node concept="v3k3i" id="17fjvcLDzXG" role="2OqNvi">
+              <node concept="chp4Y" id="17fjvcLD$3_" role="v3oSu">
                 <ref role="cht4Q" to="vs0r:59HbAIOYkEn" resolve="IDetectCycle" />
               </node>
             </node>
@@ -5647,6 +5689,84 @@
         </node>
       </node>
     </node>
+    <node concept="13i0hz" id="17fjvcLF8ch" role="13h7CS">
+      <property role="13i0iv" value="false" />
+      <property role="13i0it" value="false" />
+      <property role="TrG5h" value="traceBackElementInCycle" />
+      <ref role="13i0hy" node="17fjvcLF7UR" resolve="traceBackElementInCycle" />
+      <node concept="3Tm1VV" id="17fjvcLF8ck" role="1B3o_S" />
+      <node concept="3clFbS" id="17fjvcLF8cp" role="3clF47">
+        <node concept="3cpWs8" id="4ISByPoXvbq" role="3cqZAp">
+          <node concept="3cpWsn" id="4ISByPoXvbt" role="3cpWs9">
+            <property role="TrG5h" value="result" />
+            <node concept="2hMVRd" id="4ISByPoXvbm" role="1tU5fm">
+              <node concept="3Tqbb2" id="4ISByPoXvbO" role="2hN53Y" />
+            </node>
+            <node concept="2ShNRf" id="4ISByPoXveP" role="33vP2m">
+              <node concept="2i4dXS" id="4ISByPoXvdV" role="2ShVmc">
+                <node concept="3Tqbb2" id="4ISByPoXvdW" role="HW$YZ" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2Gpval" id="17fjvcLF96J" role="3cqZAp">
+          <node concept="2GrKxI" id="17fjvcLF96L" role="2Gsz3X">
+            <property role="TrG5h" value="d" />
+          </node>
+          <node concept="3clFbS" id="17fjvcLF96N" role="2LFqv$">
+            <node concept="3clFbJ" id="17fjvcLFa0c" role="3cqZAp">
+              <node concept="3clFbS" id="17fjvcLFa0d" role="3clFbx">
+                <node concept="3clFbF" id="4ISByPoXvhb" role="3cqZAp">
+                  <node concept="2OqwBi" id="4ISByPoXvps" role="3clFbG">
+                    <node concept="37vLTw" id="4ISByPoXvh9" role="2Oq$k0">
+                      <ref role="3cqZAo" node="4ISByPoXvbt" resolve="result" />
+                    </node>
+                    <node concept="TSZUe" id="4ISByPoXvOM" role="2OqNvi">
+                      <node concept="2GrUjf" id="4ISByPoXvTU" role="25WWJ7">
+                        <ref role="2Gs0qQ" node="17fjvcLF96L" resolve="d" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbC" id="17fjvcLFa3c" role="3clFbw">
+                <node concept="2OqwBi" id="17fjvcLFa5a" role="3uHU7w">
+                  <node concept="2GrUjf" id="17fjvcLFa3v" role="2Oq$k0">
+                    <ref role="2Gs0qQ" node="17fjvcLF96L" resolve="d" />
+                  </node>
+                  <node concept="2qgKlT" id="17fjvcLFahp" role="2OqNvi">
+                    <ref role="37wK5l" node="6clJcrJZN1z" resolve="chunk" />
+                  </node>
+                </node>
+                <node concept="37vLTw" id="17fjvcLFa0q" role="3uHU7B">
+                  <ref role="3cqZAo" node="17fjvcLF8cq" resolve="dependency" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2OqwBi" id="17fjvcLF9pH" role="2GsD0m">
+            <node concept="13iPFW" id="17fjvcLF9jH" role="2Oq$k0" />
+            <node concept="2qgKlT" id="17fjvcLF9Of" role="2OqNvi">
+              <ref role="37wK5l" node="6clJcrJYPM5" resolve="dependencies" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="17fjvcLFaIv" role="3cqZAp">
+          <node concept="37vLTw" id="4ISByPoXvZk" role="3cqZAk">
+            <ref role="3cqZAo" node="4ISByPoXvbt" resolve="result" />
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="17fjvcLF8cq" role="3clF46">
+        <property role="TrG5h" value="dependency" />
+        <node concept="3Tqbb2" id="17fjvcLF8cr" role="1tU5fm">
+          <ref role="ehGHo" to="vs0r:59HbAIOYkEn" resolve="IDetectCycle" />
+        </node>
+      </node>
+      <node concept="2hMVRd" id="4ISByPoXv1s" role="3clF45">
+        <node concept="3Tqbb2" id="4ISByPoXv6h" role="2hN53Y" />
+      </node>
+    </node>
     <node concept="13i0hz" id="5yCuRHcfsI8" role="13h7CS">
       <property role="13i0iv" value="false" />
       <property role="13i0it" value="false" />
@@ -16757,7 +16877,7 @@
     <node concept="13i0hz" id="59HbAIOYveX" role="13h7CS">
       <property role="13i0iv" value="true" />
       <property role="13i0it" value="true" />
-      <property role="TrG5h" value="cycleRelevantReferencedElements" />
+      <property role="TrG5h" value="getDependenciesRelevantForCycleDetection" />
       <node concept="3Tm1VV" id="59HbAIOYveY" role="1B3o_S" />
       <node concept="A3Dl8" id="59HbAIOY_nW" role="3clF45">
         <node concept="3Tqbb2" id="59HbAIOY_o1" role="A3Ik2">
@@ -16766,141 +16886,500 @@
       </node>
       <node concept="3clFbS" id="59HbAIOYvf0" role="3clF47" />
     </node>
+    <node concept="13i0hz" id="17fjvcLF7UR" role="13h7CS">
+      <property role="13i0iv" value="false" />
+      <property role="13i0it" value="true" />
+      <property role="TrG5h" value="traceBackElementInCycle" />
+      <node concept="37vLTG" id="17fjvcLF88O" role="3clF46">
+        <property role="TrG5h" value="dependency" />
+        <node concept="3Tqbb2" id="17fjvcLF890" role="1tU5fm">
+          <ref role="ehGHo" to="vs0r:59HbAIOYkEn" resolve="IDetectCycle" />
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="17fjvcLF7US" role="1B3o_S" />
+      <node concept="2hMVRd" id="4ISByPoXtvd" role="3clF45">
+        <node concept="3Tqbb2" id="4ISByPoXtvv" role="2hN53Y" />
+      </node>
+      <node concept="3clFbS" id="17fjvcLF7UV" role="3clF47">
+        <node concept="3cpWs6" id="17fjvcLF89d" role="3cqZAp">
+          <node concept="10Nm6u" id="17fjvcLF89q" role="3cqZAk" />
+        </node>
+      </node>
+      <node concept="P$JXv" id="4ISByPoXtuh" role="lGtFl">
+        <node concept="TZ5HA" id="4ISByPoXtui" role="TZ5H$">
+          <node concept="1dT_AC" id="4ISByPoXtuj" role="1dT_Ay">
+            <property role="1dT_AB" value="Traces back a dependency of this IDetectCycle element to the node " />
+          </node>
+        </node>
+        <node concept="TZ5HA" id="4ISByPoXtuH" role="TZ5H$">
+          <node concept="1dT_AC" id="4ISByPoXtuI" role="1dT_Ay">
+            <property role="1dT_AB" value="which should be marked as offending in the editor. It may be " />
+          </node>
+        </node>
+        <node concept="TZ5HA" id="4ISByPoXtuP" role="TZ5H$">
+          <node concept="1dT_AC" id="4ISByPoXtuQ" role="1dT_Ay">
+            <property role="1dT_AB" value="that a given dependency element can be traced back to multiple " />
+          </node>
+        </node>
+        <node concept="TZ5HA" id="4ISByPoXtuZ" role="TZ5H$">
+          <node concept="1dT_AC" id="4ISByPoXtv0" role="1dT_Ay">
+            <property role="1dT_AB" value="offending elements, thus the method returns a set of nodes." />
+          </node>
+        </node>
+        <node concept="TUZQ0" id="4ISByPoXtuk" role="TUOzN">
+          <property role="TUZQ4" value="the dependency" />
+          <node concept="zr_55" id="4ISByPoXtum" role="zr_5Q">
+            <ref role="zr_51" node="17fjvcLF88O" resolve="dependency" />
+          </node>
+        </node>
+        <node concept="x79VA" id="4ISByPoXtun" role="x79VK">
+          <property role="x79VB" value="the set of offending elements" />
+        </node>
+      </node>
+    </node>
     <node concept="13i0hz" id="59HbAIOYtvQ" role="13h7CS">
       <property role="TrG5h" value="isInvolvedInCycle" />
       <node concept="3Tm1VV" id="59HbAIOYtvR" role="1B3o_S" />
       <node concept="10P_77" id="59HbAIOYtvS" role="3clF45" />
       <node concept="3clFbS" id="59HbAIOYtvT" role="3clF47">
-        <node concept="3cpWs8" id="59HbAIOYtvU" role="3cqZAp">
-          <node concept="3cpWsn" id="59HbAIOYtvV" role="3cpWs9">
-            <property role="TrG5h" value="set" />
-            <node concept="2hMVRd" id="59HbAIOYtvW" role="1tU5fm">
-              <node concept="3Tqbb2" id="59HbAIOYtvX" role="2hN53Y" />
-            </node>
-            <node concept="2ShNRf" id="59HbAIOYtvY" role="33vP2m">
-              <node concept="2i4dXS" id="59HbAIOYtvZ" role="2ShVmc">
-                <node concept="3Tqbb2" id="59HbAIOYtw0" role="HW$YZ" />
-              </node>
+        <node concept="3cpWs6" id="4ISByPoWkPn" role="3cqZAp">
+          <node concept="3y3z36" id="4ISByPp61We" role="3cqZAk">
+            <node concept="10Nm6u" id="4ISByPp61WN" role="3uHU7w" />
+            <node concept="BsUDl" id="4ISByPoWllh" role="3uHU7B">
+              <ref role="37wK5l" node="17fjvcLFUH5" resolve="getCyclicDependencyElements" />
             </node>
           </node>
         </node>
-        <node concept="3cpWs6" id="59HbAIOYtw1" role="3cqZAp">
-          <node concept="BsUDl" id="59HbAIOYtw2" role="3cqZAk">
-            <ref role="37wK5l" node="59HbAIOYtw4" resolve="detectCycle" />
-            <node concept="37vLTw" id="59HbAIOYtw3" role="37wK5m">
-              <ref role="3cqZAo" node="59HbAIOYtvV" resolve="set" />
-            </node>
+      </node>
+      <node concept="P$JXv" id="4ISByPoWtNA" role="lGtFl">
+        <node concept="TZ5HA" id="4ISByPoWtNB" role="TZ5H$">
+          <node concept="1dT_AC" id="4ISByPoWtNC" role="1dT_Ay">
+            <property role="1dT_AB" value="Returns true if this IDetectCycle node is involved in a dependency cycle. " />
           </node>
         </node>
-      </node>
-    </node>
-    <node concept="13i0hz" id="59HbAIOYtw4" role="13h7CS">
-      <property role="TrG5h" value="detectCycle" />
-      <node concept="37vLTG" id="59HbAIOYtw5" role="3clF46">
-        <property role="TrG5h" value="set" />
-        <node concept="2hMVRd" id="59HbAIOYtw6" role="1tU5fm">
-          <node concept="3Tqbb2" id="59HbAIOYtw7" role="2hN53Y" />
+        <node concept="TZ5HA" id="4ISByPoWtPY" role="TZ5H$">
+          <node concept="1dT_AC" id="4ISByPoWtPZ" role="1dT_Ay">
+            <property role="1dT_AB" value="Returns false if such a cycle does not exist." />
+          </node>
+        </node>
+        <node concept="x79VA" id="4ISByPoWtND" role="x79VK">
+          <property role="x79VB" value="true if cycle is present, false otherwise" />
         </node>
       </node>
-      <node concept="3Tm6S6" id="59HbAIOYtw8" role="1B3o_S" />
-      <node concept="10P_77" id="59HbAIOYtw9" role="3clF45" />
-      <node concept="3clFbS" id="59HbAIOYtwa" role="3clF47">
-        <node concept="3clFbJ" id="59HbAIOYtwb" role="3cqZAp">
-          <node concept="3clFbS" id="59HbAIOYtwc" role="3clFbx">
-            <node concept="3cpWs6" id="59HbAIOYtwd" role="3cqZAp">
-              <node concept="3clFbT" id="59HbAIOYtwe" role="3cqZAk">
-                <property role="3clFbU" value="true" />
+    </node>
+    <node concept="13i0hz" id="17fjvcLC_kB" role="13h7CS">
+      <property role="13i0iv" value="false" />
+      <property role="13i0it" value="false" />
+      <property role="TrG5h" value="getDependencyGraph" />
+      <node concept="3Tm6S6" id="17fjvcLFUts" role="1B3o_S" />
+      <node concept="3clFbS" id="17fjvcLC_kD" role="3clF47">
+        <node concept="3cpWs8" id="17fjvcLCCDh" role="3cqZAp">
+          <node concept="3cpWsn" id="17fjvcLCCDi" role="3cpWs9">
+            <property role="TrG5h" value="graph" />
+            <node concept="3uibUv" id="17fjvcLCCDj" role="1tU5fm">
+              <ref role="3uigEE" to="gtp9:9NO9Tq8VKe" resolve="Graph" />
+              <node concept="3Tqbb2" id="17fjvcLCEKO" role="11_B2D">
+                <ref role="ehGHo" to="vs0r:59HbAIOYkEn" resolve="IDetectCycle" />
+              </node>
+            </node>
+            <node concept="2ShNRf" id="17fjvcLCEM1" role="33vP2m">
+              <node concept="1pGfFk" id="17fjvcLCELZ" role="2ShVmc">
+                <ref role="37wK5l" to="gtp9:9NO9Tq8VKB" resolve="Graph" />
+                <node concept="3Tqbb2" id="17fjvcLCEM0" role="1pMfVU">
+                  <ref role="ehGHo" to="vs0r:59HbAIOYkEn" resolve="IDetectCycle" />
+                </node>
               </node>
             </node>
           </node>
-          <node concept="2OqwBi" id="59HbAIOYtwf" role="3clFbw">
-            <node concept="37vLTw" id="59HbAIOYtwg" role="2Oq$k0">
-              <ref role="3cqZAo" node="59HbAIOYtw5" resolve="set" />
+        </node>
+        <node concept="3cpWs8" id="17fjvcLCGZ7" role="3cqZAp">
+          <node concept="3cpWsn" id="17fjvcLCGZa" role="3cpWs9">
+            <property role="TrG5h" value="visited" />
+            <node concept="2hMVRd" id="17fjvcLCGZ3" role="1tU5fm">
+              <node concept="3Tqbb2" id="17fjvcLCGZN" role="2hN53Y">
+                <ref role="ehGHo" to="vs0r:59HbAIOYkEn" resolve="IDetectCycle" />
+              </node>
             </node>
-            <node concept="3JPx81" id="59HbAIOYtwh" role="2OqNvi">
-              <node concept="13iPFW" id="59HbAIOYtwi" role="25WWJ7" />
+            <node concept="2ShNRf" id="17fjvcLCH11" role="33vP2m">
+              <node concept="2i4dXS" id="17fjvcLCH0W" role="2ShVmc">
+                <node concept="3Tqbb2" id="17fjvcLCH0X" role="HW$YZ">
+                  <ref role="ehGHo" to="vs0r:59HbAIOYkEn" resolve="IDetectCycle" />
+                </node>
+              </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="59HbAIOYtwj" role="3cqZAp">
-          <node concept="2OqwBi" id="59HbAIOYtwk" role="3clFbG">
-            <node concept="37vLTw" id="59HbAIOYtwl" role="2Oq$k0">
-              <ref role="3cqZAo" node="59HbAIOYtw5" resolve="set" />
+        <node concept="3cpWs8" id="17fjvcLCH2m" role="3cqZAp">
+          <node concept="3cpWsn" id="17fjvcLCH2p" role="3cpWs9">
+            <property role="TrG5h" value="queue" />
+            <node concept="3O6Q9H" id="17fjvcLCH2i" role="1tU5fm">
+              <node concept="3Tqbb2" id="17fjvcLCH3b" role="3O5elw">
+                <ref role="ehGHo" to="vs0r:59HbAIOYkEn" resolve="IDetectCycle" />
+              </node>
             </node>
-            <node concept="TSZUe" id="59HbAIOYtwm" role="2OqNvi">
-              <node concept="13iPFW" id="59HbAIOYtwn" role="25WWJ7" />
+            <node concept="2ShNRf" id="17fjvcLCH4L" role="33vP2m">
+              <node concept="2Jqq0_" id="17fjvcLCH4H" role="2ShVmc">
+                <node concept="3Tqbb2" id="17fjvcLCH4I" role="HW$YZ">
+                  <ref role="ehGHo" to="vs0r:59HbAIOYkEn" resolve="IDetectCycle" />
+                </node>
+              </node>
             </node>
           </node>
         </node>
-        <node concept="2Gpval" id="59HbAIOYtwo" role="3cqZAp">
-          <node concept="2GrKxI" id="59HbAIOYtwp" role="2Gsz3X">
-            <property role="TrG5h" value="e" />
-          </node>
-          <node concept="2OqwBi" id="59HbAIOYtwq" role="2GsD0m">
-            <node concept="13iPFW" id="59HbAIOYtwr" role="2Oq$k0" />
-            <node concept="2qgKlT" id="59HbAIOY_Rm" role="2OqNvi">
-              <ref role="37wK5l" node="59HbAIOYveX" resolve="cycleRelevantReferencedElements" />
+        <node concept="3clFbF" id="17fjvcLCH86" role="3cqZAp">
+          <node concept="2OqwBi" id="17fjvcLCHfM" role="3clFbG">
+            <node concept="37vLTw" id="17fjvcLCH84" role="2Oq$k0">
+              <ref role="3cqZAo" node="17fjvcLCH2p" resolve="queue" />
+            </node>
+            <node concept="2Ke9KJ" id="17fjvcLCHtm" role="2OqNvi">
+              <node concept="13iPFW" id="17fjvcLCHuU" role="25WWJ7" />
             </node>
           </node>
-          <node concept="3clFbS" id="59HbAIOYtwt" role="2LFqv$">
-            <node concept="3cpWs8" id="59HbAIOYtw$" role="3cqZAp">
-              <node concept="3cpWsn" id="59HbAIOYtw_" role="3cpWs9">
-                <property role="TrG5h" value="newSet" />
-                <node concept="2hMVRd" id="59HbAIOYtwA" role="1tU5fm">
-                  <node concept="3Tqbb2" id="59HbAIOYtwB" role="2hN53Y" />
+        </node>
+        <node concept="3clFbH" id="17fjvcLCG7z" role="3cqZAp" />
+        <node concept="2$JKZl" id="17fjvcLCHyY" role="3cqZAp">
+          <node concept="3clFbS" id="17fjvcLCHz0" role="2LFqv$">
+            <node concept="3cpWs8" id="17fjvcLCIzC" role="3cqZAp">
+              <node concept="3cpWsn" id="17fjvcLCIzD" role="3cpWs9">
+                <property role="TrG5h" value="source" />
+                <node concept="3Tqbb2" id="17fjvcLCIzq" role="1tU5fm">
+                  <ref role="ehGHo" to="vs0r:59HbAIOYkEn" resolve="IDetectCycle" />
+                </node>
+                <node concept="2OqwBi" id="17fjvcLCIzE" role="33vP2m">
+                  <node concept="37vLTw" id="17fjvcLCIzF" role="2Oq$k0">
+                    <ref role="3cqZAo" node="17fjvcLCH2p" resolve="queue" />
+                  </node>
+                  <node concept="2Kt2Hk" id="17fjvcLCIzG" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbJ" id="17fjvcLCIAO" role="3cqZAp">
+              <node concept="3clFbS" id="17fjvcLCIAQ" role="3clFbx">
+                <node concept="3clFbF" id="17fjvcLCLeT" role="3cqZAp">
+                  <node concept="2OqwBi" id="17fjvcLCLtH" role="3clFbG">
+                    <node concept="37vLTw" id="17fjvcLCLeR" role="2Oq$k0">
+                      <ref role="3cqZAo" node="17fjvcLCGZa" resolve="visited" />
+                    </node>
+                    <node concept="TSZUe" id="17fjvcLCM2_" role="2OqNvi">
+                      <node concept="37vLTw" id="17fjvcLCMaA" role="25WWJ7">
+                        <ref role="3cqZAo" node="17fjvcLCIzD" resolve="source" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbF" id="4ISByPp53gQ" role="3cqZAp">
+                  <node concept="2OqwBi" id="4ISByPp53lL" role="3clFbG">
+                    <node concept="37vLTw" id="4ISByPp53gO" role="2Oq$k0">
+                      <ref role="3cqZAo" node="17fjvcLCCDi" resolve="graph" />
+                    </node>
+                    <node concept="liA8E" id="4ISByPp53N7" role="2OqNvi">
+                      <ref role="37wK5l" to="gtp9:9NO9Tq8VL5" resolve="addNode" />
+                      <node concept="37vLTw" id="4ISByPp53NO" role="37wK5m">
+                        <ref role="3cqZAo" node="17fjvcLCIzD" resolve="source" />
+                      </node>
+                    </node>
+                  </node>
                 </node>
-                <node concept="2ShNRf" id="59HbAIOYtwC" role="33vP2m">
-                  <node concept="2i4dXS" id="59HbAIOYtwD" role="2ShVmc">
-                    <node concept="3Tqbb2" id="59HbAIOYtwE" role="HW$YZ" />
-                    <node concept="2OqwBi" id="59HbAIOYtwF" role="3lWHg$">
-                      <node concept="37vLTw" id="59HbAIOYtwG" role="2Oq$k0">
-                        <ref role="3cqZAo" node="59HbAIOYtw5" resolve="set" />
+                <node concept="3cpWs8" id="17fjvcLCJL$" role="3cqZAp">
+                  <node concept="3cpWsn" id="17fjvcLCJL_" role="3cpWs9">
+                    <property role="TrG5h" value="targets" />
+                    <node concept="A3Dl8" id="17fjvcLCJLd" role="1tU5fm">
+                      <node concept="3Tqbb2" id="17fjvcLCJLg" role="A3Ik2">
+                        <ref role="ehGHo" to="vs0r:59HbAIOYkEn" resolve="IDetectCycle" />
                       </node>
-                      <node concept="34oBXx" id="59HbAIOYtwH" role="2OqNvi" />
+                    </node>
+                    <node concept="2OqwBi" id="17fjvcLCJLA" role="33vP2m">
+                      <node concept="37vLTw" id="17fjvcLCJLB" role="2Oq$k0">
+                        <ref role="3cqZAo" node="17fjvcLCIzD" resolve="source" />
+                      </node>
+                      <node concept="2qgKlT" id="17fjvcLCJLC" role="2OqNvi">
+                        <ref role="37wK5l" node="59HbAIOYveX" resolve="getDependenciesRelevantForCycleDetection" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="2Gpval" id="17fjvcLCJUA" role="3cqZAp">
+                  <node concept="2GrKxI" id="17fjvcLCJUC" role="2Gsz3X">
+                    <property role="TrG5h" value="target" />
+                  </node>
+                  <node concept="3clFbS" id="17fjvcLCJUE" role="2LFqv$">
+                    <node concept="3clFbF" id="17fjvcLCKDU" role="3cqZAp">
+                      <node concept="2OqwBi" id="17fjvcLCKEO" role="3clFbG">
+                        <node concept="37vLTw" id="17fjvcLCKDS" role="2Oq$k0">
+                          <ref role="3cqZAo" node="17fjvcLCCDi" resolve="graph" />
+                        </node>
+                        <node concept="liA8E" id="17fjvcLCL6a" role="2OqNvi">
+                          <ref role="37wK5l" to="gtp9:9NO9Tq8VM$" resolve="addEdge" />
+                          <node concept="37vLTw" id="17fjvcLCL6R" role="37wK5m">
+                            <ref role="3cqZAo" node="17fjvcLCIzD" resolve="source" />
+                          </node>
+                          <node concept="2GrUjf" id="17fjvcLCL7L" role="37wK5m">
+                            <ref role="2Gs0qQ" node="17fjvcLCJUC" resolve="target" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="37vLTw" id="17fjvcLCK9D" role="2GsD0m">
+                    <ref role="3cqZAo" node="17fjvcLCJL_" resolve="targets" />
+                  </node>
+                </node>
+                <node concept="3clFbF" id="17fjvcLCKcX" role="3cqZAp">
+                  <node concept="2OqwBi" id="17fjvcLCKll" role="3clFbG">
+                    <node concept="37vLTw" id="17fjvcLCKcV" role="2Oq$k0">
+                      <ref role="3cqZAo" node="17fjvcLCH2p" resolve="queue" />
+                    </node>
+                    <node concept="X8dFx" id="17fjvcLCK$4" role="2OqNvi">
+                      <node concept="37vLTw" id="17fjvcLCKAN" role="25WWJ7">
+                        <ref role="3cqZAo" node="17fjvcLCJL_" resolve="targets" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3fqX7Q" id="17fjvcLCIBh" role="3clFbw">
+                <node concept="2OqwBi" id="17fjvcLCIPi" role="3fr31v">
+                  <node concept="37vLTw" id="17fjvcLCIBD" role="2Oq$k0">
+                    <ref role="3cqZAo" node="17fjvcLCGZa" resolve="visited" />
+                  </node>
+                  <node concept="3JPx81" id="17fjvcLCJq9" role="2OqNvi">
+                    <node concept="37vLTw" id="17fjvcLCJr$" role="25WWJ7">
+                      <ref role="3cqZAo" node="17fjvcLCIzD" resolve="source" />
                     </node>
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3clFbF" id="59HbAIOYtwI" role="3cqZAp">
-              <node concept="2OqwBi" id="59HbAIOYtwJ" role="3clFbG">
-                <node concept="37vLTw" id="59HbAIOYtwK" role="2Oq$k0">
-                  <ref role="3cqZAo" node="59HbAIOYtw_" resolve="newSet" />
+          </node>
+          <node concept="2OqwBi" id="17fjvcLCHIh" role="2$JKZa">
+            <node concept="37vLTw" id="17fjvcLCH_n" role="2Oq$k0">
+              <ref role="3cqZAo" node="17fjvcLCH2p" resolve="queue" />
+            </node>
+            <node concept="3GX2aA" id="17fjvcLCI8W" role="2OqNvi" />
+          </node>
+        </node>
+        <node concept="3clFbH" id="17fjvcLCHwU" role="3cqZAp" />
+        <node concept="3cpWs6" id="17fjvcLCENe" role="3cqZAp">
+          <node concept="37vLTw" id="17fjvcLCENz" role="3cqZAk">
+            <ref role="3cqZAo" node="17fjvcLCCDi" resolve="graph" />
+          </node>
+        </node>
+      </node>
+      <node concept="3uibUv" id="17fjvcLCENZ" role="3clF45">
+        <ref role="3uigEE" to="gtp9:9NO9Tq8VKe" resolve="Graph" />
+        <node concept="3Tqbb2" id="17fjvcLCEO0" role="11_B2D">
+          <ref role="ehGHo" to="vs0r:59HbAIOYkEn" resolve="IDetectCycle" />
+        </node>
+      </node>
+      <node concept="P$JXv" id="17fjvcLCGdk" role="lGtFl">
+        <node concept="TZ5HA" id="17fjvcLCGdl" role="TZ5H$">
+          <node concept="1dT_AC" id="17fjvcLCGdm" role="1dT_Ay">
+            <property role="1dT_AB" value="Creates the dependency graph starting from this IDetectCycle node. " />
+          </node>
+        </node>
+        <node concept="TZ5HA" id="17fjvcLCJt2" role="TZ5H$">
+          <node concept="1dT_AC" id="17fjvcLCJt3" role="1dT_Ay">
+            <property role="1dT_AB" value="If IDetectCycle A depends on IDetectCycle B then there is an edge " />
+          </node>
+        </node>
+        <node concept="TZ5HA" id="17fjvcLCJtg" role="TZ5H$">
+          <node concept="1dT_AC" id="17fjvcLCJth" role="1dT_Ay">
+            <property role="1dT_AB" value="in the graph pointing from A to B. " />
+          </node>
+        </node>
+        <node concept="x79VA" id="17fjvcLCGdn" role="x79VK">
+          <property role="x79VB" value="the dependency graph" />
+        </node>
+      </node>
+    </node>
+    <node concept="13i0hz" id="17fjvcLFUH5" role="13h7CS">
+      <property role="13i0iv" value="false" />
+      <property role="13i0it" value="false" />
+      <property role="TrG5h" value="getCyclicDependencyElements" />
+      <node concept="3Tm1VV" id="17fjvcLFUH6" role="1B3o_S" />
+      <node concept="3clFbS" id="17fjvcLFUH7" role="3clF47">
+        <node concept="3cpWs8" id="4ISByPoWhTe" role="3cqZAp">
+          <node concept="3cpWsn" id="4ISByPoWhTf" role="3cpWs9">
+            <property role="TrG5h" value="graph" />
+            <node concept="3uibUv" id="4ISByPoWhTg" role="1tU5fm">
+              <ref role="3uigEE" to="gtp9:9NO9Tq8VKe" resolve="Graph" />
+              <node concept="3Tqbb2" id="4ISByPoWhTh" role="11_B2D">
+                <ref role="ehGHo" to="vs0r:59HbAIOYkEn" resolve="IDetectCycle" />
+              </node>
+            </node>
+            <node concept="BsUDl" id="4ISByPoWhTi" role="33vP2m">
+              <ref role="37wK5l" node="17fjvcLC_kB" resolve="getDependencyGraph" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="4ISByPoWhY0" role="3cqZAp">
+          <node concept="3cpWsn" id="4ISByPoWhY1" role="3cpWs9">
+            <property role="TrG5h" value="sccs" />
+            <node concept="2hMVRd" id="4ISByPoWhXR" role="1tU5fm">
+              <node concept="2hMVRd" id="4ISByPoWhXY" role="2hN53Y">
+                <node concept="3Tqbb2" id="4ISByPoWhXZ" role="2hN53Y">
+                  <ref role="ehGHo" to="vs0r:59HbAIOYkEn" resolve="IDetectCycle" />
                 </node>
-                <node concept="X8dFx" id="59HbAIOYtwL" role="2OqNvi">
-                  <node concept="37vLTw" id="59HbAIOYtwM" role="25WWJ7">
-                    <ref role="3cqZAo" node="59HbAIOYtw5" resolve="set" />
+              </node>
+            </node>
+            <node concept="2YIFZM" id="4ISByPoWhY2" role="33vP2m">
+              <ref role="1Pybhc" to="gtp9:59VTJR_XXJb" resolve="GraphUtil" />
+              <ref role="37wK5l" to="gtp9:4kDlJ5bgbgK" resolve="computeSCC" />
+              <node concept="37vLTw" id="4ISByPoWhY3" role="37wK5m">
+                <ref role="3cqZAo" node="4ISByPoWhTf" resolve="graph" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="4ISByPoWqWy" role="3cqZAp">
+          <node concept="3cpWsn" id="4ISByPoWqWz" role="3cpWs9">
+            <property role="TrG5h" value="result" />
+            <node concept="2hMVRd" id="4ISByPoWqWq" role="1tU5fm">
+              <node concept="3Tqbb2" id="4ISByPoWqWt" role="2hN53Y">
+                <ref role="ehGHo" to="vs0r:59HbAIOYkEn" resolve="IDetectCycle" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="4ISByPoWqW$" role="33vP2m">
+              <node concept="37vLTw" id="4ISByPoWqW_" role="2Oq$k0">
+                <ref role="3cqZAo" node="4ISByPoWhY1" resolve="sccs" />
+              </node>
+              <node concept="1z4cxt" id="4ISByPoWqWA" role="2OqNvi">
+                <node concept="1bVj0M" id="4ISByPoWqWB" role="23t8la">
+                  <node concept="3clFbS" id="4ISByPoWqWC" role="1bW5cS">
+                    <node concept="3clFbF" id="4ISByPoWqWD" role="3cqZAp">
+                      <node concept="2OqwBi" id="4ISByPoWqWE" role="3clFbG">
+                        <node concept="37vLTw" id="4ISByPoWqWF" role="2Oq$k0">
+                          <ref role="3cqZAo" node="4ISByPoWqWI" resolve="it" />
+                        </node>
+                        <node concept="3JPx81" id="4ISByPoWqWG" role="2OqNvi">
+                          <node concept="13iPFW" id="4ISByPoWqWH" role="25WWJ7" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="Rh6nW" id="4ISByPoWqWI" role="1bW2Oz">
+                    <property role="TrG5h" value="it" />
+                    <node concept="2jxLKc" id="4ISByPoWqWJ" role="1tU5fm" />
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3clFbJ" id="59HbAIOYtwN" role="3cqZAp">
-              <node concept="3clFbS" id="59HbAIOYtwO" role="3clFbx">
-                <node concept="3cpWs6" id="59HbAIOYtwP" role="3cqZAp">
-                  <node concept="3clFbT" id="59HbAIOYtwQ" role="3cqZAk">
-                    <property role="3clFbU" value="true" />
+          </node>
+        </node>
+        <node concept="1gVbGN" id="4ISByPoWrCB" role="3cqZAp">
+          <node concept="3y3z36" id="4ISByPoWs1t" role="1gVkn0">
+            <node concept="10Nm6u" id="4ISByPoWs1Y" role="3uHU7w" />
+            <node concept="37vLTw" id="4ISByPoWrNO" role="3uHU7B">
+              <ref role="3cqZAo" node="4ISByPoWqWz" resolve="result" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="4ISByPp62C5" role="3cqZAp" />
+        <node concept="3clFbJ" id="4ISByPp632N" role="3cqZAp">
+          <node concept="3clFbS" id="4ISByPp632P" role="3clFbx">
+            <node concept="3cpWs6" id="4ISByPp64qv" role="3cqZAp">
+              <node concept="37vLTw" id="4ISByPp64qT" role="3cqZAk">
+                <ref role="3cqZAo" node="4ISByPoWqWz" resolve="result" />
+              </node>
+            </node>
+          </node>
+          <node concept="3eOSWO" id="4ISByPp64o8" role="3clFbw">
+            <node concept="3cmrfG" id="4ISByPp64ob" role="3uHU7w">
+              <property role="3cmrfH" value="1" />
+            </node>
+            <node concept="2OqwBi" id="4ISByPp63pb" role="3uHU7B">
+              <node concept="37vLTw" id="4ISByPp63bC" role="2Oq$k0">
+                <ref role="3cqZAo" node="4ISByPoWqWz" resolve="result" />
+              </node>
+              <node concept="34oBXx" id="4ISByPp63YC" role="2OqNvi" />
+            </node>
+          </node>
+          <node concept="3eNFk2" id="4ISByPp64_9" role="3eNLev">
+            <node concept="1Wc70l" id="4ISByPp6GVn" role="3eO9$A">
+              <node concept="2OqwBi" id="4ISByPp66wo" role="3uHU7w">
+                <node concept="2OqwBi" id="4ISByPp667t" role="2Oq$k0">
+                  <node concept="37vLTw" id="4ISByPp665j" role="2Oq$k0">
+                    <ref role="3cqZAo" node="4ISByPoWhTf" resolve="graph" />
                   </node>
+                  <node concept="liA8E" id="4ISByPp66bY" role="2OqNvi">
+                    <ref role="37wK5l" to="gtp9:9NO9Tq8VOy" resolve="getTargets" />
+                    <node concept="13iPFW" id="4ISByPp66gP" role="37wK5m" />
+                  </node>
+                </node>
+                <node concept="3JPx81" id="4ISByPp6782" role="2OqNvi">
+                  <node concept="13iPFW" id="4ISByPp67aW" role="25WWJ7" />
                 </node>
               </node>
-              <node concept="2OqwBi" id="59HbAIOYtwR" role="3clFbw">
-                <node concept="2GrUjf" id="59HbAIOYAsQ" role="2Oq$k0">
-                  <ref role="2Gs0qQ" node="59HbAIOYtwp" resolve="e" />
+              <node concept="1Wc70l" id="4ISByPp663s" role="3uHU7B">
+                <node concept="3clFbC" id="4ISByPp65W6" role="3uHU7B">
+                  <node concept="2OqwBi" id="4ISByPp64WT" role="3uHU7B">
+                    <node concept="37vLTw" id="4ISByPp64Je" role="2Oq$k0">
+                      <ref role="3cqZAo" node="4ISByPoWqWz" resolve="result" />
+                    </node>
+                    <node concept="34oBXx" id="4ISByPp65yu" role="2OqNvi" />
+                  </node>
+                  <node concept="3cmrfG" id="4ISByPp65Xj" role="3uHU7w">
+                    <property role="3cmrfH" value="1" />
+                  </node>
                 </node>
-                <node concept="2qgKlT" id="59HbAIOYtwT" role="2OqNvi">
-                  <ref role="37wK5l" node="59HbAIOYtw4" resolve="detectCycle" />
-                  <node concept="37vLTw" id="59HbAIOYtwU" role="37wK5m">
-                    <ref role="3cqZAo" node="59HbAIOYtw_" resolve="newSet" />
+                <node concept="3y3z36" id="4ISByPp6HH1" role="3uHU7w">
+                  <node concept="10Nm6u" id="4ISByPp6HHe" role="3uHU7w" />
+                  <node concept="2OqwBi" id="4ISByPp6Hcs" role="3uHU7B">
+                    <node concept="37vLTw" id="4ISByPp6H8B" role="2Oq$k0">
+                      <ref role="3cqZAo" node="4ISByPoWhTf" resolve="graph" />
+                    </node>
+                    <node concept="liA8E" id="4ISByPp6Hlu" role="2OqNvi">
+                      <ref role="37wK5l" to="gtp9:9NO9Tq8VOy" resolve="getTargets" />
+                      <node concept="13iPFW" id="4ISByPp6HrT" role="37wK5m" />
+                    </node>
                   </node>
                 </node>
               </node>
             </node>
+            <node concept="3clFbS" id="4ISByPp64_b" role="3eOfB_">
+              <node concept="3SKdUt" id="4ISByPp67Cj" role="3cqZAp">
+                <node concept="3SKdUq" id="4ISByPp67Cl" role="3SKWNk">
+                  <property role="3SKdUp" value="self loop" />
+                </node>
+              </node>
+              <node concept="3cpWs6" id="4ISByPp67dV" role="3cqZAp">
+                <node concept="37vLTw" id="4ISByPp67es" role="3cqZAk">
+                  <ref role="3cqZAo" node="4ISByPoWqWz" resolve="result" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="9aQIb" id="4ISByPp67Pe" role="9aQIa">
+            <node concept="3clFbS" id="4ISByPp67Pf" role="9aQI4">
+              <node concept="3cpWs6" id="4ISByPoWsj5" role="3cqZAp">
+                <node concept="10Nm6u" id="4ISByPp68yf" role="3cqZAk" />
+              </node>
+            </node>
           </node>
         </node>
-        <node concept="3cpWs6" id="59HbAIOYtwV" role="3cqZAp">
-          <node concept="3clFbT" id="59HbAIOYtwW" role="3cqZAk">
-            <property role="3clFbU" value="false" />
+      </node>
+      <node concept="2hMVRd" id="17fjvcLFURx" role="3clF45">
+        <node concept="3Tqbb2" id="17fjvcLFURB" role="2hN53Y">
+          <ref role="ehGHo" to="vs0r:59HbAIOYkEn" resolve="IDetectCycle" />
+        </node>
+      </node>
+      <node concept="P$JXv" id="17fjvcLFURG" role="lGtFl">
+        <node concept="TZ5HA" id="17fjvcLFURH" role="TZ5H$">
+          <node concept="1dT_AC" id="17fjvcLFURI" role="1dT_Ay">
+            <property role="1dT_AB" value="Returns all elements of the dependency cycle that this element is involved in." />
+          </node>
+        </node>
+        <node concept="TZ5HA" id="4ISByPoWtZF" role="TZ5H$">
+          <node concept="1dT_AC" id="4ISByPoWtZG" role="1dT_Ay">
+            <property role="1dT_AB" value="If such a cycle does not exist, null is returned." />
           </node>
         </node>
+        <node concept="x79VA" id="17fjvcLFURJ" role="x79VK">
+          <property role="x79VB" value="the set of cycle elements or null otherwise" />
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="4ISByPp61Xq" role="2AJF6D">
+        <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
       </node>
     </node>
     <node concept="13hLZK" id="59HbAIOYrKI" role="13h7CW">
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/typesystem.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/typesystem.mps
index ccdaa01274d..1574508d4de 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/typesystem.mps
@@ -15,6 +15,7 @@
     <import index="u78q" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.typesystem.inference(MPS.Core/)" />
     <import index="bdcd" ref="r:d5deda81-7a35-4c2b-bda1-1fdc1db99e3b(com.mbeddr.mpsutil.suppresswarning.structure)" />
     <import index="dqn8" ref="r:6f177fc3-8a05-4826-8d08-fd8676623247(com.mbeddr.mpsutil.suppresswarning.behavior)" />
+    <import index="gtp9" ref="r:007d0985-20e2-4d70-80f1-d0de1aff1076(com.mbeddr.mpsutil.common.graph)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
     <import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" implicit="true" />
   </imports>
@@ -2110,32 +2111,94 @@
   <node concept="18kY7G" id="59HbAIOYAvY">
     <property role="TrG5h" value="check_IDetectCycle" />
     <node concept="3clFbS" id="59HbAIOYAvZ" role="18ibNy">
-      <node concept="3clFbJ" id="59HbAIOYAF5" role="3cqZAp">
-        <node concept="3clFbS" id="59HbAIOYAF6" role="3clFbx">
-          <node concept="2MkqsV" id="59HbAIOYAV$" role="3cqZAp">
-            <node concept="Xl_RD" id="59HbAIOYAWE" role="2MkJ7o">
-              <property role="Xl_RC" value="cycle detected" />
+      <node concept="3cpWs8" id="4ISByPoWlUh" role="3cqZAp">
+        <node concept="3cpWsn" id="4ISByPoWlUi" role="3cpWs9">
+          <property role="TrG5h" value="scc" />
+          <node concept="2hMVRd" id="4ISByPoWlU7" role="1tU5fm">
+            <node concept="3Tqbb2" id="4ISByPoWlUa" role="2hN53Y">
+              <ref role="ehGHo" to="vs0r:59HbAIOYkEn" resolve="IDetectCycle" />
             </node>
-            <node concept="1YBJjd" id="59HbAIOYAXC" role="2OEOjV">
-              <ref role="1YBMHb" node="59HbAIOYAw1" resolve="idc" />
+          </node>
+          <node concept="2OqwBi" id="4ISByPoWlUj" role="33vP2m">
+            <node concept="1YBJjd" id="4ISByPoWlUk" role="2Oq$k0">
+              <ref role="1YBMHb" node="59HbAIOYAw1" resolve="source" />
             </node>
-            <node concept="2ODE4t" id="59HbAIP5dwa" role="2OEWyd">
-              <ref role="2ODJFN" to="tpck:h0TrG11" resolve="name" />
+            <node concept="2qgKlT" id="4ISByPoWlUl" role="2OqNvi">
+              <ref role="37wK5l" to="hwgx:17fjvcLFUH5" resolve="getCyclicDependencyElements" />
             </node>
           </node>
         </node>
-        <node concept="2OqwBi" id="59HbAIOYAGX" role="3clFbw">
-          <node concept="1YBJjd" id="59HbAIOYAFn" role="2Oq$k0">
-            <ref role="1YBMHb" node="59HbAIOYAw1" resolve="idc" />
+      </node>
+      <node concept="3clFbJ" id="4ISByPoWn0U" role="3cqZAp">
+        <node concept="3clFbS" id="4ISByPoWn0W" role="3clFbx">
+          <node concept="2Gpval" id="17fjvcLFeoG" role="3cqZAp">
+            <node concept="2GrKxI" id="17fjvcLFeoI" role="2Gsz3X">
+              <property role="TrG5h" value="target" />
+            </node>
+            <node concept="3clFbS" id="17fjvcLFeoK" role="2LFqv$">
+              <node concept="3cpWs8" id="4ISByPoZ7jd" role="3cqZAp">
+                <node concept="3cpWsn" id="4ISByPoZ7je" role="3cpWs9">
+                  <property role="TrG5h" value="elements" />
+                  <node concept="2hMVRd" id="4ISByPoZ7j5" role="1tU5fm">
+                    <node concept="3Tqbb2" id="4ISByPoZ7j8" role="2hN53Y" />
+                  </node>
+                  <node concept="2OqwBi" id="4ISByPoZ7jf" role="33vP2m">
+                    <node concept="1YBJjd" id="4ISByPoZ7jg" role="2Oq$k0">
+                      <ref role="1YBMHb" node="59HbAIOYAw1" resolve="source" />
+                    </node>
+                    <node concept="2qgKlT" id="4ISByPoZ7jh" role="2OqNvi">
+                      <ref role="37wK5l" to="hwgx:17fjvcLF7UR" resolve="traceBackElementInCycle" />
+                      <node concept="2GrUjf" id="4ISByPoZ7ji" role="37wK5m">
+                        <ref role="2Gs0qQ" node="17fjvcLFeoI" resolve="target" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbJ" id="17fjvcLFfxj" role="3cqZAp">
+                <node concept="3clFbS" id="17fjvcLFfxl" role="3clFbx">
+                  <node concept="2Gpval" id="4ISByPoZ7Gn" role="3cqZAp">
+                    <node concept="2GrKxI" id="4ISByPoZ7Gp" role="2Gsz3X">
+                      <property role="TrG5h" value="element" />
+                    </node>
+                    <node concept="3clFbS" id="4ISByPoZ7Gr" role="2LFqv$">
+                      <node concept="2MkqsV" id="17fjvcLFfFc" role="3cqZAp">
+                        <node concept="Xl_RD" id="17fjvcLFfFr" role="2MkJ7o">
+                          <property role="Xl_RC" value="Involved in cyclic dependency!" />
+                        </node>
+                        <node concept="2GrUjf" id="4ISByPoZ7HO" role="2OEOjV">
+                          <ref role="2Gs0qQ" node="4ISByPoZ7Gp" resolve="element" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="37vLTw" id="4ISByPoZ7GS" role="2GsD0m">
+                      <ref role="3cqZAo" node="4ISByPoZ7je" resolve="elements" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3y3z36" id="17fjvcLFfEP" role="3clFbw">
+                  <node concept="10Nm6u" id="17fjvcLFfEW" role="3uHU7w" />
+                  <node concept="37vLTw" id="4ISByPoZ7FW" role="3uHU7B">
+                    <ref role="3cqZAo" node="4ISByPoZ7je" resolve="elements" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="37vLTw" id="4ISByPoWmU4" role="2GsD0m">
+              <ref role="3cqZAo" node="4ISByPoWlUi" resolve="scc" />
+            </node>
           </node>
-          <node concept="2qgKlT" id="59HbAIOYAV5" role="2OqNvi">
-            <ref role="37wK5l" to="hwgx:59HbAIOYtvQ" resolve="isInvolvedInCycle" />
+        </node>
+        <node concept="3y3z36" id="4ISByPp7iyt" role="3clFbw">
+          <node concept="10Nm6u" id="4ISByPp7i_n" role="3uHU7w" />
+          <node concept="37vLTw" id="4ISByPp7il1" role="3uHU7B">
+            <ref role="3cqZAo" node="4ISByPoWlUi" resolve="scc" />
           </node>
         </node>
       </node>
     </node>
     <node concept="1YaCAy" id="59HbAIOYAw1" role="1YuTPh">
-      <property role="TrG5h" value="idc" />
+      <property role="TrG5h" value="source" />
       <ref role="1YaFvo" to="vs0r:59HbAIOYkEn" resolve="IDetectCycle" />
     </node>
   </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/typesystem.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/typesystem.mps
index d5d229b7e09..9453411f980 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.modules/languageModels/typesystem.mps
@@ -1217,75 +1217,6 @@
           </node>
         </node>
       </node>
-      <node concept="3clFbH" id="5KjzTW_mKUS" role="3cqZAp" />
-      <node concept="3clFbJ" id="6Kj2zNCr69C" role="3cqZAp">
-        <node concept="3clFbS" id="6Kj2zNCr69D" role="3clFbx">
-          <node concept="3cpWs8" id="69lKCLH_PZL" role="3cqZAp">
-            <node concept="3cpWsn" id="69lKCLH_PZM" role="3cpWs9">
-              <property role="TrG5h" value="allImports" />
-              <node concept="3uibUv" id="69lKCLH_PZN" role="1tU5fm">
-                <ref role="3uigEE" to="33ny:~Set" resolve="Set" />
-                <node concept="3Tqbb2" id="69lKCLH_PZO" role="11_B2D">
-                  <ref role="ehGHo" to="x27k:5_l8w1EmTcX" resolve="Module" />
-                </node>
-              </node>
-              <node concept="2OqwBi" id="69lKCLH_PZP" role="33vP2m">
-                <node concept="1YBJjd" id="69lKCLH_PZQ" role="2Oq$k0">
-                  <ref role="1YBMHb" node="6OxpEKG0kA5" resolve="mod" />
-                </node>
-                <node concept="2qgKlT" id="69lKCLH_PZR" role="2OqNvi">
-                  <ref role="37wK5l" to="qd6m:35JkqCBlGGT" resolve="getAllImportedModules" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbJ" id="69lKCLH_PZU" role="3cqZAp">
-            <node concept="3clFbS" id="69lKCLH_PZV" role="3clFbx">
-              <node concept="a7r0C" id="69lKCLH_Q0r" role="3cqZAp">
-                <node concept="3cpWs3" id="69lKCLHA2be" role="a7wSD">
-                  <node concept="3cpWsa" id="69lKCLHA2bh" role="3uHU7w">
-                    <ref role="3cqZAo" node="69lKCLH_PZM" resolve="allImports" />
-                  </node>
-                  <node concept="Xl_RD" id="69lKCLH_Q0u" role="3uHU7B">
-                    <property role="Xl_RC" value="circular import detected (use visualization to see the path): " />
-                  </node>
-                </node>
-                <node concept="1YBJjd" id="69lKCLH_Q0v" role="2OEOjV">
-                  <ref role="1YBMHb" node="6OxpEKG0kA5" resolve="mod" />
-                </node>
-                <node concept="2ODE4t" id="69lKCLH_Q0y" role="2OEWyd">
-                  <ref role="2ODJFN" to="tpck:h0TrG11" resolve="name" />
-                </node>
-              </node>
-            </node>
-            <node concept="2OqwBi" id="69lKCLH_Q0j" role="3clFbw">
-              <node concept="3cpWsa" id="69lKCLH_PZY" role="2Oq$k0">
-                <ref role="3cqZAo" node="69lKCLH_PZM" resolve="allImports" />
-              </node>
-              <node concept="liA8E" id="69lKCLH_Q0p" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~Set.contains(java.lang.Object):boolean" resolve="contains" />
-                <node concept="1YBJjd" id="69lKCLH_Q0q" role="37wK5m">
-                  <ref role="1YBMHb" node="6OxpEKG0kA5" resolve="mod" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="2OqwBi" id="6Kj2zNCr69E" role="3clFbw">
-          <node concept="2qgKlT" id="6Kj2zNCr69G" role="2OqNvi">
-            <ref role="37wK5l" to="dqn8:7U3Fobb_8Eq" resolve="isNotSuppressed" />
-            <node concept="1YBJjd" id="6Kj2zNCr6BL" role="37wK5m">
-              <ref role="1YBMHb" node="6OxpEKG0kA5" resolve="mod" />
-            </node>
-          </node>
-          <node concept="35c_gC" id="1vun1LW1xKU" role="2Oq$k0">
-            <ref role="35c_gD" to="bdcd:7U3Fobb_8El" resolve="SuppressWarnings" />
-          </node>
-        </node>
-      </node>
-      <node concept="3clFbH" id="6Kj2zNCrV$q" role="3cqZAp" />
-      <node concept="3clFbH" id="69lKCLH_PZi" role="3cqZAp" />
-      <node concept="3clFbH" id="69lKCLH_PZj" role="3cqZAp" />
     </node>
     <node concept="1YaCAy" id="6OxpEKG0kA5" role="1YuTPh">
       <property role="TrG5h" value="mod" />
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/behavior.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/behavior.mps
index 1965eba9f59..81beeef15ff 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/behavior.mps
@@ -372,6 +372,10 @@
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
       <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
+      <concept id="1226511727824" name="jetbrains.mps.baseLanguage.collections.structure.SetType" flags="in" index="2hMVRd">
+        <child id="1226511765987" name="elementType" index="2hN53Y" />
+      </concept>
+      <concept id="1226516258405" name="jetbrains.mps.baseLanguage.collections.structure.HashSetCreator" flags="nn" index="2i4dXS" />
       <concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
         <child id="1151688676805" name="elementType" index="_ZDj9" />
       </concept>
@@ -4004,72 +4008,111 @@
       </node>
     </node>
     <node concept="13i0hz" id="59HbAIOYG9c" role="13h7CS">
-      <property role="TrG5h" value="cycleRelevantReferencedElements" />
-      <ref role="13i0hy" to="hwgx:59HbAIOYveX" resolve="cycleRelevantReferencedElements" />
+      <property role="TrG5h" value="getDependenciesRelevantForCycleDetection" />
+      <ref role="13i0hy" to="hwgx:59HbAIOYveX" resolve="getDependenciesRelevantForCycleDetection" />
       <node concept="3clFbS" id="59HbAIOYG9f" role="3clF47">
-        <node concept="3clFbF" id="59HbAIOYJd5" role="3cqZAp">
-          <node concept="2OqwBi" id="59HbAIOZa$j" role="3clFbG">
-            <node concept="2OqwBi" id="59HbAIOYMUS" role="2Oq$k0">
-              <node concept="2OqwBi" id="59HbAIOYJk6" role="2Oq$k0">
-                <node concept="13iPFW" id="59HbAIOYJd4" role="2Oq$k0" />
-                <node concept="2qgKlT" id="59HbAIOYKmH" role="2OqNvi">
-                  <ref role="37wK5l" node="7TdHRrCpjWZ" resolve="membersIncludingTransparent" />
-                </node>
+        <node concept="3cpWs8" id="4ISByPp5DKe" role="3cqZAp">
+          <node concept="3cpWsn" id="4ISByPp5DKf" role="3cpWs9">
+            <property role="TrG5h" value="allMembers" />
+            <node concept="2I9FWS" id="4ISByPp5DKc" role="1tU5fm">
+              <ref role="2I9WkF" to="clbe:56ytRgsLg$o" resolve="Member" />
+            </node>
+            <node concept="2OqwBi" id="4ISByPp5DKg" role="33vP2m">
+              <node concept="13iPFW" id="4ISByPp5DKh" role="2Oq$k0" />
+              <node concept="2qgKlT" id="4ISByPp5DKi" role="2OqNvi">
+                <ref role="37wK5l" node="7TdHRrCpjWZ" resolve="membersIncludingTransparent" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="4ISByPp5EHk" role="3cqZAp">
+          <node concept="3cpWsn" id="4ISByPp5EHl" role="3cpWs9">
+            <property role="TrG5h" value="suMembers" />
+            <node concept="A3Dl8" id="4ISByPp5EHd" role="1tU5fm">
+              <node concept="3Tqbb2" id="4ISByPp5EHg" role="A3Ik2">
+                <ref role="ehGHo" to="clbe:56ytRgsLg$o" resolve="Member" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="4ISByPp5EHm" role="33vP2m">
+              <node concept="37vLTw" id="4ISByPp5EHn" role="2Oq$k0">
+                <ref role="3cqZAo" node="4ISByPp5DKf" resolve="allMembers" />
               </node>
-              <node concept="3zZkjj" id="59HbAIOYSL9" role="2OqNvi">
-                <node concept="1bVj0M" id="59HbAIOYSLb" role="23t8la">
-                  <node concept="3clFbS" id="59HbAIOYSLc" role="1bW5cS">
-                    <node concept="3clFbF" id="59HbAIOYThq" role="3cqZAp">
-                      <node concept="2OqwBi" id="59HbAIOYYHM" role="3clFbG">
-                        <node concept="2OqwBi" id="59HbAIOYTBq" role="2Oq$k0">
-                          <node concept="37vLTw" id="59HbAIOYThp" role="2Oq$k0">
-                            <ref role="3cqZAo" node="59HbAIOYSLd" resolve="it" />
+              <node concept="3zZkjj" id="4ISByPp5EHo" role="2OqNvi">
+                <node concept="1bVj0M" id="4ISByPp5EHp" role="23t8la">
+                  <node concept="3clFbS" id="4ISByPp5EHq" role="1bW5cS">
+                    <node concept="3clFbF" id="4ISByPp5EHr" role="3cqZAp">
+                      <node concept="2OqwBi" id="4ISByPp5EHs" role="3clFbG">
+                        <node concept="2OqwBi" id="4ISByPp5EHt" role="2Oq$k0">
+                          <node concept="37vLTw" id="4ISByPp5EHu" role="2Oq$k0">
+                            <ref role="3cqZAo" node="4ISByPp5EHy" resolve="it" />
+                          </node>
+                          <node concept="3TrEf2" id="4ISByPp7wbw" role="2OqNvi">
+                            <ref role="3Tt5mk" to="mj1l:hEaDaGor64" />
                           </node>
-                          <node concept="3JvlWi" id="59HbAIOYWS2" role="2OqNvi" />
                         </node>
-                        <node concept="1mIQ4w" id="59HbAIOYZpQ" role="2OqNvi">
-                          <node concept="chp4Y" id="59HbAIOZ0tk" role="cj9EA">
+                        <node concept="1mIQ4w" id="4ISByPp5EHw" role="2OqNvi">
+                          <node concept="chp4Y" id="4ISByPp5EHx" role="cj9EA">
                             <ref role="cht4Q" to="clbe:3bHYGwzt_Ut" resolve="SUType" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="59HbAIOYSLd" role="1bW2Oz">
+                  <node concept="Rh6nW" id="4ISByPp5EHy" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="59HbAIOYSLe" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4ISByPp5EHz" role="1tU5fm" />
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3$u5V9" id="59HbAIOZdUl" role="2OqNvi">
-              <node concept="1bVj0M" id="59HbAIOZdUn" role="23t8la">
-                <node concept="3clFbS" id="59HbAIOZdUo" role="1bW5cS">
-                  <node concept="3clFbF" id="59HbAIOZenB" role="3cqZAp">
-                    <node concept="2OqwBi" id="59HbAIOZpkG" role="3clFbG">
-                      <node concept="1PxgMI" id="59HbAIOZobD" role="2Oq$k0">
-                        <ref role="1PxNhF" to="clbe:3bHYGwzt_Ut" resolve="SUType" />
-                        <node concept="2OqwBi" id="59HbAIOZglR" role="1PxMeX">
-                          <node concept="37vLTw" id="59HbAIOZenA" role="2Oq$k0">
-                            <ref role="3cqZAo" node="59HbAIOZdUp" resolve="it" />
+          </node>
+        </node>
+        <node concept="3cpWs8" id="4ISByPp5Gbb" role="3cqZAp">
+          <node concept="3cpWsn" id="4ISByPp5Gbc" role="3cpWs9">
+            <property role="TrG5h" value="result" />
+            <node concept="A3Dl8" id="4ISByPp5Gb3" role="1tU5fm">
+              <node concept="3Tqbb2" id="4ISByPp5Gb6" role="A3Ik2">
+                <ref role="ehGHo" to="clbe:6a5SBPfXGBP" resolve="SUDeclaration" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="4ISByPp5Gbd" role="33vP2m">
+              <node concept="37vLTw" id="4ISByPp5Gbe" role="2Oq$k0">
+                <ref role="3cqZAo" node="4ISByPp5EHl" resolve="suMembers" />
+              </node>
+              <node concept="3$u5V9" id="4ISByPp5Gbf" role="2OqNvi">
+                <node concept="1bVj0M" id="4ISByPp5Gbg" role="23t8la">
+                  <node concept="3clFbS" id="4ISByPp5Gbh" role="1bW5cS">
+                    <node concept="3clFbF" id="4ISByPp5Gbi" role="3cqZAp">
+                      <node concept="2OqwBi" id="4ISByPp5Gbj" role="3clFbG">
+                        <node concept="1PxgMI" id="4ISByPp5Gbk" role="2Oq$k0">
+                          <ref role="1PxNhF" to="clbe:3bHYGwzt_Ut" resolve="SUType" />
+                          <node concept="2OqwBi" id="4ISByPp5Gbl" role="1PxMeX">
+                            <node concept="37vLTw" id="4ISByPp5Gbm" role="2Oq$k0">
+                              <ref role="3cqZAo" node="4ISByPp5Gbp" resolve="it" />
+                            </node>
+                            <node concept="3JvlWi" id="4ISByPp5Gbn" role="2OqNvi" />
                           </node>
-                          <node concept="3JvlWi" id="59HbAIOZjKF" role="2OqNvi" />
                         </node>
-                      </node>
-                      <node concept="2qgKlT" id="59HbAIOZqIO" role="2OqNvi">
-                        <ref role="37wK5l" node="3bHYGwztGSo" resolve="getSUDeclaration" />
+                        <node concept="2qgKlT" id="4ISByPp5Gbo" role="2OqNvi">
+                          <ref role="37wK5l" node="3bHYGwztGSo" resolve="getSUDeclaration" />
+                        </node>
                       </node>
                     </node>
                   </node>
-                </node>
-                <node concept="Rh6nW" id="59HbAIOZdUp" role="1bW2Oz">
-                  <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="59HbAIOZdUq" role="1tU5fm" />
+                  <node concept="Rh6nW" id="4ISByPp5Gbp" role="1bW2Oz">
+                    <property role="TrG5h" value="it" />
+                    <node concept="2jxLKc" id="4ISByPp5Gbq" role="1tU5fm" />
+                  </node>
                 </node>
               </node>
             </node>
           </node>
         </node>
+        <node concept="3cpWs6" id="4ISByPp5Ed7" role="3cqZAp">
+          <node concept="37vLTw" id="4ISByPp5Gbr" role="3cqZAk">
+            <ref role="3cqZAo" node="4ISByPp5Gbc" resolve="result" />
+          </node>
+        </node>
       </node>
       <node concept="A3Dl8" id="59HbAIOYGRq" role="3clF45">
         <node concept="3Tqbb2" id="59HbAIOYGRr" role="A3Ik2">
@@ -4078,6 +4121,145 @@
       </node>
       <node concept="3Tm1VV" id="59HbAIOYGRs" role="1B3o_S" />
     </node>
+    <node concept="13i0hz" id="4ISByPp7qQn" role="13h7CS">
+      <property role="13i0iv" value="false" />
+      <property role="13i0it" value="false" />
+      <property role="TrG5h" value="traceBackElementInCycle" />
+      <ref role="13i0hy" to="hwgx:17fjvcLF7UR" resolve="traceBackElementInCycle" />
+      <node concept="3Tm1VV" id="4ISByPp7qQq" role="1B3o_S" />
+      <node concept="3clFbS" id="4ISByPp7qQG" role="3clF47">
+        <node concept="3cpWs8" id="4ISByPp7sJ2" role="3cqZAp">
+          <node concept="3cpWsn" id="4ISByPp7sJ3" role="3cpWs9">
+            <property role="TrG5h" value="allMembers" />
+            <node concept="2I9FWS" id="4ISByPp7sJ4" role="1tU5fm">
+              <ref role="2I9WkF" to="clbe:56ytRgsLg$o" resolve="Member" />
+            </node>
+            <node concept="2OqwBi" id="4ISByPp7sJ5" role="33vP2m">
+              <node concept="13iPFW" id="4ISByPp7sJ6" role="2Oq$k0" />
+              <node concept="2qgKlT" id="4ISByPp7sJ7" role="2OqNvi">
+                <ref role="37wK5l" node="7TdHRrCpjWZ" resolve="membersIncludingTransparent" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="4ISByPp7sJ8" role="3cqZAp">
+          <node concept="3cpWsn" id="4ISByPp7sJ9" role="3cpWs9">
+            <property role="TrG5h" value="suMembers" />
+            <node concept="A3Dl8" id="4ISByPp7sJa" role="1tU5fm">
+              <node concept="3Tqbb2" id="4ISByPp7sJb" role="A3Ik2">
+                <ref role="ehGHo" to="clbe:56ytRgsLg$o" resolve="Member" />
+              </node>
+            </node>
+            <node concept="2OqwBi" id="4ISByPp7sJc" role="33vP2m">
+              <node concept="37vLTw" id="4ISByPp7sJd" role="2Oq$k0">
+                <ref role="3cqZAo" node="4ISByPp7sJ3" resolve="allMembers" />
+              </node>
+              <node concept="3zZkjj" id="4ISByPp7sJe" role="2OqNvi">
+                <node concept="1bVj0M" id="4ISByPp7sJf" role="23t8la">
+                  <node concept="3clFbS" id="4ISByPp7sJg" role="1bW5cS">
+                    <node concept="3clFbF" id="4ISByPp7sJh" role="3cqZAp">
+                      <node concept="2OqwBi" id="4ISByPp7sJi" role="3clFbG">
+                        <node concept="2OqwBi" id="4ISByPp7sJj" role="2Oq$k0">
+                          <node concept="37vLTw" id="4ISByPp7sJk" role="2Oq$k0">
+                            <ref role="3cqZAo" node="4ISByPp7sJo" resolve="it" />
+                          </node>
+                          <node concept="3TrEf2" id="4ISByPp7vGu" role="2OqNvi">
+                            <ref role="3Tt5mk" to="mj1l:hEaDaGor64" />
+                          </node>
+                        </node>
+                        <node concept="1mIQ4w" id="4ISByPp7sJm" role="2OqNvi">
+                          <node concept="chp4Y" id="4ISByPp7sJn" role="cj9EA">
+                            <ref role="cht4Q" to="clbe:3bHYGwzt_Ut" resolve="SUType" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="Rh6nW" id="4ISByPp7sJo" role="1bW2Oz">
+                    <property role="TrG5h" value="it" />
+                    <node concept="2jxLKc" id="4ISByPp7sJp" role="1tU5fm" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="4ISByPp7zSo" role="3cqZAp">
+          <node concept="3cpWsn" id="4ISByPp7zSr" role="3cpWs9">
+            <property role="TrG5h" value="result" />
+            <node concept="2hMVRd" id="4ISByPp7zSk" role="1tU5fm">
+              <node concept="3Tqbb2" id="4ISByPp7zZV" role="2hN53Y" />
+            </node>
+            <node concept="2ShNRf" id="4ISByPp7$6s" role="33vP2m">
+              <node concept="2i4dXS" id="4ISByPp7$6n" role="2ShVmc">
+                <node concept="3Tqbb2" id="4ISByPp7$6o" role="HW$YZ" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2Gpval" id="4ISByPp7tfM" role="3cqZAp">
+          <node concept="2GrKxI" id="4ISByPp7tfO" role="2Gsz3X">
+            <property role="TrG5h" value="member" />
+          </node>
+          <node concept="3clFbS" id="4ISByPp7tfQ" role="2LFqv$">
+            <node concept="3clFbJ" id="4ISByPp7tVj" role="3cqZAp">
+              <node concept="3clFbS" id="4ISByPp7tVk" role="3clFbx">
+                <node concept="3clFbF" id="4ISByPp7$8o" role="3cqZAp">
+                  <node concept="2OqwBi" id="4ISByPp7$kA" role="3clFbG">
+                    <node concept="37vLTw" id="4ISByPp7$8m" role="2Oq$k0">
+                      <ref role="3cqZAo" node="4ISByPp7zSr" resolve="result" />
+                    </node>
+                    <node concept="TSZUe" id="4ISByPp7$JW" role="2OqNvi">
+                      <node concept="2GrUjf" id="4ISByPp7$P4" role="25WWJ7">
+                        <ref role="2Gs0qQ" node="4ISByPp7tfO" resolve="member" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbC" id="4ISByPp7ycf" role="3clFbw">
+                <node concept="37vLTw" id="4ISByPp7ysE" role="3uHU7w">
+                  <ref role="3cqZAo" node="4ISByPp7qQH" resolve="dependency" />
+                </node>
+                <node concept="2OqwBi" id="4ISByPp7xrW" role="3uHU7B">
+                  <node concept="1PxgMI" id="4ISByPp7wXS" role="2Oq$k0">
+                    <ref role="1PxNhF" to="clbe:3bHYGwzt_Ut" resolve="SUType" />
+                    <node concept="2OqwBi" id="4ISByPp7u3t" role="1PxMeX">
+                      <node concept="2GrUjf" id="4ISByPp7tVX" role="2Oq$k0">
+                        <ref role="2Gs0qQ" node="4ISByPp7tfO" resolve="member" />
+                      </node>
+                      <node concept="3TrEf2" id="4ISByPp7wE5" role="2OqNvi">
+                        <ref role="3Tt5mk" to="mj1l:hEaDaGor64" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2qgKlT" id="4ISByPp7y6e" role="2OqNvi">
+                    <ref role="37wK5l" node="3bHYGwztGSo" resolve="getSUDeclaration" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="37vLTw" id="4ISByPp7tIO" role="2GsD0m">
+            <ref role="3cqZAo" node="4ISByPp7sJ9" resolve="suMembers" />
+          </node>
+        </node>
+        <node concept="3cpWs6" id="4ISByPp7yWF" role="3cqZAp">
+          <node concept="37vLTw" id="4ISByPp7$Zs" role="3cqZAk">
+            <ref role="3cqZAo" node="4ISByPp7zSr" resolve="result" />
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="4ISByPp7qQH" role="3clF46">
+        <property role="TrG5h" value="dependency" />
+        <node concept="3Tqbb2" id="4ISByPp7qQI" role="1tU5fm">
+          <ref role="ehGHo" to="vs0r:59HbAIOYkEn" resolve="IDetectCycle" />
+        </node>
+      </node>
+      <node concept="2hMVRd" id="4ISByPp7qQJ" role="3clF45">
+        <node concept="3Tqbb2" id="4ISByPp7qQK" role="2hN53Y" />
+      </node>
+    </node>
     <node concept="13hLZK" id="6a5SBPfZs1y" role="13h7CW">
       <node concept="3clFbS" id="6a5SBPfZs1z" role="2VODD2" />
     </node>
diff --git a/code/languages/com.mbeddr.core/tests/test.ts.core/tests/ts/core/importing@tests.mps b/code/languages/com.mbeddr.core/tests/test.ts.core/tests/ts/core/importing@tests.mps
index 68f692a983f..a84fdea9f7c 100644
--- a/code/languages/com.mbeddr.core/tests/test.ts.core/tests/ts/core/importing@tests.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ts.core/tests/ts/core/importing@tests.mps
@@ -61,6 +61,17 @@
       </concept>
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
+    <language id="efda956e-491e-4f00-ba14-36af2f213ecf" name="com.mbeddr.core.udt">
+      <concept id="7099329415459817973" name="com.mbeddr.core.udt.structure.SUDeclaration" flags="ng" index="HsMI8">
+        <child id="7099329415459888018" name="members" index="HszBJ" />
+      </concept>
+      <concept id="8685795338482689976" name="com.mbeddr.core.udt.structure.AnonymousStructDeclaration" flags="ng" index="QyKdJ" />
+      <concept id="5882395403881875736" name="com.mbeddr.core.udt.structure.Member" flags="ng" index="1dpRTG" />
+      <concept id="6394819151180597807" name="com.mbeddr.core.udt.structure.StructDeclaration" flags="ng" index="1sgJKc" />
+      <concept id="6394819151180597816" name="com.mbeddr.core.udt.structure.StructType" flags="ng" index="1sgJKr">
+        <reference id="6394819151180597817" name="struct" index="1sgJKq" />
+      </concept>
+    </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
       <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
@@ -100,6 +111,7 @@
       </concept>
     </language>
     <language id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions">
+      <concept id="8463282783691618440" name="com.mbeddr.core.expressions.structure.Int32tType" flags="ng" index="26Vqph" />
       <concept id="8463282783691618426" name="com.mbeddr.core.expressions.structure.Int8tType" flags="ng" index="26Vqqz" />
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
@@ -145,6 +157,38 @@
         <property role="2hmy$m" value="10" />
       </node>
     </node>
+    <node concept="2NXPZ9" id="4ISByPp52YF" role="N3F5h">
+      <property role="TrG5h" value="empty_1453888721444_1" />
+    </node>
+    <node concept="1sgJKc" id="4ISByPp52Z0" role="N3F5h">
+      <property role="TrG5h" value="A" />
+      <node concept="1dpRTG" id="4ISByPp60s$" role="HszBJ">
+        <property role="TrG5h" value="a" />
+        <node concept="1sgJKr" id="4ISByPp60sz" role="2C2TGm">
+          <property role="2caQfQ" value="false" />
+          <property role="2c7vTL" value="false" />
+          <ref role="1sgJKq" node="4ISByPp52Z0" resolve="A" />
+        </node>
+      </node>
+      <node concept="QyKdJ" id="4ISByPp7qHb" role="HszBJ">
+        <property role="TrG5h" value="q" />
+        <node concept="1dpRTG" id="4ISByPp7qHs" role="HszBJ">
+          <property role="TrG5h" value="bb" />
+          <node concept="1sgJKr" id="4ISByPp7qHr" role="2C2TGm">
+            <property role="2caQfQ" value="false" />
+            <property role="2c7vTL" value="false" />
+            <ref role="1sgJKq" node="4ISByPp52Z0" resolve="A" />
+          </node>
+        </node>
+      </node>
+      <node concept="1dpRTG" id="4ISByPp7lUI" role="HszBJ">
+        <property role="TrG5h" value="b" />
+        <node concept="26Vqph" id="4ISByPp7lUG" role="2C2TGm">
+          <property role="2caQfQ" value="false" />
+          <property role="2c7vTL" value="false" />
+        </node>
+      </node>
+    </node>
     <node concept="2NXPZ9" id="6uZAbUKexSG" role="N3F5h">
       <property role="TrG5h" value="empty_1364212237400_2" />
     </node>
@@ -156,6 +200,9 @@
       <property role="3GEa6x" value="true" />
       <ref role="3GEb4d" node="6uZAbUKeCcu" resolve="M3" />
     </node>
+    <node concept="3GEVxB" id="4ISByPoXsPM" role="2OODSX">
+      <ref role="3GEb4d" node="6uZAbUKexTN" resolve="M2" />
+    </node>
   </node>
   <node concept="1lH9Xt" id="6uZAbUKexSN">
     <property role="TrG5h" value="TestImportReexport" />
@@ -329,6 +376,9 @@
     <node concept="2NXPZ9" id="6uZAbUKexTQ" role="N3F5h">
       <property role="TrG5h" value="empty_1364212442558_11" />
     </node>
+    <node concept="3GEVxB" id="17fjvcLFTT9" role="2OODSX">
+      <ref role="3GEb4d" node="6uZAbUKeCcu" resolve="M3" />
+    </node>
   </node>
   <node concept="N3F5e" id="6uZAbUKeCcu">
     <property role="TrG5h" value="M3" />
@@ -389,6 +439,9 @@
     <node concept="2NXPZ9" id="6uZAbUKf2lb" role="N3F5h">
       <property role="TrG5h" value="empty_1364212442558_11" />
     </node>
+    <node concept="3GEVxB" id="17fjvcLFTTV" role="2OODSX">
+      <ref role="3GEb4d" node="6uZAbUKexSE" resolve="M1" />
+    </node>
   </node>
   <node concept="2v9HqL" id="4ifG318a7qu">
     <node concept="2xfidK" id="2nospmWkMyC" role="2AWWZH">

From 36f0776ca18c2a9613a1b4e0f5efad15f570c9da Mon Sep 17 00:00:00 2001
From: Kolja Dummann <kolja.dummann@logv.ws>
Date: Wed, 27 Jan 2016 16:20:03 +0100
Subject: [PATCH 2/4] core: update struct and union type constraints

---
 .../languageModels/constraints.mps            | 65 +++++++++++++++++++
 .../languageModels/editor.mps                 | 54 +++++++++++++--
 .../languageModels/structure.mps              |  4 +-
 .../languages/com.mbeddr.core.util/util.mpl   |  4 +-
 4 files changed, 119 insertions(+), 8 deletions(-)

diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/constraints.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/constraints.mps
index e2ed681e211..699a0f373d5 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/constraints.mps
@@ -35,6 +35,9 @@
       <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
         <child id="1137022507850" name="body" index="2VODD2" />
       </concept>
+      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
+        <property id="1070475926801" name="value" index="Xl_RC" />
+      </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
@@ -99,9 +102,11 @@
       <concept id="1147467115080" name="jetbrains.mps.lang.constraints.structure.NodePropertyConstraint" flags="ng" index="EnEH3">
         <reference id="1147467295099" name="applicableProperty" index="EomxK" />
         <child id="1147468630220" name="propertyGetter" index="EtsB7" />
+        <child id="1212097481299" name="propertyValidator" index="QCWH9" />
       </concept>
       <concept id="1147467790433" name="jetbrains.mps.lang.constraints.structure.ConstraintFunction_PropertyGetter" flags="in" index="Eqf_E" />
       <concept id="1147468365020" name="jetbrains.mps.lang.constraints.structure.ConstraintsFunctionParameter_node" flags="nn" index="EsrRn" />
+      <concept id="1212096972063" name="jetbrains.mps.lang.constraints.structure.ConstraintFunction_PropertyValidator" flags="in" index="QB0g5" />
       <concept id="1213093968558" name="jetbrains.mps.lang.constraints.structure.ConceptConstraints" flags="ng" index="1M2fIO">
         <reference id="1213093996982" name="concept" index="1M2myG" />
         <child id="1213098023997" name="property" index="1MhHOB" />
@@ -1081,10 +1086,50 @@
   <node concept="1M2fIO" id="7ya9dte0iT_">
     <property role="3GE5qa" value="su.struct" />
     <ref role="1M2myG" to="clbe:7ya9dte0iuS" resolve="AnonymousStructDeclaration" />
+    <node concept="EnEH3" id="2UJM6DuNNUZ" role="1MhHOB">
+      <ref role="EomxK" to="tpck:h0TrG11" resolve="name" />
+      <node concept="QB0g5" id="2UJM6DuNNV2" role="QCWH9">
+        <node concept="3clFbS" id="2UJM6DuNNV3" role="2VODD2">
+          <node concept="3clFbF" id="2UJM6DuNNWa" role="3cqZAp">
+            <node concept="3clFbT" id="2UJM6DuNNW9" role="3clFbG">
+              <property role="3clFbU" value="true" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="Eqf_E" id="2UJM6DuNNXu" role="EtsB7">
+        <node concept="3clFbS" id="2UJM6DuNNXv" role="2VODD2">
+          <node concept="3clFbF" id="2UJM6DuNNYa" role="3cqZAp">
+            <node concept="Xl_RD" id="2UJM6DuNNY9" role="3clFbG">
+              <property role="Xl_RC" value="" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
   </node>
   <node concept="1M2fIO" id="7ya9dte0lC$">
     <property role="3GE5qa" value="su.union" />
     <ref role="1M2myG" to="clbe:7ya9dte0lCz" resolve="AnonymousUnionDeclaration" />
+    <node concept="EnEH3" id="2UJM6DuMJfo" role="1MhHOB">
+      <ref role="EomxK" to="tpck:h0TrG11" resolve="name" />
+      <node concept="QB0g5" id="2UJM6DuMJfr" role="QCWH9">
+        <node concept="3clFbS" id="2UJM6DuMJfs" role="2VODD2">
+          <node concept="3clFbF" id="2UJM6DuMJgz" role="3cqZAp">
+            <node concept="3clFbT" id="2UJM6DuMJgy" role="3clFbG">
+              <property role="3clFbU" value="true" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="Eqf_E" id="2UJM6DuMJhR" role="EtsB7">
+        <node concept="3clFbS" id="2UJM6DuMJhS" role="2VODD2">
+          <node concept="3clFbF" id="2UJM6DuMJj6" role="3cqZAp">
+            <node concept="Xl_RD" id="2UJM6DuMJj5" role="3clFbG" />
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="nKS2y" id="7ya9dte0lC_" role="1MLUbF">
       <node concept="3clFbS" id="7ya9dte0lCA" role="2VODD2">
         <node concept="3clFbF" id="7ya9dte0mhY" role="3cqZAp">
@@ -1351,5 +1396,25 @@
       </node>
     </node>
   </node>
+  <node concept="1M2fIO" id="2UJM6DuOSG5">
+    <property role="3GE5qa" value="su.struct" />
+    <ref role="1M2myG" to="clbe:2CEi94edfgd" resolve="ModuleContentSUDeclaration" />
+    <node concept="nKS2y" id="2UJM6DuOSG6" role="1MLUbF">
+      <node concept="3clFbS" id="2UJM6DuOSG7" role="2VODD2">
+        <node concept="3clFbF" id="2UJM6DuOSHe" role="3cqZAp">
+          <node concept="3fqX7Q" id="2UJM6DuOSU8" role="3clFbG">
+            <node concept="2OqwBi" id="2UJM6DuOSUa" role="3fr31v">
+              <node concept="nLn13" id="2UJM6DuOSUb" role="2Oq$k0" />
+              <node concept="1mIQ4w" id="2UJM6DuOSUc" role="2OqNvi">
+                <node concept="chp4Y" id="2UJM6DuOSUd" role="cj9EA">
+                  <ref role="cht4Q" to="clbe:6a5SBPfXGBP" resolve="SUDeclaration" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/editor.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/editor.mps
index 43d9a35b882..7cd4fbf9c87 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/editor.mps
@@ -1066,10 +1066,6 @@
         <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
         <ref role="1k5W1q" to="r4b4:2CEi94dgHKA" resolve="KW" />
       </node>
-      <node concept="3F0A7n" id="6QawkaHMad0" role="3EZMnx">
-        <ref role="1k5W1q" to="r4b4:2CEi94dhQNo" resolve="StructUnion" />
-        <ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
-      </node>
       <node concept="3F0ifn" id="6QawkaHMad1" role="3EZMnx">
         <property role="3F0ifm" value="{" />
         <ref role="1k5W1q" to="r4b4:2CEi94dgZq3" resolve="Braces" />
@@ -1111,5 +1107,55 @@
       <node concept="l2Vlx" id="6QawkaHMadd" role="2iSdaV" />
     </node>
   </node>
+  <node concept="24kQdi" id="2UJM6DuMJ_6">
+    <property role="3GE5qa" value="su.union" />
+    <ref role="1XX52x" to="clbe:7ya9dte0lCz" resolve="AnonymousUnionDeclaration" />
+    <node concept="3EZMnI" id="2UJM6DuMJ_8" role="2wV5jI">
+      <node concept="PMmxH" id="2UJM6DuMJ_9" role="3EZMnx">
+        <property role="1cu_pB" value="0" />
+        <ref role="1k5W1q" to="r4b4:2CEi94dgHKA" resolve="KW" />
+        <ref role="PMmxG" to="tpco:2wZex4PafBj" resolve="alias" />
+      </node>
+      <node concept="3F0ifn" id="2UJM6DuMJ_b" role="3EZMnx">
+        <property role="3F0ifm" value="{" />
+        <ref role="1k5W1q" to="r4b4:2CEi94dgZq3" resolve="Braces" />
+        <node concept="ljvvj" id="2UJM6DuMJ_c" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+      </node>
+      <node concept="3F2HdR" id="2UJM6DuMJ_d" role="3EZMnx">
+        <property role="S$F3r" value="true" />
+        <ref role="1NtTu8" to="clbe:6a5SBPfXXIi" />
+        <node concept="lj46D" id="2UJM6DuMJ_e" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="pj6Ft" id="2UJM6DuMJ_f" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="l2Vlx" id="2UJM6DuMJ_g" role="2czzBx" />
+        <node concept="ljvvj" id="2UJM6DuMJ_h" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="3F0ifn" id="2UJM6DuMJ_i" role="2czzBI">
+          <property role="3F0ifm" value="" />
+          <node concept="VPxyj" id="2UJM6DuMJ_j" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+        </node>
+      </node>
+      <node concept="3F0ifn" id="2UJM6DuMJ_k" role="3EZMnx">
+        <property role="3F0ifm" value="}" />
+        <ref role="1k5W1q" to="r4b4:2CEi94dgZq3" resolve="Braces" />
+      </node>
+      <node concept="3F0ifn" id="2UJM6DuMJ_l" role="3EZMnx">
+        <property role="3F0ifm" value=";" />
+        <ref role="1k5W1q" to="r4b4:2CEi94dhkRt" resolve="Semi" />
+        <node concept="ljvvj" id="2UJM6DuMJ_m" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+      </node>
+      <node concept="l2Vlx" id="2UJM6DuMJ_n" role="2iSdaV" />
+    </node>
+  </node>
 </model>
 
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/structure.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/structure.mps
index 0490943be3e..5f758eb39f8 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/structure.mps
@@ -78,7 +78,7 @@
       <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="struct" />
       <property role="20lbJX" value="1" />
-      <ref role="20lvS9" node="6a5SBPfXGBP" resolve="SUDeclaration" />
+      <ref role="20lvS9" node="5yYXyc4Z0CJ" resolve="StructDeclaration" />
     </node>
     <node concept="PrWs8" id="5HxjapwgqUc" role="PzmwI">
       <ref role="PrY4T" to="tpck:1_TrU5E6oyb" resolve="IDontSubstituteByDefault" />
@@ -279,7 +279,7 @@
       <property role="20lmBu" value="reference" />
       <property role="20kJfa" value="union" />
       <property role="20lbJX" value="1" />
-      <ref role="20lvS9" node="6a5SBPfXGBP" resolve="SUDeclaration" />
+      <ref role="20lvS9" node="56ytRgsLodU" resolve="UnionDeclaration" />
     </node>
   </node>
   <node concept="1TIwiD" id="5nhrDHCgX5n">
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/util.mpl b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/util.mpl
index 0f851922753..88b55ff9a55 100755
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/util.mpl
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.util/util.mpl
@@ -270,8 +270,8 @@
     <language id="61c69711-ed61-4850-81d9-7714ff227fb0" fqName="com.mbeddr.core.expressions" version="2" />
     <language id="63e0e566-5131-447e-90e3-12ea330e1a00" fqName="com.mbeddr.mpsutil.blutil" version="1" />
     <language id="a482b416-d0c9-473f-8f67-725ed642b3f3" fqName="com.mbeddr.mpsutil.breadcrumb" version="0" />
-    <language id="935bff03-e393-4547-a3a2-60335e0cad25" fqName="com.mbeddr.mpsutil.ccmenu" version="0" />
-    <language id="f92af8d7-1fae-4067-8109-17acf80f8e58" fqName="com.mbeddr.mpsutil.ccmenu.reftarget" version="0" />
+    <language id="935bff03-e393-4547-a3a2-60335e0cad25" fqName="com.mbeddr.mpsutil.ccmenu" version="-1" />
+    <language id="f92af8d7-1fae-4067-8109-17acf80f8e58" fqName="com.mbeddr.mpsutil.ccmenu.reftarget" version="-1" />
     <language id="b92f861d-0184-446d-b88b-6dcf0e070241" fqName="com.mbeddr.mpsutil.intentions" version="0" />
     <language id="47f075a6-558e-4640-a606-7ce0236c8023" fqName="com.mbeddr.mpsutil.interpreter" version="0" />
     <language id="d09a16fb-1d68-4a92-a5a4-20b4b2f86a62" fqName="com.mbeddr.mpsutil.jung" version="0" />

From 0a50c5cc0aee3a3c369a5f1385bc3e0582e0caed Mon Sep 17 00:00:00 2001
From: Tamas Szabo <tamas.szabo@itemis.de>
Date: Wed, 27 Jan 2016 17:13:20 +0100
Subject: [PATCH 3/4] su overhaul part 1

---
 .../generator/template/main@generator.mps     | 225 +------
 .../languageModels/behavior.mps               | 316 +++------
 .../languageModels/constraints.mps            | 275 +-------
 .../languageModels/editor.mps                 |  34 -
 .../languageModels/migration.mps              |   2 +
 .../languageModels/structure.mps              |  14 -
 .../languageModels/typesystem.mps             |  30 -
 .../languages/com.mbeddr.core.udt/udt.mpl     |   1 +
 .../test/ex/core/anonymous_member.mps         | 443 -------------
 .../test/ex/core/structsAndEnums.mps          |  21 +-
 .../test.ex.core/test/ex/core/unions.mps      |  16 +-
 .../test.ts.core/models/tests1@tests.mps      | 604 ------------------
 .../tests/ts/core/importing@tests.mps         |  65 +-
 .../com/mbeddr/mpsutil/common/graph.mps       |  22 +-
 14 files changed, 136 insertions(+), 1932 deletions(-)
 delete mode 100644 code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/anonymous_member.mps

diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/generator/template/main@generator.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/generator/template/main@generator.mps
index 0396ba99a51..095d02b7235 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/generator/template/main@generator.mps
@@ -17,240 +17,17 @@
     <import index="mj1l" ref="r:c371cf98-dcc8-4a43-8eb8-8a8096de18b2(com.mbeddr.core.expressions.structure)" />
   </imports>
   <registry>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
-      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
-        <child id="1197027771414" name="operand" index="2Oq$k0" />
-        <child id="1197027833540" name="operation" index="2OqNvi" />
-      </concept>
-      <concept id="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
-        <child id="1137022507850" name="body" index="2VODD2" />
-      </concept>
-      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
-        <child id="1068580123156" name="expression" index="3clFbG" />
-      </concept>
-      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
-        <child id="1068581517665" name="statement" index="3cqZAp" />
-      </concept>
-    </language>
-    <language id="a9d69647-0840-491e-bf39-2eb0805d2011" name="com.mbeddr.core.statements">
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
-        <child id="7763322639126652758" name="baseType" index="2umbIo" />
-      </concept>
-      <concept id="7254843406768833938" name="com.mbeddr.core.statements.structure.ExpressionStatement" flags="ng" index="1_9egQ">
-        <child id="7254843406768833939" name="expr" index="1_9egR" />
-      </concept>
-      <concept id="4185783222026475238" name="com.mbeddr.core.statements.structure.LocalVariableDeclaration" flags="ng" index="3XIRlf" />
-      <concept id="4185783222026475861" name="com.mbeddr.core.statements.structure.StatementList" flags="ng" index="3XIRFW">
-        <child id="4185783222026475862" name="statements" index="3XIRFZ" />
-      </concept>
-      <concept id="2093108837558113914" name="com.mbeddr.core.statements.structure.LocalVarRef" flags="ng" index="3ZVu4v">
-        <reference id="2093108837558124071" name="var" index="3ZVs_2" />
-      </concept>
-    </language>
-    <language id="3bf5377a-e904-4ded-9754-5a516023bfaa" name="com.mbeddr.core.pointers">
-      <concept id="6113173064528067332" name="com.mbeddr.core.pointers.structure.StringType" flags="ng" index="Pu267" />
-      <concept id="5679441017214012545" name="com.mbeddr.core.pointers.structure.ArrayType" flags="ng" index="3J0A42" />
-    </language>
     <language id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator">
-      <concept id="1114706874351" name="jetbrains.mps.lang.generator.structure.CopySrcNodeMacro" flags="ln" index="29HgVG">
-        <child id="1168024447342" name="sourceNodeQuery" index="3NFExx" />
-      </concept>
-      <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia">
-        <child id="1167328349397" name="reductionMappingRule" index="3acgRq" />
-      </concept>
-      <concept id="1095672379244" name="jetbrains.mps.lang.generator.structure.TemplateFragment" flags="ng" index="raruj" />
-      <concept id="1167168920554" name="jetbrains.mps.lang.generator.structure.BaseMappingRule_Condition" flags="in" index="30G5F_" />
-      <concept id="1167169188348" name="jetbrains.mps.lang.generator.structure.TemplateFunctionParameter_sourceNode" flags="nn" index="30H73N" />
-      <concept id="1167169308231" name="jetbrains.mps.lang.generator.structure.BaseMappingRule" flags="ng" index="30H$t8">
-        <reference id="1167169349424" name="applicableConcept" index="30HIoZ" />
-        <child id="1167169362365" name="conditionFunction" index="30HLyM" />
-      </concept>
-      <concept id="1167327847730" name="jetbrains.mps.lang.generator.structure.Reduction_MappingRule" flags="lg" index="3aamgX">
-        <child id="1169672767469" name="ruleConsequence" index="1lVwrX" />
-      </concept>
-      <concept id="8900764248744213868" name="jetbrains.mps.lang.generator.structure.InlineTemplateWithContext_RuleConsequence" flags="lg" index="1Koe21">
-        <child id="8900764248744213871" name="contentNode" index="1Koe22" />
-      </concept>
-      <concept id="1168024337012" name="jetbrains.mps.lang.generator.structure.SourceSubstituteMacro_SourceNodeQuery" flags="in" index="3NFfHV" />
-    </language>
-    <language id="efda956e-491e-4f00-ba14-36af2f213ecf" name="com.mbeddr.core.udt">
-      <concept id="3930924638067536683" name="com.mbeddr.core.udt.structure.ArbitraryMemeberRef" flags="ng" index="2kls0a">
-        <property id="3930924638067536840" name="membername" index="2kls3D" />
-      </concept>
-      <concept id="7099329415459817973" name="com.mbeddr.core.udt.structure.SUDeclaration" flags="ng" index="HsMI8">
-        <child id="7099329415459888018" name="members" index="HszBJ" />
-      </concept>
-      <concept id="5882395403881875736" name="com.mbeddr.core.udt.structure.Member" flags="ng" index="1dpRTG" />
-      <concept id="6394819151180597807" name="com.mbeddr.core.udt.structure.StructDeclaration" flags="ng" index="1sgJKc" />
-      <concept id="6394819151180597816" name="com.mbeddr.core.udt.structure.StructType" flags="ng" index="1sgJKr">
-        <reference id="6394819151180597817" name="struct" index="1sgJKq" />
-      </concept>
-    </language>
-    <language id="6d11763d-483d-4b2b-8efc-09336c1b0001" name="com.mbeddr.core.modules">
-      <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
-        <child id="8967919205527146150" name="expression" index="2BFjQA" />
-      </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
-        <child id="5708867820623310661" name="arguments" index="1UOdpc" />
-      </concept>
-      <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
-        <child id="6437088627575722833" name="contents" index="N3F5h" />
-      </concept>
-      <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
-        <property id="1317894735999272944" name="exported" index="2OOxQR" />
-      </concept>
-      <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
-        <child id="4185783222026475860" name="body" index="3XIRFX" />
-      </concept>
-      <concept id="7892328519581704407" name="com.mbeddr.core.modules.structure.Argument" flags="ng" index="19RgSI" />
-    </language>
-    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
-      <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
-        <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
-      </concept>
-      <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
-        <child id="1177027386292" name="conceptArgument" index="cj9EA" />
-      </concept>
-      <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
-        <reference id="1138056516764" name="link" index="3Tt5mk" />
-      </concept>
+      <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
-        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
-      </concept>
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
-    <language id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions">
-      <concept id="8463282783691618440" name="com.mbeddr.core.expressions.structure.Int32tType" flags="ng" index="26Vqph" />
-      <concept id="8463282783691618435" name="com.mbeddr.core.expressions.structure.Int16tType" flags="ng" index="26Vqpq" />
-      <concept id="3005510381523579442" name="com.mbeddr.core.expressions.structure.UnaryExpression" flags="ng" index="2aKSnQ">
-        <child id="7254843406768839760" name="expression" index="1_9fRO" />
-      </concept>
-      <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
-        <property id="2212975673976043696" name="value" index="2hmy$m" />
-      </concept>
-      <concept id="4620120465980402700" name="com.mbeddr.core.expressions.structure.GenericDotExpression" flags="ng" index="2qmXGp">
-        <child id="7034214596252529803" name="target" index="1ESnxz" />
-      </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
-        <child id="318113533128716676" name="type" index="2C2TGm" />
-      </concept>
-      <concept id="8860443239512128054" name="com.mbeddr.core.expressions.structure.Type" flags="ng" index="3TlMgo">
-        <property id="2941277002445651368" name="const" index="2c7vTL" />
-        <property id="2941277002448691247" name="volatile" index="2caQfQ" />
-      </concept>
-      <concept id="8860443239512128103" name="com.mbeddr.core.expressions.structure.NumberLiteral" flags="ng" index="3TlMh9" />
-    </language>
   </registry>
   <node concept="bUwia" id="7ya9dtegX_R">
     <property role="TrG5h" value="main" />
-    <node concept="3aamgX" id="7KLlXp7NWI2" role="3acgRq">
-      <ref role="30HIoZ" to="mj1l:40tXLnqhyKc" resolve="GenericDotExpression" />
-      <node concept="1Koe21" id="7KLlXp7NZDf" role="1lVwrX">
-        <node concept="N3F5e" id="7KLlXp7NZS7" role="1Koe22">
-          <property role="TrG5h" value="dummy" />
-          <node concept="1sgJKc" id="7KLlXp7NZSb" role="N3F5h">
-            <property role="TrG5h" value="aStruct" />
-            <node concept="1dpRTG" id="7KLlXp7NZSf" role="HszBJ">
-              <property role="TrG5h" value="a" />
-              <node concept="26Vqpq" id="7KLlXp7NZSe" role="2C2TGm">
-                <property role="2caQfQ" value="false" />
-                <property role="2c7vTL" value="false" />
-              </node>
-            </node>
-          </node>
-          <node concept="N3Fnx" id="7KLlXp7O00d" role="N3F5h">
-            <property role="TrG5h" value="main" />
-            <property role="2OOxQR" value="true" />
-            <node concept="3XIRFW" id="7KLlXp7O00f" role="3XIRFX">
-              <node concept="3XIRlf" id="7KLlXp7O0gw" role="3XIRFZ">
-                <property role="TrG5h" value="v" />
-                <node concept="1sgJKr" id="7KLlXp7O0gv" role="2C2TGm">
-                  <property role="2caQfQ" value="false" />
-                  <property role="2c7vTL" value="false" />
-                  <ref role="1sgJKq" node="7KLlXp7NZSb" resolve="aStruct" />
-                </node>
-              </node>
-              <node concept="1_9egQ" id="7KLlXp7O0Zh" role="3XIRFZ">
-                <node concept="2qmXGp" id="7KLlXp7O12E" role="1_9egR">
-                  <node concept="2kls0a" id="7KLlXp7O1j$" role="1ESnxz">
-                    <property role="2kls3D" value="dummy" />
-                  </node>
-                  <node concept="3ZVu4v" id="7KLlXp7O0Zf" role="1_9fRO">
-                    <ref role="3ZVs_2" node="7KLlXp7O0gw" resolve="v" />
-                    <node concept="raruj" id="5WwC2ssVJKU" role="lGtFl" />
-                    <node concept="29HgVG" id="5WwC2ssVQGM" role="lGtFl">
-                      <node concept="3NFfHV" id="5WwC2ssVQGN" role="3NFExx">
-                        <node concept="3clFbS" id="5WwC2ssVQGO" role="2VODD2">
-                          <node concept="3clFbF" id="5WwC2ssVRfK" role="3cqZAp">
-                            <node concept="2OqwBi" id="5WwC2ssVQGP" role="3clFbG">
-                              <node concept="3TrEf2" id="5WwC2ssVQGS" role="2OqNvi">
-                                <ref role="3Tt5mk" to="mj1l:6iIoqg1yDLg" />
-                              </node>
-                              <node concept="30H73N" id="5WwC2ssVRfJ" role="2Oq$k0" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="2BFjQ_" id="7KLlXp7O00n" role="3XIRFZ">
-                <node concept="3TlMh9" id="7KLlXp7O00o" role="2BFjQA">
-                  <property role="2hmy$m" value="0" />
-                </node>
-              </node>
-            </node>
-            <node concept="26Vqph" id="7KLlXp7O00h" role="2C2TGm">
-              <property role="2caQfQ" value="false" />
-              <property role="2c7vTL" value="false" />
-            </node>
-            <node concept="19RgSI" id="7KLlXp7O00i" role="1UOdpc">
-              <property role="TrG5h" value="argc" />
-              <node concept="26Vqph" id="7KLlXp7O00j" role="2C2TGm">
-                <property role="2caQfQ" value="false" />
-                <property role="2c7vTL" value="false" />
-              </node>
-            </node>
-            <node concept="19RgSI" id="7KLlXp7O00k" role="1UOdpc">
-              <property role="TrG5h" value="argv" />
-              <node concept="3J0A42" id="7KLlXp7O00l" role="2C2TGm">
-                <property role="2caQfQ" value="false" />
-                <property role="2c7vTL" value="false" />
-                <node concept="Pu267" id="7KLlXp7O00m" role="2umbIo">
-                  <property role="2caQfQ" value="false" />
-                  <property role="2c7vTL" value="false" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="30G5F_" id="7KLlXp7NWI8" role="30HLyM">
-        <node concept="3clFbS" id="7KLlXp7NWI9" role="2VODD2">
-          <node concept="3clFbF" id="7KLlXp7NWSm" role="3cqZAp">
-            <node concept="2OqwBi" id="7KLlXp7NYIO" role="3clFbG">
-              <node concept="2OqwBi" id="7KLlXp7NWZQ" role="2Oq$k0">
-                <node concept="30H73N" id="7KLlXp7NWSl" role="2Oq$k0" />
-                <node concept="3TrEf2" id="7KLlXp7NXU_" role="2OqNvi">
-                  <ref role="3Tt5mk" to="mj1l:66uzewbvZib" />
-                </node>
-              </node>
-              <node concept="1mIQ4w" id="7KLlXp7NZbZ" role="2OqNvi">
-                <node concept="chp4Y" id="7KLlXp7NZqp" role="cj9EA">
-                  <ref role="cht4Q" to="clbe:1$5WwmOqNKi" resolve="InnerSUDeclarationRef" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
   </node>
 </model>
 
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/behavior.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/behavior.mps
index 81beeef15ff..3a15b3398ff 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/behavior.mps
@@ -407,7 +407,6 @@
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
-      <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
       <concept id="1178286324487" name="jetbrains.mps.baseLanguage.collections.structure.SortDirection" flags="nn" index="1nlBCl" />
       <concept id="1197683403723" name="jetbrains.mps.baseLanguage.collections.structure.MapType" flags="in" index="3rvAFt">
         <child id="1197683466920" name="keyType" index="3rvQeY" />
@@ -3655,123 +3654,9 @@
       <property role="TrG5h" value="getUniquelyNamedElements" />
       <ref role="13i0hy" to="hwgx:4qSf1u1TRfj" resolve="getUniquelyNamedElements" />
       <node concept="3clFbS" id="4qSf1u1Vs15" role="3clF47">
-        <node concept="3cpWs8" id="7ya9dte9AQF" role="3cqZAp">
-          <node concept="3cpWsn" id="7ya9dte9AQI" role="3cpWs9">
-            <property role="TrG5h" value="result" />
-            <node concept="2I9FWS" id="7ya9dte9AQD" role="1tU5fm">
-              <ref role="2I9WkF" to="tpck:h0TrEE$" resolve="INamedConcept" />
-            </node>
-            <node concept="2ShNRf" id="7ya9dte9B1m" role="33vP2m">
-              <node concept="2T8Vx0" id="7ya9dte9PQR" role="2ShVmc">
-                <node concept="2I9FWS" id="7ya9dte9PQT" role="2T96Bj">
-                  <ref role="2I9WkF" to="tpck:h0TrEE$" resolve="INamedConcept" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="7ya9dte9Qec" role="3cqZAp">
-          <node concept="2OqwBi" id="7ya9dte9QCg" role="3clFbG">
-            <node concept="37vLTw" id="7ya9dte9Qea" role="2Oq$k0">
-              <ref role="3cqZAo" node="7ya9dte9AQI" resolve="result" />
-            </node>
-            <node concept="X8dFx" id="7ya9dte9Wnc" role="2OqNvi">
-              <node concept="2OqwBi" id="6QawkaHVhrC" role="25WWJ7">
-                <node concept="2OqwBi" id="7ya9dte9XZX" role="2Oq$k0">
-                  <node concept="13iPFW" id="7ya9dte9XRY" role="2Oq$k0" />
-                  <node concept="3Tsc0h" id="6QawkaHVgdb" role="2OqNvi">
-                    <ref role="3TtcxE" to="clbe:6a5SBPfXXIi" />
-                  </node>
-                </node>
-                <node concept="v3k3i" id="6QawkaHVkYX" role="2OqNvi">
-                  <node concept="chp4Y" id="6QawkaHVlMg" role="v3oSu">
-                    <ref role="cht4Q" to="clbe:56ytRgsLg$o" resolve="Member" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="7ya9dtea_pY" role="3cqZAp" />
-        <node concept="3clFbF" id="7ya9dteaoqf" role="3cqZAp">
-          <node concept="2OqwBi" id="7ya9dteapli" role="3clFbG">
-            <node concept="37vLTw" id="7ya9dteaoqd" role="2Oq$k0">
-              <ref role="3cqZAo" node="7ya9dte9AQI" resolve="result" />
-            </node>
-            <node concept="X8dFx" id="7ya9dteat6F" role="2OqNvi">
-              <node concept="2OqwBi" id="7ya9dteaiyR" role="25WWJ7">
-                <node concept="2OqwBi" id="7ya9dteai1G" role="2Oq$k0">
-                  <node concept="2OqwBi" id="7ya9dteai1H" role="2Oq$k0">
-                    <node concept="13iPFW" id="7ya9dteai1I" role="2Oq$k0" />
-                    <node concept="3Tsc0h" id="7ya9dteai1J" role="2OqNvi">
-                      <ref role="3TtcxE" to="clbe:6a5SBPfXXIi" />
-                    </node>
-                  </node>
-                  <node concept="3zZkjj" id="7ya9dteai1K" role="2OqNvi">
-                    <node concept="1bVj0M" id="7ya9dteai1L" role="23t8la">
-                      <node concept="3clFbS" id="7ya9dteai1M" role="1bW5cS">
-                        <node concept="3clFbF" id="7ya9dteai1N" role="3cqZAp">
-                          <node concept="22lmx$" id="7ya9dteai1O" role="3clFbG">
-                            <node concept="2OqwBi" id="7ya9dteai1P" role="3uHU7w">
-                              <node concept="37vLTw" id="7ya9dteai1Q" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7ya9dteai1X" resolve="it" />
-                              </node>
-                              <node concept="1mIQ4w" id="7ya9dteai1R" role="2OqNvi">
-                                <node concept="chp4Y" id="7ya9dteai1S" role="cj9EA">
-                                  <ref role="cht4Q" to="clbe:7ya9dte0lCz" resolve="AnonymousUnionDeclaration" />
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="2OqwBi" id="7ya9dteai1T" role="3uHU7B">
-                              <node concept="37vLTw" id="7ya9dteai1U" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7ya9dteai1X" resolve="it" />
-                              </node>
-                              <node concept="1mIQ4w" id="7ya9dteai1V" role="2OqNvi">
-                                <node concept="chp4Y" id="7ya9dteai1W" role="cj9EA">
-                                  <ref role="cht4Q" to="clbe:7ya9dte0iuS" resolve="AnonymousStructDeclaration" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="Rh6nW" id="7ya9dteai1X" role="1bW2Oz">
-                        <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7ya9dteai1Y" role="1tU5fm" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3goQfb" id="7ya9dteakE9" role="2OqNvi">
-                  <node concept="1bVj0M" id="7ya9dteakEb" role="23t8la">
-                    <node concept="3clFbS" id="7ya9dteakEc" role="1bW5cS">
-                      <node concept="3clFbF" id="7ya9dteakKM" role="3cqZAp">
-                        <node concept="2OqwBi" id="7ya9dteamkE" role="3clFbG">
-                          <node concept="1PxgMI" id="7ya9dtealKN" role="2Oq$k0">
-                            <ref role="1PxNhF" to="clbe:6a5SBPfXGBP" resolve="SUDeclaration" />
-                            <node concept="37vLTw" id="7ya9dteakKL" role="1PxMeX">
-                              <ref role="3cqZAo" node="7ya9dteakEd" resolve="it" />
-                            </node>
-                          </node>
-                          <node concept="2qgKlT" id="7ya9dteanrx" role="2OqNvi">
-                            <ref role="37wK5l" node="7TdHRrCpjWZ" resolve="membersIncludingTransparent" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="Rh6nW" id="7ya9dteakEd" role="1bW2Oz">
-                      <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7ya9dteakEe" role="1tU5fm" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs6" id="4qSf1u1Vs16" role="3cqZAp">
-          <node concept="37vLTw" id="7ya9dtea0Qc" role="3cqZAk">
-            <ref role="3cqZAo" node="7ya9dte9AQI" resolve="result" />
+        <node concept="3cpWs6" id="1Nl0v8EOKCF" role="3cqZAp">
+          <node concept="BsUDl" id="1Nl0v8EOKD1" role="3cqZAk">
+            <ref role="37wK5l" node="7TdHRrCpjWZ" resolve="membersIncludingTransparent" />
           </node>
         </node>
       </node>
@@ -3830,89 +3715,118 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="6QawkaHOwNL" role="3cqZAp">
-          <node concept="2OqwBi" id="6QawkaHOydB" role="3clFbG">
-            <node concept="37vLTw" id="6QawkaHOwNJ" role="2Oq$k0">
-              <ref role="3cqZAo" node="6QawkaHOeY0" resolve="members" />
-            </node>
-            <node concept="X8dFx" id="6QawkaHOAAl" role="2OqNvi">
-              <node concept="2OqwBi" id="6QawkaHOeY2" role="25WWJ7">
-                <node concept="2OqwBi" id="6QawkaHOeY3" role="2Oq$k0">
-                  <node concept="13iPFW" id="6QawkaHOeY4" role="2Oq$k0" />
-                  <node concept="3Tsc0h" id="6QawkaHOeY5" role="2OqNvi">
-                    <ref role="3TtcxE" to="clbe:6a5SBPfXXIi" />
+        <node concept="2Gpval" id="1Nl0v8EJvNn" role="3cqZAp">
+          <node concept="2GrKxI" id="1Nl0v8EJvNp" role="2Gsz3X">
+            <property role="TrG5h" value="member" />
+          </node>
+          <node concept="3clFbS" id="1Nl0v8EJvNr" role="2LFqv$">
+            <node concept="3clFbJ" id="1Nl0v8EJwKH" role="3cqZAp">
+              <node concept="3clFbS" id="1Nl0v8EJwKI" role="3clFbx">
+                <node concept="3clFbF" id="1Nl0v8EJwYV" role="3cqZAp">
+                  <node concept="2OqwBi" id="1Nl0v8EJy5h" role="3clFbG">
+                    <node concept="37vLTw" id="1Nl0v8EJwYU" role="2Oq$k0">
+                      <ref role="3cqZAo" node="6QawkaHOeY0" resolve="members" />
+                    </node>
+                    <node concept="TSZUe" id="1Nl0v8EJBgm" role="2OqNvi">
+                      <node concept="1PxgMI" id="1Nl0v8EJBp7" role="25WWJ7">
+                        <ref role="1PxNhF" to="clbe:56ytRgsLg$o" resolve="Member" />
+                        <node concept="2GrUjf" id="1Nl0v8EJBhj" role="1PxMeX">
+                          <ref role="2Gs0qQ" node="1Nl0v8EJvNp" resolve="member" />
+                        </node>
+                      </node>
+                    </node>
                   </node>
                 </node>
-                <node concept="v3k3i" id="6QawkaHOeY6" role="2OqNvi">
-                  <node concept="chp4Y" id="6QawkaHOeY7" role="v3oSu">
+              </node>
+              <node concept="2OqwBi" id="1Nl0v8EJwN5" role="3clFbw">
+                <node concept="2GrUjf" id="1Nl0v8EJwL1" role="2Oq$k0">
+                  <ref role="2Gs0qQ" node="1Nl0v8EJvNp" resolve="member" />
+                </node>
+                <node concept="1mIQ4w" id="1Nl0v8EJwWx" role="2OqNvi">
+                  <node concept="chp4Y" id="1Nl0v8EJwXp" role="cj9EA">
                     <ref role="cht4Q" to="clbe:56ytRgsLg$o" resolve="Member" />
                   </node>
                 </node>
               </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="6QawkaHOBnr" role="3cqZAp">
-          <node concept="2OqwBi" id="6QawkaHOCL9" role="3clFbG">
-            <node concept="37vLTw" id="6QawkaHOBnp" role="2Oq$k0">
-              <ref role="3cqZAo" node="6QawkaHOeY0" resolve="members" />
-            </node>
-            <node concept="X8dFx" id="6QawkaHOHaq" role="2OqNvi">
-              <node concept="2OqwBi" id="6QawkaHOOyr" role="25WWJ7">
-                <node concept="2OqwBi" id="6QawkaHOMr_" role="2Oq$k0">
-                  <node concept="2OqwBi" id="6QawkaHOHke" role="2Oq$k0">
-                    <node concept="13iPFW" id="6QawkaHOHd8" role="2Oq$k0" />
-                    <node concept="3Tsc0h" id="6QawkaHOHN$" role="2OqNvi">
-                      <ref role="3TtcxE" to="clbe:6a5SBPfXXIi" />
+              <node concept="3eNFk2" id="1Nl0v8EJBiG" role="3eNLev">
+                <node concept="2OqwBi" id="1Nl0v8EJFWQ" role="3eO9$A">
+                  <node concept="2GrUjf" id="1Nl0v8EJFUs" role="2Oq$k0">
+                    <ref role="2Gs0qQ" node="1Nl0v8EJvNp" resolve="member" />
+                  </node>
+                  <node concept="1mIQ4w" id="1Nl0v8EJG8t" role="2OqNvi">
+                    <node concept="chp4Y" id="1Nl0v8EJG9l" role="cj9EA">
+                      <ref role="cht4Q" to="clbe:7ya9dte0iuS" resolve="AnonymousStructDeclaration" />
                     </node>
                   </node>
-                  <node concept="3zZkjj" id="6QawkaHONok" role="2OqNvi">
-                    <node concept="1bVj0M" id="6QawkaHONom" role="23t8la">
-                      <node concept="3clFbS" id="6QawkaHONon" role="1bW5cS">
-                        <node concept="3clFbF" id="6QawkaHON$U" role="3cqZAp">
-                          <node concept="2OqwBi" id="6QawkaHONK2" role="3clFbG">
-                            <node concept="37vLTw" id="6QawkaHON$T" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6QawkaHONoo" resolve="it" />
-                            </node>
-                            <node concept="3TrcHB" id="6QawkaIN3qE" role="2OqNvi">
-                              <ref role="3TsBF5" to="clbe:6QawkaIMrjd" resolve="transparent" />
+                </node>
+                <node concept="3clFbS" id="1Nl0v8EJBiI" role="3eOfB_">
+                  <node concept="3clFbF" id="1Nl0v8EJGb7" role="3cqZAp">
+                    <node concept="2OqwBi" id="1Nl0v8EJHht" role="3clFbG">
+                      <node concept="37vLTw" id="1Nl0v8EJGb6" role="2Oq$k0">
+                        <ref role="3cqZAo" node="6QawkaHOeY0" resolve="members" />
+                      </node>
+                      <node concept="X8dFx" id="1Nl0v8EJMsy" role="2OqNvi">
+                        <node concept="2OqwBi" id="1Nl0v8EJN44" role="25WWJ7">
+                          <node concept="1PxgMI" id="1Nl0v8EJM$B" role="2Oq$k0">
+                            <ref role="1PxNhF" to="clbe:7ya9dte0iuS" resolve="AnonymousStructDeclaration" />
+                            <node concept="2GrUjf" id="1Nl0v8EJMwc" role="1PxMeX">
+                              <ref role="2Gs0qQ" node="1Nl0v8EJvNp" resolve="member" />
                             </node>
                           </node>
+                          <node concept="2qgKlT" id="1Nl0v8EJNtL" role="2OqNvi">
+                            <ref role="37wK5l" node="7TdHRrCpjWZ" resolve="membersIncludingTransparent" />
+                          </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="6QawkaHONoo" role="1bW2Oz">
-                        <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="6QawkaHONop" role="1tU5fm" />
-                      </node>
                     </node>
                   </node>
                 </node>
-                <node concept="3goQfb" id="6QawkaHOSrE" role="2OqNvi">
-                  <node concept="1bVj0M" id="6QawkaHOSrG" role="23t8la">
-                    <node concept="3clFbS" id="6QawkaHOSrH" role="1bW5cS">
-                      <node concept="3clFbF" id="6QawkaHOS$$" role="3cqZAp">
-                        <node concept="2OqwBi" id="6QawkaHOSL9" role="3clFbG">
-                          <node concept="37vLTw" id="6QawkaHOS$z" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6QawkaHOSrI" resolve="it" />
+              </node>
+              <node concept="3eNFk2" id="1Nl0v8EJNB5" role="3eNLev">
+                <node concept="3clFbS" id="1Nl0v8EJNB7" role="3eOfB_">
+                  <node concept="3clFbF" id="1Nl0v8EJObI" role="3cqZAp">
+                    <node concept="2OqwBi" id="1Nl0v8EJObJ" role="3clFbG">
+                      <node concept="37vLTw" id="1Nl0v8EJObK" role="2Oq$k0">
+                        <ref role="3cqZAo" node="6QawkaHOeY0" resolve="members" />
+                      </node>
+                      <node concept="X8dFx" id="1Nl0v8EJObL" role="2OqNvi">
+                        <node concept="2OqwBi" id="1Nl0v8EJObM" role="25WWJ7">
+                          <node concept="1PxgMI" id="1Nl0v8EJObN" role="2Oq$k0">
+                            <ref role="1PxNhF" to="clbe:7ya9dte0lCz" resolve="AnonymousUnionDeclaration" />
+                            <node concept="2GrUjf" id="1Nl0v8EJObO" role="1PxMeX">
+                              <ref role="2Gs0qQ" node="1Nl0v8EJvNp" resolve="member" />
+                            </node>
                           </node>
-                          <node concept="2qgKlT" id="6QawkaIYSF1" role="2OqNvi">
-                            <ref role="37wK5l" node="6QawkaIMrYF" resolve="transparentlyVisibleContents" />
+                          <node concept="2qgKlT" id="1Nl0v8EJObP" role="2OqNvi">
+                            <ref role="37wK5l" node="7TdHRrCpjWZ" resolve="membersIncludingTransparent" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6QawkaHOSrI" role="1bW2Oz">
-                      <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6QawkaHOSrJ" role="1tU5fm" />
+                  </node>
+                </node>
+                <node concept="2OqwBi" id="1Nl0v8EJNLG" role="3eO9$A">
+                  <node concept="2GrUjf" id="1Nl0v8EJNLH" role="2Oq$k0">
+                    <ref role="2Gs0qQ" node="1Nl0v8EJvNp" resolve="member" />
+                  </node>
+                  <node concept="1mIQ4w" id="1Nl0v8EJNLI" role="2OqNvi">
+                    <node concept="chp4Y" id="1Nl0v8EJNN$" role="cj9EA">
+                      <ref role="cht4Q" to="clbe:7ya9dte0lCz" resolve="AnonymousUnionDeclaration" />
                     </node>
                   </node>
                 </node>
               </node>
             </node>
           </node>
+          <node concept="2OqwBi" id="1Nl0v8EJwmi" role="2GsD0m">
+            <node concept="13iPFW" id="1Nl0v8EJwgw" role="2Oq$k0" />
+            <node concept="3Tsc0h" id="1Nl0v8EJwIZ" role="2OqNvi">
+              <ref role="3TtcxE" to="clbe:6a5SBPfXXIi" />
+            </node>
+          </node>
         </node>
-        <node concept="3clFbF" id="6QawkaHTTNe" role="3cqZAp">
-          <node concept="37vLTw" id="6QawkaHOeY9" role="3clFbG">
+        <node concept="3cpWs6" id="1Nl0v8EJPcG" role="3cqZAp">
+          <node concept="37vLTw" id="1Nl0v8EJPcH" role="3cqZAk">
             <ref role="3cqZAo" node="6QawkaHOeY0" resolve="members" />
           </node>
         </node>
@@ -3964,8 +3878,8 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="6aQaNXUb91" role="3cqZAp">
-          <node concept="37vLTw" id="6aQaNXUb92" role="3clFbG">
+        <node concept="3cpWs6" id="1Nl0v8EPvkq" role="3cqZAp">
+          <node concept="37vLTw" id="1Nl0v8EPvkr" role="3cqZAk">
             <ref role="3cqZAo" node="6aQaNXUb8m" resolve="members" />
           </node>
         </node>
@@ -3976,29 +3890,29 @@
       <node concept="3Tm1VV" id="16nhtBDHnvp" role="1B3o_S" />
       <node concept="17QB3L" id="16nhtBDHwgA" role="3clF45" />
       <node concept="3clFbS" id="16nhtBDHnvr" role="3clF47">
-        <node concept="3clFbF" id="16nhtBDHwQk" role="3cqZAp">
-          <node concept="3cpWs3" id="16nhtBDH_YP" role="3clFbG">
-            <node concept="2OqwBi" id="16nhtBDHAvR" role="3uHU7w">
-              <node concept="Xl_RD" id="16nhtBDH_YS" role="2Oq$k0">
+        <node concept="3cpWs6" id="1Nl0v8EPvDR" role="3cqZAp">
+          <node concept="3cpWs3" id="1Nl0v8EPvDS" role="3cqZAk">
+            <node concept="2OqwBi" id="1Nl0v8EPvDT" role="3uHU7w">
+              <node concept="Xl_RD" id="1Nl0v8EPvDU" role="2Oq$k0">
                 <property role="Xl_RC" value="" />
               </node>
-              <node concept="liA8E" id="16nhtBDHBzx" role="2OqNvi">
+              <node concept="liA8E" id="1Nl0v8EPvDV" role="2OqNvi">
                 <ref role="37wK5l" to="wyt6:~String.toLowerCase():java.lang.String" resolve="toLowerCase" />
               </node>
             </node>
-            <node concept="2OqwBi" id="16nhtBDHzQg" role="3uHU7B">
-              <node concept="2OqwBi" id="16nhtBDHyVL" role="2Oq$k0">
-                <node concept="2OqwBi" id="16nhtBDHwZ1" role="2Oq$k0">
-                  <node concept="13iPFW" id="16nhtBDHwQj" role="2Oq$k0" />
-                  <node concept="3NT_Vc" id="16nhtBDHykP" role="2OqNvi" />
+            <node concept="2OqwBi" id="1Nl0v8EPvDW" role="3uHU7B">
+              <node concept="2OqwBi" id="1Nl0v8EPvDX" role="2Oq$k0">
+                <node concept="2OqwBi" id="1Nl0v8EPvDY" role="2Oq$k0">
+                  <node concept="13iPFW" id="1Nl0v8EPvDZ" role="2Oq$k0" />
+                  <node concept="3NT_Vc" id="1Nl0v8EPvE0" role="2OqNvi" />
                 </node>
-                <node concept="3TrcHB" id="16nhtBDHziR" role="2OqNvi">
+                <node concept="3TrcHB" id="1Nl0v8EPvE1" role="2OqNvi">
                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
                 </node>
               </node>
-              <node concept="liA8E" id="16nhtBDH_76" role="2OqNvi">
+              <node concept="liA8E" id="1Nl0v8EPvE2" role="2OqNvi">
                 <ref role="37wK5l" to="wyt6:~String.charAt(int):char" resolve="charAt" />
-                <node concept="3cmrfG" id="16nhtBDH_pO" role="37wK5m">
+                <node concept="3cmrfG" id="1Nl0v8EPvE3" role="37wK5m">
                   <property role="3cmrfH" value="0" />
                 </node>
               </node>
@@ -6373,30 +6287,6 @@
       <node concept="17QB3L" id="4MEpx3I12iS" role="3clF45" />
     </node>
   </node>
-  <node concept="13h7C7" id="1$5WwmOx_oW">
-    <ref role="13h7C2" to="clbe:1$5WwmOqNKi" resolve="InnerSUDeclarationRef" />
-    <node concept="13hLZK" id="1$5WwmOx_oX" role="13h7CW">
-      <node concept="3clFbS" id="1$5WwmOx_oY" role="2VODD2" />
-    </node>
-    <node concept="13i0hz" id="1$5WwmOxA88" role="13h7CS">
-      <property role="13i0iv" value="false" />
-      <property role="13i0it" value="false" />
-      <property role="TrG5h" value="getTarget" />
-      <ref role="13i0hy" to="ywuz:66uzewbZgGM" resolve="getTarget" />
-      <node concept="3Tm1VV" id="1$5WwmOxA89" role="1B3o_S" />
-      <node concept="3clFbS" id="1$5WwmOxA8c" role="3clF47">
-        <node concept="3clFbF" id="1$5WwmOxAf3" role="3cqZAp">
-          <node concept="2OqwBi" id="1$5WwmOxAgH" role="3clFbG">
-            <node concept="13iPFW" id="1$5WwmOxAf2" role="2Oq$k0" />
-            <node concept="3TrEf2" id="1$5WwmOxAVo" role="2OqNvi">
-              <ref role="3Tt5mk" to="clbe:1$5WwmOqNMe" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tqbb2" id="1$5WwmOxA8d" role="3clF45" />
-    </node>
-  </node>
   <node concept="13h7C7" id="54LEWgwZkzN">
     <property role="3GE5qa" value="su" />
     <ref role="13h7C2" to="clbe:7TdHRrCvnnh" resolve="SUContent" />
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/constraints.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/constraints.mps
index 699a0f373d5..2b499377596 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/constraints.mps
@@ -137,9 +137,6 @@
         <child id="1144104376918" name="parameter" index="1xVPHs" />
       </concept>
       <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
-      <concept id="4693937538533521280" name="jetbrains.mps.lang.smodel.structure.OfConceptOperation" flags="ng" index="v3k3i">
-        <child id="4693937538533538124" name="requestedConcept" index="v3oSu" />
-      </concept>
       <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS">
         <reference id="1145383142433" name="elementConcept" index="2I9WkF" />
       </concept>
@@ -150,7 +147,6 @@
       <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
         <child id="1177027386292" name="conceptArgument" index="cj9EA" />
       </concept>
-      <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
       <concept id="1144100932627" name="jetbrains.mps.lang.smodel.structure.OperationParm_Inclusion" flags="ng" index="1xIGOp" />
       <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
         <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
@@ -1038,9 +1034,6 @@
                 <node concept="3clFbS" id="3DiW6qrG4EU" role="3clFbx">
                   <node concept="3cpWs6" id="3DiW6qrG7U1" role="3cqZAp">
                     <node concept="2OqwBi" id="7FkLcyz8v2u" role="3cqZAk">
-                      <node concept="2qgKlT" id="6aQaNXUlJ1" role="2OqNvi">
-                        <ref role="37wK5l" to="2rho:6aQaNXUb8h" resolve="membersDirect" />
-                      </node>
                       <node concept="2OqwBi" id="7FkLcyz8gpi" role="2Oq$k0">
                         <node concept="1PxgMI" id="3DiW6qrG94h" role="2Oq$k0">
                           <ref role="1PxNhF" to="clbe:3bHYGwzt_Ut" resolve="SUType" />
@@ -1052,6 +1045,9 @@
                           <ref role="37wK5l" to="2rho:3bHYGwztGSo" resolve="getSUDeclaration" />
                         </node>
                       </node>
+                      <node concept="2qgKlT" id="1Nl0v8EP7Kq" role="2OqNvi">
+                        <ref role="37wK5l" to="2rho:7TdHRrCpjWZ" resolve="membersIncludingTransparent" />
+                      </node>
                     </node>
                   </node>
                 </node>
@@ -1130,271 +1126,6 @@
         </node>
       </node>
     </node>
-    <node concept="nKS2y" id="7ya9dte0lC_" role="1MLUbF">
-      <node concept="3clFbS" id="7ya9dte0lCA" role="2VODD2">
-        <node concept="3clFbF" id="7ya9dte0mhY" role="3cqZAp">
-          <node concept="2OqwBi" id="7ya9dte0njB" role="3clFbG">
-            <node concept="2OqwBi" id="7ya9dte0mtJ" role="2Oq$k0">
-              <node concept="nLn13" id="7ya9dte0mhX" role="2Oq$k0" />
-              <node concept="2Xjw5R" id="7ya9dte0mNt" role="2OqNvi">
-                <node concept="1xMEDy" id="7ya9dte0mNv" role="1xVPHs">
-                  <node concept="chp4Y" id="7ya9dte0mYo" role="ri$Ld">
-                    <ref role="cht4Q" to="x27k:5jyom5fOqJ1" resolve="ExternalModule" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3x8VRR" id="7ya9dte0nVK" role="2OqNvi" />
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="1M2fIO" id="1$5WwmOryjl">
-    <ref role="1M2myG" to="clbe:1$5WwmOqNKi" resolve="InnerSUDeclarationRef" />
-    <node concept="1N5Pfh" id="1$5WwmOrzWG" role="1Mr941">
-      <ref role="1N5Vy1" to="clbe:1$5WwmOqNMe" />
-      <node concept="1MUpDS" id="1$5WwmOrzXG" role="1N6uqs">
-        <node concept="3clFbS" id="1$5WwmOrzXI" role="2VODD2">
-          <node concept="3cpWs8" id="6QawkaIrPfE" role="3cqZAp">
-            <node concept="3cpWsn" id="6QawkaIrPfH" role="3cpWs9">
-              <property role="TrG5h" value="res" />
-              <node concept="2I9FWS" id="6QawkaIrPfC" role="1tU5fm">
-                <ref role="2I9WkF" to="clbe:6a5SBPfXGBP" resolve="SUDeclaration" />
-              </node>
-              <node concept="2ShNRf" id="6QawkaIrT8t" role="33vP2m">
-                <node concept="2T8Vx0" id="6QawkaIrVtq" role="2ShVmc">
-                  <node concept="2I9FWS" id="6QawkaIrVtt" role="2T96Bj">
-                    <ref role="2I9WkF" to="clbe:6a5SBPfXGBP" resolve="SUDeclaration" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbJ" id="1$5WwmOr$12" role="3cqZAp">
-            <node concept="3clFbS" id="1$5WwmOr$13" role="3clFbx">
-              <node concept="3cpWs8" id="1$5WwmOr$14" role="3cqZAp">
-                <node concept="3cpWsn" id="1$5WwmOr$15" role="3cpWs9">
-                  <property role="TrG5h" value="en" />
-                  <node concept="3Tqbb2" id="1$5WwmOr$16" role="1tU5fm">
-                    <ref role="ehGHo" to="mj1l:40tXLnqhyKc" resolve="GenericDotExpression" />
-                  </node>
-                  <node concept="1PxgMI" id="1$5WwmOr$17" role="33vP2m">
-                    <ref role="1PxNhF" to="mj1l:40tXLnqhyKc" resolve="GenericDotExpression" />
-                    <node concept="21POm0" id="1$5WwmOr$18" role="1PxMeX" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3cpWs8" id="1$5WwmOr$19" role="3cqZAp">
-                <node concept="3cpWsn" id="1$5WwmOr$1a" role="3cpWs9">
-                  <property role="TrG5h" value="ct" />
-                  <node concept="3Tqbb2" id="1$5WwmOr$1b" role="1tU5fm" />
-                  <node concept="2OqwBi" id="1$5WwmOr$1c" role="33vP2m">
-                    <node concept="2OqwBi" id="1$5WwmOr$1d" role="2Oq$k0">
-                      <node concept="37vLTw" id="1$5WwmOr$1e" role="2Oq$k0">
-                        <ref role="3cqZAo" node="1$5WwmOr$15" resolve="en" />
-                      </node>
-                      <node concept="3TrEf2" id="1$5WwmOr$1f" role="2OqNvi">
-                        <ref role="3Tt5mk" to="mj1l:6iIoqg1yDLg" />
-                      </node>
-                    </node>
-                    <node concept="3JvlWi" id="1$5WwmOr$1g" role="2OqNvi" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbJ" id="1$5WwmOr$1h" role="3cqZAp">
-                <node concept="3clFbS" id="1$5WwmOr$1i" role="3clFbx">
-                  <node concept="3clFbF" id="6QawkaIrY4n" role="3cqZAp">
-                    <node concept="2OqwBi" id="6QawkaIrZDu" role="3clFbG">
-                      <node concept="37vLTw" id="6QawkaIrY4l" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6QawkaIrPfH" resolve="res" />
-                      </node>
-                      <node concept="X8dFx" id="6QawkaIs3QV" role="2OqNvi">
-                        <node concept="2OqwBi" id="1$5WwmOrQw1" role="25WWJ7">
-                          <node concept="2OqwBi" id="1$5WwmOr$1k" role="2Oq$k0">
-                            <node concept="2OqwBi" id="1$5WwmOr$1l" role="2Oq$k0">
-                              <node concept="1PxgMI" id="1$5WwmOr$1m" role="2Oq$k0">
-                                <ref role="1PxNhF" to="clbe:3bHYGwzt_Ut" resolve="SUType" />
-                                <node concept="37vLTw" id="1$5WwmOr$1n" role="1PxMeX">
-                                  <ref role="3cqZAo" node="1$5WwmOr$1a" resolve="ct" />
-                                </node>
-                              </node>
-                              <node concept="2qgKlT" id="1$5WwmOr$1o" role="2OqNvi">
-                                <ref role="37wK5l" to="2rho:3bHYGwztGSo" resolve="getSUDeclaration" />
-                              </node>
-                            </node>
-                            <node concept="3Tsc0h" id="1$5WwmOrKvE" role="2OqNvi">
-                              <ref role="3TtcxE" to="clbe:6a5SBPfXXIi" />
-                            </node>
-                          </node>
-                          <node concept="v3k3i" id="1$5WwmOsa4A" role="2OqNvi">
-                            <node concept="chp4Y" id="1$5WwmOse$1" role="v3oSu">
-                              <ref role="cht4Q" to="clbe:6a5SBPfXGBP" resolve="SUDeclaration" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="2OqwBi" id="1$5WwmOr$1q" role="3clFbw">
-                  <node concept="37vLTw" id="1$5WwmOr$1r" role="2Oq$k0">
-                    <ref role="3cqZAo" node="1$5WwmOr$1a" resolve="ct" />
-                  </node>
-                  <node concept="1mIQ4w" id="1$5WwmOr$1s" role="2OqNvi">
-                    <node concept="chp4Y" id="1$5WwmOr$1t" role="cj9EA">
-                      <ref role="cht4Q" to="clbe:3bHYGwzt_Ut" resolve="SUType" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3eNFk2" id="1$5WwmOr$1u" role="3eNLev">
-                  <node concept="1Wc70l" id="1$5WwmOr$1v" role="3eO9$A">
-                    <node concept="2OqwBi" id="1$5WwmOr$1w" role="3uHU7w">
-                      <node concept="2OqwBi" id="1$5WwmOr$1x" role="2Oq$k0">
-                        <node concept="1PxgMI" id="1$5WwmOr$1y" role="2Oq$k0">
-                          <ref role="1PxNhF" to="yq40:fwMInzpHoK" resolve="PointerType" />
-                          <node concept="37vLTw" id="1$5WwmOr$1z" role="1PxMeX">
-                            <ref role="3cqZAo" node="1$5WwmOr$1a" resolve="ct" />
-                          </node>
-                        </node>
-                        <node concept="3TrEf2" id="1$5WwmOr$1$" role="2OqNvi">
-                          <ref role="3Tt5mk" to="c4fa:6IWRcVPT6tm" />
-                        </node>
-                      </node>
-                      <node concept="1mIQ4w" id="1$5WwmOr$1_" role="2OqNvi">
-                        <node concept="chp4Y" id="1$5WwmOr$1A" role="cj9EA">
-                          <ref role="cht4Q" to="clbe:3bHYGwzt_Ut" resolve="SUType" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="2OqwBi" id="1$5WwmOr$1B" role="3uHU7B">
-                      <node concept="37vLTw" id="1$5WwmOr$1C" role="2Oq$k0">
-                        <ref role="3cqZAo" node="1$5WwmOr$1a" resolve="ct" />
-                      </node>
-                      <node concept="1mIQ4w" id="1$5WwmOr$1D" role="2OqNvi">
-                        <node concept="chp4Y" id="1$5WwmOr$1E" role="cj9EA">
-                          <ref role="cht4Q" to="yq40:fwMInzpHoK" resolve="PointerType" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFbS" id="1$5WwmOr$1F" role="3eOfB_">
-                    <node concept="3clFbF" id="6QawkaIsd31" role="3cqZAp">
-                      <node concept="2OqwBi" id="6QawkaIsd32" role="3clFbG">
-                        <node concept="37vLTw" id="6QawkaIsd33" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6QawkaIrPfH" resolve="res" />
-                        </node>
-                        <node concept="X8dFx" id="6QawkaIsd34" role="2OqNvi">
-                          <node concept="2OqwBi" id="1$5WwmOsA3C" role="25WWJ7">
-                            <node concept="2OqwBi" id="1$5WwmOr$1H" role="2Oq$k0">
-                              <node concept="2OqwBi" id="1$5WwmOr$1I" role="2Oq$k0">
-                                <node concept="1PxgMI" id="1$5WwmOr$1J" role="2Oq$k0">
-                                  <ref role="1PxNhF" to="clbe:3bHYGwzt_Ut" resolve="SUType" />
-                                  <node concept="2OqwBi" id="1$5WwmOr$1K" role="1PxMeX">
-                                    <node concept="1PxgMI" id="1$5WwmOr$1L" role="2Oq$k0">
-                                      <ref role="1PxNhF" to="yq40:fwMInzpHoK" resolve="PointerType" />
-                                      <node concept="37vLTw" id="1$5WwmOr$1M" role="1PxMeX">
-                                        <ref role="3cqZAo" node="1$5WwmOr$1a" resolve="ct" />
-                                      </node>
-                                    </node>
-                                    <node concept="3TrEf2" id="1$5WwmOr$1N" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="c4fa:6IWRcVPT6tm" />
-                                    </node>
-                                  </node>
-                                </node>
-                                <node concept="2qgKlT" id="1$5WwmOr$1O" role="2OqNvi">
-                                  <ref role="37wK5l" to="2rho:3bHYGwztGSo" resolve="getSUDeclaration" />
-                                </node>
-                              </node>
-                              <node concept="3Tsc0h" id="1$5WwmOsy1L" role="2OqNvi">
-                                <ref role="3TtcxE" to="clbe:6a5SBPfXXIi" />
-                              </node>
-                            </node>
-                            <node concept="v3k3i" id="1$5WwmOsBjJ" role="2OqNvi">
-                              <node concept="chp4Y" id="1$5WwmOsBCX" role="v3oSu">
-                                <ref role="cht4Q" to="clbe:6a5SBPfXGBP" resolve="SUDeclaration" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="2OqwBi" id="1$5WwmOr$1Q" role="3clFbw">
-              <node concept="21POm0" id="1$5WwmOr$1R" role="2Oq$k0" />
-              <node concept="1mIQ4w" id="1$5WwmOr$1S" role="2OqNvi">
-                <node concept="chp4Y" id="1$5WwmOr$1T" role="cj9EA">
-                  <ref role="cht4Q" to="mj1l:40tXLnqhyKc" resolve="GenericDotExpression" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3cpWs6" id="1$5WwmOr$1U" role="3cqZAp">
-            <node concept="2OqwBi" id="6QawkaIsvfA" role="3cqZAk">
-              <node concept="37vLTw" id="6QawkaIrSCa" role="2Oq$k0">
-                <ref role="3cqZAo" node="6QawkaIrPfH" resolve="res" />
-              </node>
-              <node concept="3zZkjj" id="6QawkaIsNuu" role="2OqNvi">
-                <node concept="1bVj0M" id="6QawkaIsNux" role="23t8la">
-                  <node concept="3clFbS" id="6QawkaIsNuy" role="1bW5cS">
-                    <node concept="3clFbF" id="6QawkaIsPUm" role="3cqZAp">
-                      <node concept="3fqX7Q" id="6QawkaIsPUk" role="3clFbG">
-                        <node concept="1eOMI4" id="6QawkaIsUUz" role="3fr31v">
-                          <node concept="1Wc70l" id="6QawkaItbeu" role="1eOMHV">
-                            <node concept="2OqwBi" id="6QawkaItwRO" role="3uHU7w">
-                              <node concept="1PxgMI" id="6QawkaItnoR" role="2Oq$k0">
-                                <ref role="1PxNhF" to="clbe:7ya9dte0iuS" resolve="AnonymousStructDeclaration" />
-                                <node concept="37vLTw" id="6QawkaItehS" role="1PxMeX">
-                                  <ref role="3cqZAo" node="6QawkaIsNuz" resolve="it" />
-                                </node>
-                              </node>
-                              <node concept="3TrcHB" id="6QawkaINacL" role="2OqNvi">
-                                <ref role="3TsBF5" to="clbe:6QawkaIMrjd" resolve="transparent" />
-                              </node>
-                            </node>
-                            <node concept="2OqwBi" id="6QawkaIt0UX" role="3uHU7B">
-                              <node concept="37vLTw" id="6QawkaIsZ6H" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6QawkaIsNuz" resolve="it" />
-                              </node>
-                              <node concept="1mIQ4w" id="6QawkaIt4bI" role="2OqNvi">
-                                <node concept="chp4Y" id="6QawkaIt7gH" role="cj9EA">
-                                  <ref role="cht4Q" to="clbe:7ya9dte0iuS" resolve="AnonymousStructDeclaration" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="Rh6nW" id="6QawkaIsNuz" role="1bW2Oz">
-                    <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6QawkaIsNu$" role="1tU5fm" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="nKS2y" id="1$5WwmOryqX" role="1MLUbF">
-      <node concept="3clFbS" id="1$5WwmOryqY" role="2VODD2">
-        <node concept="3clFbF" id="1$5WwmOrywo" role="3cqZAp">
-          <node concept="2OqwBi" id="1$5WwmOrywp" role="3clFbG">
-            <node concept="nLn13" id="1$5WwmOrywq" role="2Oq$k0" />
-            <node concept="1mIQ4w" id="1$5WwmOrywr" role="2OqNvi">
-              <node concept="chp4Y" id="1$5WwmOryws" role="cj9EA">
-                <ref role="cht4Q" to="mj1l:40tXLnqhyKc" resolve="GenericDotExpression" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
   </node>
   <node concept="1M2fIO" id="2UJM6DuOSG5">
     <property role="3GE5qa" value="su.struct" />
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/editor.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/editor.mps
index 7cd4fbf9c87..1ec0b1c9023 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/editor.mps
@@ -112,13 +112,6 @@
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
       <concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
       <concept id="1163613822479" name="jetbrains.mps.lang.editor.structure.CellMenuPart_Abstract_editedNode" flags="nn" index="3GMtW1" />
-      <concept id="1225898583838" name="jetbrains.mps.lang.editor.structure.ReadOnlyModelAccessor" flags="ng" index="1HfYo3">
-        <child id="1225898971709" name="getter" index="1Hhtcw" />
-      </concept>
-      <concept id="1225900081164" name="jetbrains.mps.lang.editor.structure.CellModel_ReadOnlyModelAccessor" flags="sg" stub="3708815482283559694" index="1HlG4h">
-        <child id="1225900141900" name="modelAccessor" index="1HlULh" />
-      </concept>
-      <concept id="1176717841777" name="jetbrains.mps.lang.editor.structure.QueryFunction_ModelAccess_Getter" flags="in" index="3TQlhw" />
       <concept id="1166049232041" name="jetbrains.mps.lang.editor.structure.AbstractComponent" flags="ng" index="1XWOmA">
         <reference id="1166049300910" name="conceptDeclaration" index="1XX52x" />
       </concept>
@@ -1014,33 +1007,6 @@
       <node concept="l2Vlx" id="7ya9dte4f3Q" role="2iSdaV" />
     </node>
   </node>
-  <node concept="24kQdi" id="1$5WwmOqNMm">
-    <ref role="1XX52x" to="clbe:1$5WwmOqNKi" resolve="InnerSUDeclarationRef" />
-    <node concept="3EZMnI" id="1$5WwmOqRKr" role="2wV5jI">
-      <node concept="1iCGBv" id="1$5WwmOqRK_" role="3EZMnx">
-        <ref role="1NtTu8" to="clbe:1$5WwmOqNMe" />
-        <node concept="1sVBvm" id="1$5WwmOqRKB" role="1sWHZn">
-          <node concept="1HlG4h" id="1$5WwmOqRKL" role="2wV5jI">
-            <node concept="1HfYo3" id="1$5WwmOqRKN" role="1HlULh">
-              <node concept="3TQlhw" id="1$5WwmOqRKP" role="1Hhtcw">
-                <node concept="3clFbS" id="1$5WwmOqRKR" role="2VODD2">
-                  <node concept="3clFbF" id="1$5WwmOrfRV" role="3cqZAp">
-                    <node concept="2OqwBi" id="1$5WwmOrfYz" role="3clFbG">
-                      <node concept="pncrf" id="1$5WwmOrfRU" role="2Oq$k0" />
-                      <node concept="3TrcHB" id="1$5WwmOrqeD" role="2OqNvi">
-                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="l2Vlx" id="1$5WwmOqRKu" role="2iSdaV" />
-    </node>
-  </node>
   <node concept="24kQdi" id="6QawkaHMa76">
     <property role="3GE5qa" value="su.struct" />
     <ref role="1XX52x" to="clbe:7ya9dte0iuS" resolve="AnonymousStructDeclaration" />
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/migration.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/migration.mps
index a7719de5279..76696c4f9a3 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/migration.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/migration.mps
@@ -4,6 +4,8 @@
   <languages>
     <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="-1" />
     <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="0" />
+    <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/structure.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/structure.mps
index 5f758eb39f8..98d7281bb18 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/structure.mps
@@ -512,20 +512,6 @@
     <property role="1pbfSe" value="963936518" />
     <ref role="1TJDcQ" node="6a5SBPfXGBP" resolve="SUDeclaration" />
   </node>
-  <node concept="1TIwiD" id="1$5WwmOqNKi">
-    <property role="TrG5h" value="InnerSUDeclarationRef" />
-    <property role="1pbfSe" value="848220649" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
-    <node concept="PrWs8" id="1$5WwmOqNMb" role="PzmwI">
-      <ref role="PrY4T" to="mj1l:40tXLnqhXcx" resolve="IGenericDotTarget" />
-    </node>
-    <node concept="1TJgyj" id="1$5WwmOqNMe" role="1TKVEi">
-      <property role="20lmBu" value="reference" />
-      <property role="20kJfa" value="ref" />
-      <property role="20lbJX" value="1" />
-      <ref role="20lvS9" node="6a5SBPfXGBP" resolve="SUDeclaration" />
-    </node>
-  </node>
   <node concept="1TIwiD" id="2CEi94edfgd">
     <property role="3GE5qa" value="su.struct" />
     <property role="TrG5h" value="ModuleContentSUDeclaration" />
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/typesystem.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/typesystem.mps
index 69180a738fa..d6b0b0e5208 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/typesystem.mps
@@ -2950,36 +2950,6 @@
       </node>
     </node>
   </node>
-  <node concept="1YbPZF" id="1$5WwmOuQr7">
-    <property role="TrG5h" value="typeof_InnerSUDeclarationRef" />
-    <node concept="3clFbS" id="1$5WwmOuQr8" role="18ibNy">
-      <node concept="1Z5TYs" id="7KLlXp7FXJu" role="3cqZAp">
-        <node concept="mw_s8" id="7KLlXp7FXJX" role="1ZfhKB">
-          <node concept="1Z2H0r" id="7KLlXp7FXJT" role="mwGJk">
-            <node concept="2OqwBi" id="7KLlXp7FXMG" role="1Z2MuG">
-              <node concept="1YBJjd" id="7KLlXp7FXKt" role="2Oq$k0">
-                <ref role="1YBMHb" node="1$5WwmOuQra" resolve="innerSUDeclarationRef" />
-              </node>
-              <node concept="3TrEf2" id="7KLlXp7FY67" role="2OqNvi">
-                <ref role="3Tt5mk" to="clbe:1$5WwmOqNMe" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="mw_s8" id="7KLlXp7FXJx" role="1ZfhK$">
-          <node concept="1Z2H0r" id="7KLlXp7FX$Z" role="mwGJk">
-            <node concept="1YBJjd" id="7KLlXp7FX_D" role="1Z2MuG">
-              <ref role="1YBMHb" node="1$5WwmOuQra" resolve="innerSUDeclarationRef" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1YaCAy" id="1$5WwmOuQra" role="1YuTPh">
-      <property role="TrG5h" value="innerSUDeclarationRef" />
-      <ref role="1YaFvo" to="clbe:1$5WwmOqNKi" resolve="InnerSUDeclarationRef" />
-    </node>
-  </node>
   <node concept="1YbPZF" id="7KLlXp7FY9T">
     <property role="TrG5h" value="typeof_AnonymousStructDeclaration" />
     <property role="3GE5qa" value="su.struct" />
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/udt.mpl b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/udt.mpl
index ed4c7e751ce..11d76b8d8f3 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/udt.mpl
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/udt.mpl
@@ -147,6 +147,7 @@
     <language id="d7a92d38-f7db-40d0-8431-763b0c3c9f20" fqName="jetbrains.mps.lang.intentions" version="0" />
     <language id="90746344-04fd-4286-97d5-b46ae6a81709" fqName="jetbrains.mps.lang.migration" version="0" />
     <language id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" fqName="jetbrains.mps.lang.pattern" version="0" />
+    <language id="28f9e497-3b42-4291-aeba-0a1039153ab1" fqName="jetbrains.mps.lang.plugin" version="0" />
     <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" fqName="jetbrains.mps.lang.quotation" version="0" />
     <language id="0eddeefa-c2d6-4437-bc2c-de50fd4ce470" fqName="jetbrains.mps.lang.script" version="0" />
     <language id="13744753-c81f-424a-9c1b-cf8943bf4e86" fqName="jetbrains.mps.lang.sharedConcepts" version="0" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/anonymous_member.mps b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/anonymous_member.mps
deleted file mode 100644
index f6a015e22ec..00000000000
--- a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/anonymous_member.mps
+++ /dev/null
@@ -1,443 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:028f3179-2429-49c7-a1e9-3479afedebac(test.ex.core.anonymous_member)">
-  <persistence version="9" />
-  <languages>
-    <devkit ref="d2a9c55c-6bdc-4cc2-97e1-4ba7552f5584(com.mbeddr.core)" />
-  </languages>
-  <imports />
-  <registry>
-    <language id="a9d69647-0840-491e-bf39-2eb0805d2011" name="com.mbeddr.core.statements">
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
-        <child id="7763322639126652758" name="baseType" index="2umbIo" />
-      </concept>
-      <concept id="7254843406768833938" name="com.mbeddr.core.statements.structure.ExpressionStatement" flags="ng" index="1_9egQ">
-        <child id="7254843406768833939" name="expr" index="1_9egR" />
-      </concept>
-      <concept id="4185783222026475238" name="com.mbeddr.core.statements.structure.LocalVariableDeclaration" flags="ng" index="3XIRlf" />
-      <concept id="4185783222026475861" name="com.mbeddr.core.statements.structure.StatementList" flags="ng" index="3XIRFW">
-        <child id="4185783222026475862" name="statements" index="3XIRFZ" />
-      </concept>
-      <concept id="4185783222026464515" name="com.mbeddr.core.statements.structure.Statement" flags="ng" index="3XISUE" />
-      <concept id="2093108837558113914" name="com.mbeddr.core.statements.structure.LocalVarRef" flags="ng" index="3ZVu4v">
-        <reference id="2093108837558124071" name="var" index="3ZVs_2" />
-      </concept>
-    </language>
-    <language id="2d7fadf5-33f6-4e80-a78f-0f739add2bde" name="com.mbeddr.core.buildconfig">
-      <concept id="5046689135693761556" name="com.mbeddr.core.buildconfig.structure.Binary" flags="ng" index="2eOfOj">
-        <child id="5046689135693761559" name="referencedModules" index="2eOfOg" />
-      </concept>
-      <concept id="5046689135693761554" name="com.mbeddr.core.buildconfig.structure.Executable" flags="ng" index="2eOfOl">
-        <property id="3431613015799084476" name="isTest" index="iO3LB" />
-      </concept>
-      <concept id="7717755763392524104" name="com.mbeddr.core.buildconfig.structure.BuildConfiguration" flags="ng" index="2v9HqL">
-        <child id="5046689135694070731" name="binaries" index="2ePNbc" />
-        <child id="5323740605968447026" name="target" index="2AWWZH" />
-      </concept>
-      <concept id="7717755763392524107" name="com.mbeddr.core.buildconfig.structure.ModuleRef" flags="ng" index="2v9HqM">
-        <reference id="7717755763392524108" name="module" index="2v9HqP" />
-      </concept>
-      <concept id="5323740605968447022" name="com.mbeddr.core.buildconfig.structure.DesktopPlatform" flags="ng" index="2AWWZL">
-        <property id="5323740605968447025" name="compilerOptions" index="2AWWZI" />
-        <property id="5323740605968447024" name="compiler" index="2AWWZJ" />
-        <property id="3963667026125442601" name="gdb" index="3r8Kw1" />
-        <property id="3963667026125442676" name="make" index="3r8Kxs" />
-      </concept>
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
-        <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
-      </concept>
-    </language>
-    <language id="3bf5377a-e904-4ded-9754-5a516023bfaa" name="com.mbeddr.core.pointers">
-      <concept id="6113173064528067332" name="com.mbeddr.core.pointers.structure.StringType" flags="ng" index="Pu267" />
-      <concept id="5679441017214012545" name="com.mbeddr.core.pointers.structure.ArrayType" flags="ng" index="3J0A42" />
-    </language>
-    <language id="efda956e-491e-4f00-ba14-36af2f213ecf" name="com.mbeddr.core.udt">
-      <concept id="9101132143320200657" name="com.mbeddr.core.udt.structure.SUContent" flags="ng" index="2mccaB" />
-      <concept id="3117609929518446049" name="com.mbeddr.core.udt.structure.AbstractBitType" flags="ng" index="2ArCLn">
-        <property id="3117609929518737717" name="width" index="2Asx23" />
-      </concept>
-      <concept id="1803113332147436562" name="com.mbeddr.core.udt.structure.InnerSUDeclarationRef" flags="ng" index="2HrGSn">
-        <reference id="1803113332147436686" name="ref" index="2HrGUb" />
-      </concept>
-      <concept id="7099329415459817973" name="com.mbeddr.core.udt.structure.SUDeclaration" flags="ng" index="HsMI8">
-        <child id="7099329415459888018" name="members" index="HszBJ" />
-      </concept>
-      <concept id="8685795338482689976" name="com.mbeddr.core.udt.structure.AnonymousStructDeclaration" flags="ng" index="QyKdJ" />
-      <concept id="8685795338482702883" name="com.mbeddr.core.udt.structure.AnonymousUnionDeclaration" flags="ng" index="QyRVO" />
-      <concept id="6183845377104662871" name="com.mbeddr.core.udt.structure.UnsignedBitType" flags="ng" index="X$FZc" />
-      <concept id="5882395403881875736" name="com.mbeddr.core.udt.structure.Member" flags="ng" index="1dpRTG" />
-      <concept id="5882395403881907205" name="com.mbeddr.core.udt.structure.UnionType" flags="ng" index="1dpZdL">
-        <reference id="5882395403881907207" name="union" index="1dpZdN" />
-      </concept>
-      <concept id="5882395403881907066" name="com.mbeddr.core.udt.structure.UnionDeclaration" flags="ng" index="1dpZge" />
-      <concept id="6394819151180597807" name="com.mbeddr.core.udt.structure.StructDeclaration" flags="ng" index="1sgJKc" />
-      <concept id="6394819151180597816" name="com.mbeddr.core.udt.structure.StructType" flags="ng" index="1sgJKr">
-        <reference id="6394819151180597817" name="struct" index="1sgJKq" />
-      </concept>
-      <concept id="7034214596253391076" name="com.mbeddr.core.udt.structure.GenericMemberRef" flags="ng" index="1E4Tgc">
-        <reference id="7034214596253391078" name="member" index="1E4Tge" />
-      </concept>
-    </language>
-    <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
-        <reference id="747084250476878887" name="chunk" index="3GEb4d" />
-      </concept>
-    </language>
-    <language id="6d11763d-483d-4b2b-8efc-09336c1b0001" name="com.mbeddr.core.modules">
-      <concept id="6116558314501417952" name="com.mbeddr.core.modules.structure.HeaderDescriptor" flags="ng" index="rcWE1" />
-      <concept id="6116558314501417921" name="com.mbeddr.core.modules.structure.ExternalModule" flags="ng" index="rcWEw">
-        <child id="6116558314501417978" name="descriptors" index="rcWEr" />
-      </concept>
-      <concept id="6116558314501417934" name="com.mbeddr.core.modules.structure.ExternalResourceDescriptor" flags="ng" index="rcWEJ">
-        <property id="6116558314501417936" name="path" index="rcWEL" />
-      </concept>
-      <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
-        <child id="8967919205527146150" name="expression" index="2BFjQA" />
-      </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
-        <child id="5708867820623310661" name="arguments" index="1UOdpc" />
-      </concept>
-      <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
-        <child id="6437088627575722833" name="contents" index="N3F5h" />
-        <child id="1317894735999304826" name="imports" index="2OODSX" />
-      </concept>
-      <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
-        <property id="1317894735999272944" name="exported" index="2OOxQR" />
-      </concept>
-      <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
-        <child id="4185783222026475860" name="body" index="3XIRFX" />
-      </concept>
-      <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
-      <concept id="7892328519581704407" name="com.mbeddr.core.modules.structure.Argument" flags="ng" index="19RgSI" />
-    </language>
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-    <language id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions">
-      <concept id="8463282783691618440" name="com.mbeddr.core.expressions.structure.Int32tType" flags="ng" index="26Vqph" />
-      <concept id="8463282783691618435" name="com.mbeddr.core.expressions.structure.Int16tType" flags="ng" index="26Vqpq" />
-      <concept id="8463282783691618426" name="com.mbeddr.core.expressions.structure.Int8tType" flags="ng" index="26Vqqz" />
-      <concept id="3005510381523579442" name="com.mbeddr.core.expressions.structure.UnaryExpression" flags="ng" index="2aKSnQ">
-        <child id="7254843406768839760" name="expression" index="1_9fRO" />
-      </concept>
-      <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
-        <property id="2212975673976043696" name="value" index="2hmy$m" />
-      </concept>
-      <concept id="4620120465980402700" name="com.mbeddr.core.expressions.structure.GenericDotExpression" flags="ng" index="2qmXGp">
-        <child id="7034214596252529803" name="target" index="1ESnxz" />
-      </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
-        <child id="318113533128716676" name="type" index="2C2TGm" />
-      </concept>
-      <concept id="8860443239512128054" name="com.mbeddr.core.expressions.structure.Type" flags="ng" index="3TlMgo">
-        <property id="2941277002445651368" name="const" index="2c7vTL" />
-        <property id="2941277002448691247" name="volatile" index="2caQfQ" />
-      </concept>
-      <concept id="8860443239512128108" name="com.mbeddr.core.expressions.structure.IntType" flags="ng" index="3TlMh2" />
-      <concept id="8860443239512128103" name="com.mbeddr.core.expressions.structure.NumberLiteral" flags="ng" index="3TlMh9" />
-    </language>
-  </registry>
-  <node concept="rcWEw" id="5WwC2ssWtXx">
-    <property role="TrG5h" value="ExternalStuff" />
-    <node concept="1sgJKc" id="7ya9dtelREw" role="N3F5h">
-      <property role="TrG5h" value="aNormalStruct" />
-      <node concept="QyKdJ" id="7ya9dtelREy" role="HszBJ">
-        <property role="TrG5h" value="InnerStruct" />
-        <node concept="1dpRTG" id="7ya9dtelREz" role="HszBJ">
-          <property role="TrG5h" value="i1" />
-          <node concept="3TlMh2" id="7ya9dtelRE$" role="2C2TGm">
-            <property role="2caQfQ" value="false" />
-            <property role="2c7vTL" value="false" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2NXPZ9" id="7KLlXp7MSD7" role="N3F5h">
-      <property role="TrG5h" value="empty_1412685931268_1" />
-    </node>
-    <node concept="1dpZge" id="7KLlXp7NE6k" role="N3F5h">
-      <property role="TrG5h" value="aNormalUnion" />
-      <node concept="QyKdJ" id="7KLlXp7NE6U" role="HszBJ">
-        <property role="TrG5h" value="dbytes" />
-        <node concept="1dpRTG" id="7KLlXp7NE7I" role="HszBJ">
-          <property role="TrG5h" value="high" />
-          <node concept="26Vqpq" id="7KLlXp7NE9z" role="2C2TGm">
-            <property role="2caQfQ" value="false" />
-            <property role="2c7vTL" value="false" />
-          </node>
-        </node>
-        <node concept="1dpRTG" id="7KLlXp7NEj4" role="HszBJ">
-          <property role="TrG5h" value="low" />
-          <node concept="26Vqpq" id="7KLlXp7NEj2" role="2C2TGm">
-            <property role="2caQfQ" value="false" />
-            <property role="2c7vTL" value="false" />
-          </node>
-        </node>
-      </node>
-      <node concept="QyKdJ" id="7KLlXp7NESk" role="HszBJ">
-        <property role="TrG5h" value="bytes" />
-        <node concept="1dpRTG" id="7KLlXp7NFBB" role="HszBJ">
-          <property role="TrG5h" value="byte1" />
-          <node concept="26Vqqz" id="7KLlXp7NFBA" role="2C2TGm">
-            <property role="2caQfQ" value="false" />
-            <property role="2c7vTL" value="false" />
-          </node>
-        </node>
-        <node concept="1dpRTG" id="7KLlXp7NG4u" role="HszBJ">
-          <property role="TrG5h" value="byte2" />
-          <node concept="26Vqqz" id="7KLlXp7NG4s" role="2C2TGm">
-            <property role="2caQfQ" value="false" />
-            <property role="2c7vTL" value="false" />
-          </node>
-        </node>
-        <node concept="1dpRTG" id="7KLlXp7NGq7" role="HszBJ">
-          <property role="TrG5h" value="byte3" />
-          <node concept="26Vqqz" id="7KLlXp7NGq5" role="2C2TGm">
-            <property role="2caQfQ" value="false" />
-            <property role="2c7vTL" value="false" />
-          </node>
-        </node>
-        <node concept="1dpRTG" id="7KLlXp7NGQ2" role="HszBJ">
-          <property role="TrG5h" value="byte4" />
-          <node concept="26Vqqz" id="7KLlXp7NGQ0" role="2C2TGm">
-            <property role="2caQfQ" value="false" />
-            <property role="2c7vTL" value="false" />
-          </node>
-        </node>
-      </node>
-      <node concept="QyKdJ" id="7KLlXp7NHBP" role="HszBJ">
-        <property role="TrG5h" value="bits" />
-        <node concept="1dpRTG" id="7KLlXp7NHXC" role="HszBJ">
-          <property role="TrG5h" value="a" />
-          <node concept="X$FZc" id="7KLlXp7NHXB" role="2C2TGm">
-            <property role="2caQfQ" value="false" />
-            <property role="2c7vTL" value="false" />
-            <property role="2Asx23" value="1" />
-          </node>
-        </node>
-        <node concept="1dpRTG" id="7KLlXp7NHYS" role="HszBJ">
-          <property role="TrG5h" value="b" />
-          <node concept="X$FZc" id="7KLlXp7NHYQ" role="2C2TGm">
-            <property role="2caQfQ" value="false" />
-            <property role="2c7vTL" value="false" />
-            <property role="2Asx23" value="1" />
-          </node>
-        </node>
-        <node concept="1dpRTG" id="7KLlXp7NHZT" role="HszBJ">
-          <property role="TrG5h" value="c" />
-          <node concept="X$FZc" id="7KLlXp7NHZR" role="2C2TGm">
-            <property role="2caQfQ" value="false" />
-            <property role="2c7vTL" value="false" />
-            <property role="2Asx23" value="1" />
-          </node>
-        </node>
-      </node>
-      <node concept="2mccaB" id="aIPzLHc_HK" role="HszBJ" />
-      <node concept="QyRVO" id="aIPzLHc_Oo" role="HszBJ">
-        <property role="TrG5h" value="nestedUnion1" />
-        <node concept="QyRVO" id="aIPzLHc_Pq" role="HszBJ">
-          <property role="TrG5h" value="nestedUnion2" />
-          <node concept="1dpRTG" id="aIPzLHc_PE" role="HszBJ">
-            <property role="TrG5h" value="a" />
-            <node concept="26Vqph" id="aIPzLHc_PD" role="2C2TGm">
-              <property role="2caQfQ" value="false" />
-              <property role="2c7vTL" value="false" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2mccaB" id="aIPzLHc_Jk" role="HszBJ" />
-      <node concept="1dpRTG" id="7KLlXp7NEyH" role="HszBJ">
-        <property role="TrG5h" value="all" />
-        <node concept="26Vqph" id="7KLlXp7NEyF" role="2C2TGm">
-          <property role="2caQfQ" value="false" />
-          <property role="2c7vTL" value="false" />
-        </node>
-      </node>
-    </node>
-    <node concept="rcWE1" id="5WwC2ssWwaM" role="rcWEr">
-      <property role="rcWEL" value="&quot;../../../../../include/anonymous_members.h&quot;" />
-    </node>
-  </node>
-  <node concept="N3F5e" id="5WwC2ssWwAt">
-    <property role="TrG5h" value="main" />
-    <node concept="3GEVxB" id="5WwC2ssWwBE" role="2OODSX">
-      <ref role="3GEb4d" node="5WwC2ssWtXx" resolve="ExternalStuff" />
-    </node>
-    <node concept="1sgJKc" id="5WwC2ssX6mY" role="N3F5h">
-      <property role="TrG5h" value="test" />
-      <node concept="1dpRTG" id="5WwC2ssX6zL" role="HszBJ">
-        <property role="TrG5h" value="a" />
-        <node concept="X$FZc" id="5WwC2ssX6zK" role="2C2TGm">
-          <property role="2caQfQ" value="false" />
-          <property role="2c7vTL" value="false" />
-          <property role="2Asx23" value="1" />
-        </node>
-      </node>
-    </node>
-    <node concept="N3Fnx" id="5WwC2ssWwBG" role="N3F5h">
-      <property role="TrG5h" value="main" />
-      <property role="2OOxQR" value="true" />
-      <node concept="3XIRFW" id="5WwC2ssWwBI" role="3XIRFX">
-        <node concept="3XIRlf" id="5WwC2ssWwOs" role="3XIRFZ">
-          <property role="TrG5h" value="v" />
-          <node concept="1sgJKr" id="5WwC2ssWwOr" role="2C2TGm">
-            <property role="2caQfQ" value="false" />
-            <property role="2c7vTL" value="false" />
-            <ref role="1sgJKq" node="7ya9dtelREw" resolve="aNormalStruct" />
-          </node>
-        </node>
-        <node concept="1_9egQ" id="5WwC2ssWxva" role="3XIRFZ">
-          <node concept="2qmXGp" id="5WwC2ssWxUb" role="1_9egR">
-            <node concept="1E4Tgc" id="5WwC2ssWyb0" role="1ESnxz">
-              <ref role="1E4Tge" node="7ya9dtelREz" resolve="i1" />
-            </node>
-            <node concept="2qmXGp" id="5WwC2ssWxyp" role="1_9fRO">
-              <node concept="2HrGSn" id="5WwC2ssWxMN" role="1ESnxz">
-                <ref role="2HrGUb" node="7ya9dtelREy" resolve="InnerStruct" />
-              </node>
-              <node concept="3ZVu4v" id="5WwC2ssWxv8" role="1_9fRO">
-                <ref role="3ZVs_2" node="5WwC2ssWwOs" resolve="v" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3XISUE" id="5WwC2ssWUWR" role="3XIRFZ" />
-        <node concept="3XIRlf" id="5WwC2ssWVlt" role="3XIRFZ">
-          <property role="TrG5h" value="u" />
-          <node concept="1dpZdL" id="5WwC2ssWVlr" role="2C2TGm">
-            <property role="2caQfQ" value="false" />
-            <property role="2c7vTL" value="false" />
-            <ref role="1dpZdN" node="7KLlXp7NE6k" resolve="aNormalUnion" />
-          </node>
-        </node>
-        <node concept="1_9egQ" id="5WwC2ssWVV3" role="3XIRFZ">
-          <node concept="2qmXGp" id="5WwC2ssWWZt" role="1_9egR">
-            <node concept="1E4Tgc" id="5WwC2ssWXgi" role="1ESnxz">
-              <ref role="1E4Tge" node="7KLlXp7NFBB" resolve="byte1" />
-            </node>
-            <node concept="2qmXGp" id="5WwC2ssWVYi" role="1_9fRO">
-              <node concept="2HrGSn" id="5WwC2ssWWRB" role="1ESnxz">
-                <ref role="2HrGUb" node="7KLlXp7NESk" resolve="bytes" />
-              </node>
-              <node concept="3ZVu4v" id="5WwC2ssWVV1" role="1_9fRO">
-                <ref role="3ZVs_2" node="5WwC2ssWVlt" resolve="u" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1_9egQ" id="5WwC2ssWXJV" role="3XIRFZ">
-          <node concept="2qmXGp" id="5WwC2ssWYbN" role="1_9egR">
-            <node concept="1E4Tgc" id="5WwC2ssWYtq" role="1ESnxz">
-              <ref role="1E4Tge" node="7KLlXp7NHXC" resolve="a" />
-            </node>
-            <node concept="2qmXGp" id="5WwC2ssWXNa" role="1_9fRO">
-              <node concept="2HrGSn" id="5WwC2ssWY4c" role="1ESnxz">
-                <ref role="2HrGUb" node="7KLlXp7NHBP" resolve="bits" />
-              </node>
-              <node concept="3ZVu4v" id="5WwC2ssWXJT" role="1_9fRO">
-                <ref role="3ZVs_2" node="5WwC2ssWVlt" resolve="u" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3XISUE" id="aIPzLHc_UG" role="3XIRFZ" />
-        <node concept="1_9egQ" id="aIPzLHcAsj" role="3XIRFZ">
-          <node concept="2qmXGp" id="aIPzLHcAue" role="1_9egR">
-            <node concept="2HrGSn" id="aIPzLHcAy$" role="1ESnxz">
-              <ref role="2HrGUb" node="aIPzLHc_Oo" resolve="nestedUnion1" />
-            </node>
-            <node concept="3ZVu4v" id="aIPzLHcAsh" role="1_9fRO">
-              <ref role="3ZVs_2" node="5WwC2ssWVlt" resolve="u" />
-            </node>
-          </node>
-        </node>
-        <node concept="1_9egQ" id="aIPzLHcAbD" role="3XIRFZ">
-          <node concept="2qmXGp" id="aIPzLHcAjX" role="1_9egR">
-            <node concept="2HrGSn" id="aIPzLHcAmW" role="1ESnxz">
-              <ref role="2HrGUb" node="aIPzLHc_Pq" resolve="nestedUnion2" />
-            </node>
-            <node concept="2qmXGp" id="aIPzLHcAd$" role="1_9fRO">
-              <node concept="2HrGSn" id="aIPzLHcAh8" role="1ESnxz">
-                <ref role="2HrGUb" node="aIPzLHc_Oo" resolve="nestedUnion1" />
-              </node>
-              <node concept="3ZVu4v" id="aIPzLHcAbB" role="1_9fRO">
-                <ref role="3ZVs_2" node="5WwC2ssWVlt" resolve="u" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1_9egQ" id="aIPzLHcA_d" role="3XIRFZ">
-          <node concept="2qmXGp" id="aIPzLHcAPe" role="1_9egR">
-            <node concept="1E4Tgc" id="aIPzLHcASU" role="1ESnxz">
-              <ref role="1E4Tge" node="aIPzLHc_PE" resolve="a" />
-            </node>
-            <node concept="2qmXGp" id="aIPzLHcAIK" role="1_9fRO">
-              <node concept="2HrGSn" id="aIPzLHcAM6" role="1ESnxz">
-                <ref role="2HrGUb" node="aIPzLHc_Pq" resolve="nestedUnion2" />
-              </node>
-              <node concept="2qmXGp" id="aIPzLHcAB8" role="1_9fRO">
-                <node concept="2HrGSn" id="aIPzLHcAFG" role="1ESnxz">
-                  <ref role="2HrGUb" node="aIPzLHc_Oo" resolve="nestedUnion1" />
-                </node>
-                <node concept="3ZVu4v" id="aIPzLHcA_b" role="1_9fRO">
-                  <ref role="3ZVs_2" node="5WwC2ssWVlt" resolve="u" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3XISUE" id="aIPzLHcAVQ" role="3XIRFZ" />
-        <node concept="2BFjQ_" id="5WwC2ssWwBQ" role="3XIRFZ">
-          <node concept="3TlMh9" id="5WwC2ssWwBR" role="2BFjQA">
-            <property role="2hmy$m" value="0" />
-          </node>
-        </node>
-      </node>
-      <node concept="26Vqph" id="5WwC2ssWwBK" role="2C2TGm">
-        <property role="2caQfQ" value="false" />
-        <property role="2c7vTL" value="false" />
-      </node>
-      <node concept="19RgSI" id="5WwC2ssWwBL" role="1UOdpc">
-        <property role="TrG5h" value="argc" />
-        <node concept="26Vqph" id="5WwC2ssWwBM" role="2C2TGm">
-          <property role="2caQfQ" value="false" />
-          <property role="2c7vTL" value="false" />
-        </node>
-      </node>
-      <node concept="19RgSI" id="5WwC2ssWwBN" role="1UOdpc">
-        <property role="TrG5h" value="argv" />
-        <node concept="3J0A42" id="5WwC2ssWwBO" role="2C2TGm">
-          <property role="2caQfQ" value="false" />
-          <property role="2c7vTL" value="false" />
-          <node concept="Pu267" id="5WwC2ssWwBP" role="2umbIo">
-            <property role="2caQfQ" value="false" />
-            <property role="2c7vTL" value="false" />
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="2v9HqL" id="5WwC2ssWys8">
-    <node concept="2AWWZL" id="5WwC2ssWys9" role="2AWWZH">
-      <property role="2AWWZJ" value="gcc" />
-      <property role="2AWWZI" value="-std=c99" />
-      <property role="1FkSt$" value="-g" />
-      <property role="3r8Kxs" value="make" />
-      <property role="3r8Kw1" value="gdb" />
-    </node>
-    <node concept="2eOfOl" id="5WwC2ssWysb" role="2ePNbc">
-      <property role="iO3LB" value="false" />
-      <property role="TrG5h" value="test" />
-      <node concept="2v9HqM" id="5WwC2ssWysf" role="2eOfOg">
-        <ref role="2v9HqP" node="5WwC2ssWwAt" resolve="main" />
-      </node>
-      <node concept="2v9HqM" id="5WwC2ssWysl" role="2eOfOg">
-        <ref role="2v9HqP" node="5WwC2ssWtXx" resolve="ExternalStuff" />
-      </node>
-    </node>
-  </node>
-</model>
-
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/structsAndEnums.mps b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/structsAndEnums.mps
index fa7d51624ad..47439491d06 100644
--- a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/structsAndEnums.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/structsAndEnums.mps
@@ -90,9 +90,6 @@
       <concept id="3117609929518446049" name="com.mbeddr.core.udt.structure.AbstractBitType" flags="ng" index="2ArCLn">
         <property id="3117609929518737717" name="width" index="2Asx23" />
       </concept>
-      <concept id="1803113332147436562" name="com.mbeddr.core.udt.structure.InnerSUDeclarationRef" flags="ng" index="2HrGSn">
-        <reference id="1803113332147436686" name="ref" index="2HrGUb" />
-      </concept>
       <concept id="7099329415459817973" name="com.mbeddr.core.udt.structure.SUDeclaration" flags="ng" index="HsMI8">
         <child id="7099329415459888018" name="members" index="HszBJ" />
       </concept>
@@ -2253,13 +2250,8 @@
               <node concept="1E4Tgc" id="6QawkaKiJbx" role="1ESnxz">
                 <ref role="1E4Tge" node="6QawkaKiJ5F" resolve="a" />
               </node>
-              <node concept="2qmXGp" id="6QawkaKiJ8I" role="1_9fRO">
-                <node concept="2HrGSn" id="6QawkaKiJ9C" role="1ESnxz">
-                  <ref role="2HrGUb" node="6QawkaKiJ4Q" resolve="Inner" />
-                </node>
-                <node concept="3ZVu4v" id="6QawkaKiJ8_" role="1_9fRO">
-                  <ref role="3ZVs_2" node="6QawkaJVOQZ" resolve="o" />
-                </node>
+              <node concept="3ZVu4v" id="6QawkaKiJ8_" role="1_9fRO">
+                <ref role="3ZVs_2" node="6QawkaJVOQZ" resolve="o" />
               </node>
             </node>
           </node>
@@ -2273,13 +2265,8 @@
               <node concept="1E4Tgc" id="6QawkaKiJrh" role="1ESnxz">
                 <ref role="1E4Tge" node="6QawkaKiJ5F" resolve="a" />
               </node>
-              <node concept="2qmXGp" id="6QawkaKiJk7" role="1_9fRO">
-                <node concept="2HrGSn" id="6QawkaKiJnh" role="1ESnxz">
-                  <ref role="2HrGUb" node="6QawkaKiJ4Q" resolve="Inner" />
-                </node>
-                <node concept="3ZVu4v" id="6QawkaKiJjZ" role="1_9fRO">
-                  <ref role="3ZVs_2" node="6QawkaJVOQZ" resolve="o" />
-                </node>
+              <node concept="3ZVu4v" id="6QawkaKiJjZ" role="1_9fRO">
+                <ref role="3ZVs_2" node="6QawkaJVOQZ" resolve="o" />
               </node>
             </node>
           </node>
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/unions.mps b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/unions.mps
index 8be985241f0..94c6672f3ec 100644
--- a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/unions.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/unions.mps
@@ -70,9 +70,6 @@
         <reference id="4202685725779391329" name="element" index="2xZoc7" />
         <child id="4202685725779390438" name="value" index="2xZpY0" />
       </concept>
-      <concept id="1803113332147436562" name="com.mbeddr.core.udt.structure.InnerSUDeclarationRef" flags="ng" index="2HrGSn">
-        <reference id="1803113332147436686" name="ref" index="2HrGUb" />
-      </concept>
       <concept id="7099329415459817973" name="com.mbeddr.core.udt.structure.SUDeclaration" flags="ng" index="HsMI8">
         <child id="7099329415459888018" name="members" index="HszBJ" />
       </concept>
@@ -367,17 +364,12 @@
           <node concept="3TlMh9" id="7halHeUxTBM" role="2N2GHh">
             <property role="2hmy$m" value="10" />
           </node>
-          <node concept="2qmXGp" id="7halHeUxTAM" role="2N2GHg">
-            <node concept="1E4Tgc" id="7halHeUxTAN" role="1ESnxz">
+          <node concept="2qmXGp" id="7halHeUxTAO" role="2N2GHg">
+            <node concept="1E4Tgc" id="1Nl0v8EKcu6" role="1ESnxz">
               <ref role="1E4Tge" node="1JA5qgmxn1Z" resolve="b" />
             </node>
-            <node concept="2qmXGp" id="7halHeUxTAO" role="1_9fRO">
-              <node concept="2HrGSn" id="7halHeUxTAP" role="1ESnxz">
-                <ref role="2HrGUb" node="1JA5qgmxn1B" resolve="inner" />
-              </node>
-              <node concept="3ZVu4v" id="7halHeUxTAQ" role="1_9fRO">
-                <ref role="3ZVs_2" node="1JA5qgmxngO" resolve="iu1" />
-              </node>
+            <node concept="3ZVu4v" id="7halHeUxTAQ" role="1_9fRO">
+              <ref role="3ZVs_2" node="1JA5qgmxngO" resolve="iu1" />
             </node>
           </node>
         </node>
diff --git a/code/languages/com.mbeddr.core/tests/test.ts.core/models/tests1@tests.mps b/code/languages/com.mbeddr.core/tests/test.ts.core/models/tests1@tests.mps
index 01d95eaeafd..81e5e374581 100644
--- a/code/languages/com.mbeddr.core/tests/test.ts.core/models/tests1@tests.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ts.core/models/tests1@tests.mps
@@ -261,9 +261,6 @@
       <concept id="5947739078127951575" name="com.mbeddr.core.udt.structure.Enum2Int" flags="ng" index="2a30fU">
         <child id="5947739078127951576" name="expr" index="2a30fP" />
       </concept>
-      <concept id="9101132143320200657" name="com.mbeddr.core.udt.structure.SUContent" flags="ng" index="2mccaB">
-        <property id="7893263420320494797" name="transparent" index="33gNmf" />
-      </concept>
       <concept id="6116558314501347857" name="com.mbeddr.core.udt.structure.TypeDef" flags="ng" index="rcJHK">
         <child id="6116558314501347862" name="original" index="rcJHR" />
       </concept>
@@ -277,9 +274,6 @@
       <concept id="3117609929518446049" name="com.mbeddr.core.udt.structure.AbstractBitType" flags="ng" index="2ArCLn">
         <property id="3117609929518737717" name="width" index="2Asx23" />
       </concept>
-      <concept id="1803113332147436562" name="com.mbeddr.core.udt.structure.InnerSUDeclarationRef" flags="ng" index="2HrGSn">
-        <reference id="1803113332147436686" name="ref" index="2HrGUb" />
-      </concept>
       <concept id="7099329415459817973" name="com.mbeddr.core.udt.structure.SUDeclaration" flags="ng" index="HsMI8">
         <child id="7099329415459888018" name="members" index="HszBJ" />
       </concept>
@@ -24142,304 +24136,6 @@
       </node>
     </node>
   </node>
-  <node concept="1lH9Xt" id="7ya9dte44TX">
-    <property role="TrG5h" value="AnonymousMembersTest" />
-    <node concept="1qefOq" id="7ya9dte48kJ" role="1SKRRt">
-      <node concept="rcWEw" id="7ya9dte48kM" role="1qenE9">
-        <property role="TrG5h" value="dummy" />
-        <node concept="1sgJKc" id="7ya9dte48lJ" role="N3F5h">
-          <property role="TrG5h" value="a" />
-          <node concept="2mccaB" id="7ya9dte7kzi" role="HszBJ" />
-          <node concept="QyKdJ" id="7ya9dte4eUI" role="HszBJ">
-            <property role="TrG5h" value="s" />
-            <node concept="1dpRTG" id="7ya9dte7kxW" role="HszBJ">
-              <property role="TrG5h" value="i1" />
-              <node concept="3TlMh2" id="7ya9dte7kxV" role="2C2TGm">
-                <property role="2caQfQ" value="false" />
-                <property role="2c7vTL" value="false" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1dpZge" id="7ya9dte7U2l" role="N3F5h">
-          <property role="TrG5h" value="b" />
-          <node concept="QyKdJ" id="7ya9dte7U2z" role="HszBJ">
-            <property role="TrG5h" value="inner1" />
-            <node concept="1dpRTG" id="7ya9dte7U2B" role="HszBJ">
-              <property role="TrG5h" value="a" />
-              <node concept="3TlMh2" id="7ya9dte7U2A" role="2C2TGm">
-                <property role="2caQfQ" value="false" />
-                <property role="2c7vTL" value="false" />
-              </node>
-            </node>
-            <node concept="1dpRTG" id="7ya9dte7U4D" role="HszBJ">
-              <property role="TrG5h" value="b" />
-              <node concept="3TlMh2" id="7ya9dte7U4B" role="2C2TGm">
-                <property role="2caQfQ" value="false" />
-                <property role="2c7vTL" value="false" />
-              </node>
-            </node>
-            <node concept="1dpRTG" id="7ya9dte7U5k" role="HszBJ">
-              <property role="TrG5h" value="c" />
-              <node concept="3TlMh2" id="7ya9dte7U5i" role="2C2TGm">
-                <property role="2caQfQ" value="false" />
-                <property role="2c7vTL" value="false" />
-              </node>
-            </node>
-          </node>
-          <node concept="QyKdJ" id="7ya9dte7U67" role="HszBJ">
-            <property role="TrG5h" value="inner2" />
-            <node concept="1dpRTG" id="7ya9dte7Wcm" role="HszBJ">
-              <property role="TrG5h" value="d" />
-              <node concept="3TlMh2" id="7ya9dte7Wcl" role="2C2TGm">
-                <property role="2caQfQ" value="false" />
-                <property role="2c7vTL" value="false" />
-              </node>
-            </node>
-            <node concept="1dpRTG" id="7ya9dte7WcT" role="HszBJ">
-              <property role="TrG5h" value="d" />
-              <node concept="3TlMh2" id="7ya9dte7WcR" role="2C2TGm">
-                <property role="2caQfQ" value="false" />
-                <property role="2c7vTL" value="false" />
-              </node>
-              <node concept="7CXmI" id="7ya9dte7Wdn" role="lGtFl">
-                <node concept="1TM$A" id="1zouAvzW4XP" role="7EUXB">
-                  <node concept="2PYRI3" id="1zouAvzW4XQ" role="3lydEf">
-                    <ref role="39XzEq" to="9zoj:4qSf1u1TRgo" />
-                  </node>
-                </node>
-                <node concept="1TM$A" id="1zouAvzW4XR" role="7EUXB">
-                  <node concept="2PYRI3" id="1zouAvzW4XS" role="3lydEf">
-                    <ref role="39XzEq" to="9zoj:4qSf1u1TRgo" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="7CXmI" id="7ya9dteegQs" role="lGtFl">
-            <node concept="29bkU" id="1zouAvzWoHL" role="7EUXB">
-              <node concept="2PQEqo" id="1zouAvzWoHM" role="3lydCh">
-                <ref role="39XzEq" to="fvu6:61lw97FtLHo" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1sgJKc" id="7ya9dteegPI" role="N3F5h">
-          <property role="TrG5h" value="foo" />
-          <node concept="QyKdJ" id="7ya9dteel9I" role="HszBJ">
-            <property role="TrG5h" value="inner1" />
-            <node concept="1dpRTG" id="7ya9dteel9M" role="HszBJ">
-              <property role="TrG5h" value="a" />
-              <node concept="3TlMh2" id="7ya9dteel9L" role="2C2TGm">
-                <property role="2caQfQ" value="false" />
-                <property role="2c7vTL" value="false" />
-              </node>
-            </node>
-            <node concept="1dpRTG" id="7ya9dteelal" role="HszBJ">
-              <property role="TrG5h" value="b" />
-              <node concept="3TlMh2" id="7ya9dteelaj" role="2C2TGm">
-                <property role="2caQfQ" value="false" />
-                <property role="2c7vTL" value="false" />
-              </node>
-            </node>
-            <node concept="1dpRTG" id="7ya9dteelb0" role="HszBJ">
-              <property role="TrG5h" value="c" />
-              <node concept="3TlMh2" id="7ya9dteelaY" role="2C2TGm">
-                <property role="2caQfQ" value="false" />
-                <property role="2c7vTL" value="false" />
-              </node>
-            </node>
-          </node>
-          <node concept="QyKdJ" id="7ya9dteelbN" role="HszBJ">
-            <property role="TrG5h" value="inner2" />
-            <node concept="1dpRTG" id="7ya9dteelc6" role="HszBJ">
-              <property role="TrG5h" value="a" />
-              <node concept="3TlMh2" id="7ya9dteelc5" role="2C2TGm">
-                <property role="2caQfQ" value="false" />
-                <property role="2c7vTL" value="false" />
-              </node>
-              <node concept="7CXmI" id="7ya9dteeleA" role="lGtFl">
-                <node concept="1TM$A" id="1zouAvzQ$s9" role="7EUXB">
-                  <node concept="2PYRI3" id="1zouAvzQ$sa" role="3lydEf">
-                    <ref role="39XzEq" to="9zoj:4qSf1u1TRgo" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="1dpRTG" id="7ya9dteele8" role="HszBJ">
-              <property role="TrG5h" value="d" />
-              <node concept="3TlMh2" id="7ya9dteele6" role="2C2TGm">
-                <property role="2caQfQ" value="false" />
-                <property role="2c7vTL" value="false" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="rcWE1" id="7ya9dteeleV" role="rcWEr">
-          <property role="rcWEL" value="&quot;a.h&quot;" />
-        </node>
-      </node>
-    </node>
-    <node concept="1qefOq" id="7ya9dtelRMk" role="1SKRRt">
-      <node concept="N3F5e" id="7ya9dtelRNH" role="1qenE9">
-        <property role="TrG5h" value="dummy" />
-        <node concept="3GEVxB" id="7ya9dtelRNK" role="2OODSX">
-          <ref role="3GEb4d" node="7ya9dtegY_S" resolve="ExternalTest" />
-        </node>
-        <node concept="N3Fnx" id="7ya9dtelRNN" role="N3F5h">
-          <property role="TrG5h" value="main" />
-          <property role="2OOxQR" value="true" />
-          <node concept="3XIRFW" id="7ya9dtelRNP" role="3XIRFX">
-            <node concept="3XIRlf" id="7ya9dtelS0o" role="3XIRFZ">
-              <property role="TrG5h" value="n" />
-              <node concept="1sgJKr" id="7ya9dtelS0n" role="2C2TGm">
-                <property role="2caQfQ" value="false" />
-                <property role="2c7vTL" value="false" />
-                <ref role="1sgJKq" node="7ya9dtelREw" resolve="aNormalStruct" />
-              </node>
-            </node>
-            <node concept="1_9egQ" id="1$5WwmO$Uqf" role="3XIRFZ">
-              <node concept="2qmXGp" id="7KLlXp7MHZn" role="1_9egR">
-                <node concept="1E4Tgc" id="7KLlXp7MIf$" role="1ESnxz">
-                  <ref role="1E4Tge" node="7ya9dtelREz" resolve="i1" />
-                  <node concept="7CXmI" id="7KLlXp7MQaw" role="lGtFl">
-                    <node concept="30Omv" id="7KLlXp7MQnj" role="7EUXB">
-                      <node concept="26Vqph" id="6si$VEkrj61" role="31d$z">
-                        <property role="2caQfQ" value="false" />
-                        <property role="2c7vTL" value="false" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="2qmXGp" id="1$5WwmO$UtC" role="1_9fRO">
-                  <node concept="2HrGSn" id="1$5WwmO$UWj" role="1ESnxz">
-                    <ref role="2HrGUb" node="7ya9dtelREy" resolve="InnerStruct" />
-                  </node>
-                  <node concept="3ZVu4v" id="1$5WwmO$Uqd" role="1_9fRO">
-                    <ref role="3ZVs_2" node="7ya9dtelS0o" resolve="n" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3XIRlf" id="7KLlXp7NJ1u" role="3XIRFZ">
-              <property role="TrG5h" value="u" />
-              <node concept="1dpZdL" id="7KLlXp7NJ1s" role="2C2TGm">
-                <property role="2caQfQ" value="false" />
-                <property role="2c7vTL" value="false" />
-                <ref role="1dpZdN" node="7KLlXp7NE6k" resolve="aNormalUnion" />
-              </node>
-            </node>
-            <node concept="1_9egQ" id="7KLlXp7NJIN" role="3XIRFZ">
-              <node concept="2qmXGp" id="7KLlXp7NJMc" role="1_9egR">
-                <node concept="1E4Tgc" id="7KLlXp7NKBC" role="1ESnxz">
-                  <ref role="1E4Tge" node="7KLlXp7NEyH" resolve="all" />
-                  <node concept="7CXmI" id="7KLlXp7NM7E" role="lGtFl">
-                    <node concept="30Omv" id="7KLlXp7NNmh" role="7EUXB">
-                      <node concept="26Vqph" id="7KLlXp7NNmx" role="31d$z">
-                        <property role="2caQfQ" value="false" />
-                        <property role="2c7vTL" value="false" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3ZVu4v" id="7KLlXp7NJIL" role="1_9fRO">
-                  <ref role="3ZVs_2" node="7KLlXp7NJ1u" resolve="u" />
-                </node>
-              </node>
-            </node>
-            <node concept="1_9egQ" id="7KLlXp7O2sA" role="3XIRFZ">
-              <node concept="2qmXGp" id="7KLlXp7O358" role="1_9egR">
-                <node concept="1E4Tgc" id="7KLlXp7O3wY" role="1ESnxz">
-                  <ref role="1E4Tge" node="7KLlXp7NFBB" resolve="byte1" />
-                </node>
-                <node concept="2qmXGp" id="7KLlXp7O2vZ" role="1_9fRO">
-                  <node concept="2HrGSn" id="7KLlXp7O2WB" role="1ESnxz">
-                    <ref role="2HrGUb" node="7KLlXp7NESk" resolve="bytes" />
-                  </node>
-                  <node concept="3ZVu4v" id="7KLlXp7O2s$" role="1_9fRO">
-                    <ref role="3ZVs_2" node="7KLlXp7NJ1u" resolve="u" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="1_9egQ" id="7KLlXp7NNEe" role="3XIRFZ">
-              <node concept="2qmXGp" id="7KLlXp7NOmY" role="1_9egR">
-                <node concept="1E4Tgc" id="7KLlXp7NOFL" role="1ESnxz">
-                  <ref role="1E4Tge" node="7KLlXp7NFBB" resolve="byte1" />
-                  <node concept="7CXmI" id="7KLlXp7NPYX" role="lGtFl">
-                    <node concept="30Omv" id="7KLlXp7NQQu" role="7EUXB">
-                      <node concept="26Vqqz" id="7KLlXp7NQQI" role="31d$z">
-                        <property role="2caQfQ" value="false" />
-                        <property role="2c7vTL" value="false" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="2qmXGp" id="7KLlXp7NNHB" role="1_9fRO">
-                  <node concept="2HrGSn" id="7KLlXp7NO2D" role="1ESnxz">
-                    <ref role="2HrGUb" node="7KLlXp7NESk" resolve="bytes" />
-                  </node>
-                  <node concept="3ZVu4v" id="7KLlXp7NNEc" role="1_9fRO">
-                    <ref role="3ZVs_2" node="7KLlXp7NJ1u" resolve="u" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="1_9egQ" id="7KLlXp7NRdP" role="3XIRFZ">
-              <node concept="2qmXGp" id="7KLlXp7NRM_" role="1_9egR">
-                <node concept="1E4Tgc" id="7KLlXp7NSaL" role="1ESnxz">
-                  <ref role="1E4Tge" node="7KLlXp7NE7I" resolve="high" />
-                  <node concept="7CXmI" id="7KLlXp7NSBJ" role="lGtFl">
-                    <node concept="30Omv" id="7KLlXp7NSYU" role="7EUXB">
-                      <node concept="26Vqpq" id="7KLlXp7NSZa" role="31d$z">
-                        <property role="2caQfQ" value="false" />
-                        <property role="2c7vTL" value="false" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="2qmXGp" id="7KLlXp7NRhe" role="1_9fRO">
-                  <node concept="2HrGSn" id="7KLlXp7NRE3" role="1ESnxz">
-                    <ref role="2HrGUb" node="7KLlXp7NE6U" resolve="dbytes" />
-                  </node>
-                  <node concept="3ZVu4v" id="7KLlXp7NRdN" role="1_9fRO">
-                    <ref role="3ZVs_2" node="7KLlXp7NJ1u" resolve="u" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="2BFjQ_" id="7ya9dtelRNX" role="3XIRFZ">
-              <node concept="3TlMh9" id="7ya9dtelRNY" role="2BFjQA">
-                <property role="2hmy$m" value="0" />
-              </node>
-            </node>
-          </node>
-          <node concept="26Vqph" id="7ya9dtelRNR" role="2C2TGm">
-            <property role="2caQfQ" value="false" />
-            <property role="2c7vTL" value="false" />
-          </node>
-          <node concept="19RgSI" id="7ya9dtelRNS" role="1UOdpc">
-            <property role="TrG5h" value="argc" />
-            <node concept="26Vqph" id="7ya9dtelRNT" role="2C2TGm">
-              <property role="2caQfQ" value="false" />
-              <property role="2c7vTL" value="false" />
-            </node>
-          </node>
-          <node concept="19RgSI" id="7ya9dtelRNU" role="1UOdpc">
-            <property role="TrG5h" value="argv" />
-            <node concept="3J0A42" id="7ya9dtelRNV" role="2C2TGm">
-              <property role="2caQfQ" value="false" />
-              <property role="2c7vTL" value="false" />
-              <node concept="Pu267" id="7ya9dtelRNW" role="2umbIo">
-                <property role="2caQfQ" value="false" />
-                <property role="2c7vTL" value="false" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="rcWEw" id="7ya9dtegY_S">
     <property role="TrG5h" value="ExternalTest" />
     <node concept="1sgJKc" id="7ya9dtelREw" role="N3F5h">
@@ -26694,306 +26390,6 @@
       <property role="rcWEL" value="&lt;stdio.h&gt;" />
     </node>
   </node>
-  <node concept="1lH9Xt" id="6QawkaHXLAw">
-    <property role="TrG5h" value="AnoymousStructStuff" />
-    <node concept="1qefOq" id="6QawkaHXLAx" role="1SKRRt">
-      <node concept="N3F5e" id="6QawkaHXLAy" role="1qenE9">
-        <property role="TrG5h" value="AnoymousStructStuff" />
-        <node concept="1sgJKc" id="6QawkaJ7Ey8" role="N3F5h">
-          <property role="TrG5h" value="Base" />
-          <node concept="1dpRTG" id="6QawkaJ7Ey9" role="HszBJ">
-            <property role="TrG5h" value="base1" />
-            <node concept="26Vqqz" id="6QawkaJ7Eya" role="2C2TGm">
-              <property role="2caQfQ" value="false" />
-              <property role="2c7vTL" value="false" />
-            </node>
-          </node>
-          <node concept="1dpRTG" id="6QawkaJ7Eyb" role="HszBJ">
-            <property role="TrG5h" value="base2" />
-            <node concept="26Vqqz" id="6QawkaJ7Eyc" role="2C2TGm">
-              <property role="2caQfQ" value="false" />
-              <property role="2c7vTL" value="false" />
-            </node>
-          </node>
-        </node>
-        <node concept="2NXPZ9" id="6QawkaJ7EDn" role="N3F5h">
-          <property role="TrG5h" value="empty_1428580922546_3018" />
-        </node>
-        <node concept="1sgJKc" id="6QawkaIVKWp" role="N3F5h">
-          <property role="TrG5h" value="OtherStuff" />
-          <node concept="1dpRTG" id="6QawkaIVL09" role="HszBJ">
-            <property role="TrG5h" value="other1" />
-            <node concept="26Vqqz" id="6QawkaIVL0a" role="2C2TGm">
-              <property role="2caQfQ" value="false" />
-              <property role="2c7vTL" value="false" />
-            </node>
-          </node>
-          <node concept="1dpRTG" id="6QawkaIVKYi" role="HszBJ">
-            <property role="TrG5h" value="other2" />
-            <node concept="26Vqqz" id="6QawkaIVKYh" role="2C2TGm">
-              <property role="2caQfQ" value="false" />
-              <property role="2c7vTL" value="false" />
-            </node>
-          </node>
-        </node>
-        <node concept="2NXPZ9" id="6QawkaIVKSH" role="N3F5h">
-          <property role="TrG5h" value="empty_1428580225109_3012" />
-        </node>
-        <node concept="2NXPZ9" id="6QawkaJ7CeE" role="N3F5h">
-          <property role="TrG5h" value="empty_1428580906425_3017" />
-        </node>
-        <node concept="1sgJKc" id="6QawkaHX2aU" role="N3F5h">
-          <property role="TrG5h" value="Outer" />
-          <node concept="2mccaB" id="6QawkaIVL9r" role="HszBJ" />
-          <node concept="1dpRTG" id="6QawkaJ7ERJ" role="HszBJ">
-            <property role="TrG5h" value="other" />
-            <node concept="1sgJKr" id="6QawkaJ7ERI" role="2C2TGm">
-              <property role="2caQfQ" value="false" />
-              <property role="2c7vTL" value="false" />
-              <ref role="1sgJKq" node="6QawkaIVKWp" resolve="OtherStuff" />
-            </node>
-          </node>
-          <node concept="2mccaB" id="6QawkaJ7EPe" role="HszBJ" />
-          <node concept="1dpRTG" id="6QawkaIVLhS" role="HszBJ">
-            <property role="TrG5h" value="base" />
-            <property role="33gNmf" value="true" />
-            <node concept="1sgJKr" id="6QawkaJ7EGa" role="2C2TGm">
-              <property role="2caQfQ" value="false" />
-              <property role="2c7vTL" value="false" />
-              <ref role="1sgJKq" node="6QawkaJ7Ey8" resolve="Base" />
-            </node>
-          </node>
-          <node concept="2mccaB" id="6QawkaIVL8$" role="HszBJ" />
-          <node concept="QyKdJ" id="6QawkaHX2aX" role="HszBJ">
-            <property role="TrG5h" value="Inner" />
-            <node concept="1dpRTG" id="6QawkaHX2ba" role="HszBJ">
-              <property role="TrG5h" value="ax" />
-              <node concept="26Vqqz" id="6QawkaHX2b9" role="2C2TGm">
-                <property role="2caQfQ" value="false" />
-                <property role="2c7vTL" value="false" />
-              </node>
-              <node concept="7CXmI" id="6QawkaHXS77" role="lGtFl">
-                <node concept="1TM$A" id="1zouAvzPw5m" role="7EUXB">
-                  <node concept="2PYRI3" id="1zouAvzPw5n" role="3lydEf">
-                    <ref role="39XzEq" to="9zoj:4qSf1u1TRgo" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="1dpRTG" id="6QawkaHXWYi" role="HszBJ">
-              <property role="TrG5h" value="notTransparentlyVisible" />
-              <node concept="26Vqqz" id="6QawkaHXWYg" role="2C2TGm">
-                <property role="2caQfQ" value="false" />
-                <property role="2c7vTL" value="false" />
-              </node>
-            </node>
-          </node>
-          <node concept="2mccaB" id="6QawkaIVLb3" role="HszBJ" />
-          <node concept="QyKdJ" id="6QawkaHX2VD" role="HszBJ">
-            <property role="TrG5h" value="Transparent" />
-            <property role="33gNmf" value="true" />
-            <node concept="1dpRTG" id="6QawkaHX2VE" role="HszBJ">
-              <property role="TrG5h" value="b" />
-              <node concept="26Vqqz" id="6QawkaHX2VF" role="2C2TGm">
-                <property role="2caQfQ" value="false" />
-                <property role="2c7vTL" value="false" />
-              </node>
-            </node>
-            <node concept="1dpRTG" id="6QawkaHXRVQ" role="HszBJ">
-              <property role="TrG5h" value="bx" />
-              <node concept="26Vqqz" id="6QawkaHXRVR" role="2C2TGm">
-                <property role="2caQfQ" value="false" />
-                <property role="2c7vTL" value="false" />
-              </node>
-            </node>
-            <node concept="1dpRTG" id="6QawkaHXRVn" role="HszBJ">
-              <property role="TrG5h" value="bx" />
-              <node concept="26Vqqz" id="6QawkaHXRVl" role="2C2TGm">
-                <property role="2caQfQ" value="false" />
-                <property role="2c7vTL" value="false" />
-              </node>
-              <node concept="7CXmI" id="6QawkaHXRWY" role="lGtFl">
-                <node concept="1TM$A" id="3n5vksROTqN" role="7EUXB">
-                  <node concept="2PYRI3" id="3n5vksROTqO" role="3lydEf">
-                    <ref role="39XzEq" to="9zoj:4qSf1u1TRgo" />
-                  </node>
-                </node>
-                <node concept="1TM$A" id="3n5vksROTqP" role="7EUXB">
-                  <node concept="2PYRI3" id="3n5vksROTqQ" role="3lydEf">
-                    <ref role="39XzEq" to="9zoj:4qSf1u1TRgo" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="1dpRTG" id="6QawkaHXRXM" role="HszBJ">
-              <property role="TrG5h" value="vx" />
-              <node concept="26Vqqz" id="6QawkaHXRXK" role="2C2TGm">
-                <property role="2caQfQ" value="false" />
-                <property role="2c7vTL" value="false" />
-              </node>
-              <node concept="7CXmI" id="6QawkaHXRZT" role="lGtFl">
-                <node concept="1TM$A" id="1zouAvzVF45" role="7EUXB">
-                  <node concept="2PYRI3" id="1zouAvzVF46" role="3lydEf">
-                    <ref role="39XzEq" to="9zoj:4qSf1u1TRgo" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2mccaB" id="6QawkaIVLcH" role="HszBJ" />
-          <node concept="1dpRTG" id="6QawkaHXS0N" role="HszBJ">
-            <property role="TrG5h" value="ax" />
-            <node concept="26Vqqz" id="6QawkaHXS0L" role="2C2TGm">
-              <property role="2caQfQ" value="false" />
-              <property role="2c7vTL" value="false" />
-            </node>
-          </node>
-          <node concept="1dpRTG" id="6QawkaHX2cf" role="HszBJ">
-            <property role="TrG5h" value="c" />
-            <node concept="26Vqqz" id="6QawkaHX2cd" role="2C2TGm">
-              <property role="2caQfQ" value="false" />
-              <property role="2c7vTL" value="false" />
-            </node>
-          </node>
-          <node concept="1dpRTG" id="6QawkaHXRZ9" role="HszBJ">
-            <property role="TrG5h" value="vx" />
-            <node concept="26Vqqz" id="6QawkaHXRZ7" role="2C2TGm">
-              <property role="2caQfQ" value="false" />
-              <property role="2c7vTL" value="false" />
-            </node>
-          </node>
-          <node concept="2mccaB" id="6QawkaIVLep" role="HszBJ" />
-        </node>
-        <node concept="2NXPZ9" id="6QawkaHXR8B" role="N3F5h">
-          <property role="TrG5h" value="empty_1428576847591_3002" />
-        </node>
-        <node concept="N3Fnx" id="6QawkaHXS2T" role="N3F5h">
-          <property role="TrG5h" value="f" />
-          <property role="2OOxQR" value="false" />
-          <node concept="19RgSI" id="3XvCV0Kdqj_" role="1UOdpc">
-            <property role="TrG5h" value="o" />
-            <node concept="1sgJKr" id="3XvCV0Kdqj$" role="2C2TGm">
-              <property role="2caQfQ" value="false" />
-              <property role="2c7vTL" value="false" />
-              <ref role="1sgJKq" node="6QawkaHX2aU" resolve="Outer" />
-            </node>
-          </node>
-          <node concept="3XIRFW" id="6QawkaHXS2V" role="3XIRFX">
-            <node concept="1_9egQ" id="6QawkaHXWV6" role="3XIRFZ">
-              <node concept="2qmXGp" id="6QawkaHXWVd" role="1_9egR">
-                <node concept="3ZUYvv" id="3XvCV0KdsQz" role="1_9fRO">
-                  <ref role="3ZUYvu" node="3XvCV0Kdqj_" resolve="o" />
-                </node>
-                <node concept="1E4Tgc" id="6QawkaImV1X" role="1ESnxz">
-                  <ref role="1E4Tge" node="6QawkaHX2cf" resolve="c" />
-                </node>
-              </node>
-            </node>
-            <node concept="1_9egQ" id="6QawkaImV3p" role="3XIRFZ">
-              <node concept="2qmXGp" id="6QawkaImV46" role="1_9egR">
-                <node concept="3ZUYvv" id="3XvCV0KdsR3" role="1_9fRO">
-                  <ref role="3ZUYvu" node="3XvCV0Kdqj_" resolve="o" />
-                </node>
-                <node concept="1E4Tgc" id="6QawkaImV5p" role="1ESnxz">
-                  <ref role="1E4Tge" node="6QawkaHX2VE" resolve="b" />
-                </node>
-              </node>
-            </node>
-            <node concept="1_9egQ" id="6QawkaIyMt0" role="3XIRFZ">
-              <node concept="2qmXGp" id="6QawkaIyMt1" role="1_9egR">
-                <node concept="3ZUYvv" id="3XvCV0KdsTc" role="1_9fRO">
-                  <ref role="3ZUYvu" node="3XvCV0Kdqj_" resolve="o" />
-                </node>
-                <node concept="2HrGSn" id="6QawkaIyMt2" role="1ESnxz">
-                  <ref role="2HrGUb" node="6QawkaHX2VD" resolve="Transparent" />
-                  <node concept="7CXmI" id="6QawkaIyMt3" role="lGtFl">
-                    <node concept="39XrGg" id="1zouAvzQ$Lm" role="7EUXB">
-                      <node concept="2u4KIi" id="1zouAvzQ$Ln" role="39rjcI">
-                        <ref role="39XzEq" to="k7w5:1$5WwmOrzXG" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="1_9egQ" id="6QawkaHXS4$" role="3XIRFZ">
-              <node concept="2qmXGp" id="6QawkaImUUM" role="1_9egR">
-                <node concept="3ZUYvv" id="3XvCV0KdsTr" role="1_9fRO">
-                  <ref role="3ZUYvu" node="3XvCV0Kdqj_" resolve="o" />
-                </node>
-                <node concept="2HrGSn" id="6QawkaImUXD" role="1ESnxz">
-                  <ref role="2HrGUb" node="6QawkaHX2aX" resolve="Inner" />
-                </node>
-              </node>
-            </node>
-            <node concept="3XISUE" id="6QawkaIWB42" role="3XIRFZ" />
-            <node concept="1_9egQ" id="6QawkaIWB6N" role="3XIRFZ">
-              <node concept="2qmXGp" id="6QawkaIYkQ4" role="1_9egR">
-                <node concept="3ZUYvv" id="3XvCV0KdsTE" role="1_9fRO">
-                  <ref role="3ZUYvu" node="3XvCV0Kdqj_" resolve="o" />
-                </node>
-                <node concept="1E4Tgc" id="6QawkaJ7EZv" role="1ESnxz">
-                  <ref role="1E4Tge" node="6QawkaJ7Ey9" resolve="base1" />
-                </node>
-              </node>
-            </node>
-            <node concept="1_9egQ" id="6QawkaJ7C7E" role="3XIRFZ">
-              <node concept="2qmXGp" id="6QawkaJ7C7L" role="1_9egR">
-                <node concept="3ZUYvv" id="3XvCV0KdsU0" role="1_9fRO">
-                  <ref role="3ZUYvu" node="3XvCV0Kdqj_" resolve="o" />
-                </node>
-                <node concept="1E4Tgc" id="6QawkaJ7F1$" role="1ESnxz">
-                  <ref role="1E4Tge" node="6QawkaJ7Eyb" resolve="base2" />
-                </node>
-              </node>
-            </node>
-            <node concept="3XISUE" id="6QawkaIWB5q" role="3XIRFZ" />
-            <node concept="1_9egQ" id="6QawkaJ7F5s" role="3XIRFZ">
-              <node concept="2qmXGp" id="6QawkaJ7Fbg" role="1_9egR">
-                <node concept="1E4Tgc" id="6QawkaJ7Feh" role="1ESnxz">
-                  <ref role="1E4Tge" node="6QawkaIVL09" resolve="other1" />
-                </node>
-                <node concept="2qmXGp" id="6QawkaJ7F5z" role="1_9fRO">
-                  <node concept="3ZUYvv" id="3XvCV0KdsYr" role="1_9fRO">
-                    <ref role="3ZUYvu" node="3XvCV0Kdqj_" resolve="o" />
-                  </node>
-                  <node concept="1E4Tgc" id="6QawkaJ7F8X" role="1ESnxz">
-                    <ref role="1E4Tge" node="6QawkaJ7ERJ" resolve="other" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="1_9egQ" id="6QawkaJ7Fi2" role="3XIRFZ">
-              <node concept="2qmXGp" id="6QawkaJ7FoK" role="1_9egR">
-                <node concept="1E4Tgc" id="6QawkaJ7Fs7" role="1ESnxz">
-                  <ref role="1E4Tge" node="6QawkaIVKYi" resolve="other2" />
-                </node>
-                <node concept="2qmXGp" id="6QawkaJ7Fi9" role="1_9fRO">
-                  <node concept="3ZUYvv" id="3XvCV0KdsZn" role="1_9fRO">
-                    <ref role="3ZUYvu" node="3XvCV0Kdqj_" resolve="o" />
-                  </node>
-                  <node concept="1E4Tgc" id="6QawkaJ7Fmb" role="1ESnxz">
-                    <ref role="1E4Tge" node="6QawkaJ7ERJ" resolve="other" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3XISUE" id="6QawkaJ7F4f" role="3XIRFZ" />
-          </node>
-          <node concept="19Rifw" id="6QawkaHXS1N" role="2C2TGm">
-            <property role="2caQfQ" value="false" />
-            <property role="2c7vTL" value="false" />
-          </node>
-        </node>
-        <node concept="2NXPZ9" id="6QawkaHXR9j" role="N3F5h">
-          <property role="TrG5h" value="empty_1428576847911_3004" />
-        </node>
-        <node concept="7CXmI" id="6QawkaHXLD1" role="lGtFl">
-          <node concept="7OXhh" id="6QawkaId8qa" role="7EUXB" />
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="1lH9Xt" id="6Pt2vx4BAiN">
     <property role="TrG5h" value="Concat" />
     <node concept="1qefOq" id="6Pt2vx4BAjw" role="1SKRRt">
diff --git a/code/languages/com.mbeddr.core/tests/test.ts.core/tests/ts/core/importing@tests.mps b/code/languages/com.mbeddr.core/tests/test.ts.core/tests/ts/core/importing@tests.mps
index a84fdea9f7c..2c0f3a6374c 100644
--- a/code/languages/com.mbeddr.core/tests/test.ts.core/tests/ts/core/importing@tests.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ts.core/tests/ts/core/importing@tests.mps
@@ -61,17 +61,6 @@
       </concept>
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
-    <language id="efda956e-491e-4f00-ba14-36af2f213ecf" name="com.mbeddr.core.udt">
-      <concept id="7099329415459817973" name="com.mbeddr.core.udt.structure.SUDeclaration" flags="ng" index="HsMI8">
-        <child id="7099329415459888018" name="members" index="HszBJ" />
-      </concept>
-      <concept id="8685795338482689976" name="com.mbeddr.core.udt.structure.AnonymousStructDeclaration" flags="ng" index="QyKdJ" />
-      <concept id="5882395403881875736" name="com.mbeddr.core.udt.structure.Member" flags="ng" index="1dpRTG" />
-      <concept id="6394819151180597807" name="com.mbeddr.core.udt.structure.StructDeclaration" flags="ng" index="1sgJKc" />
-      <concept id="6394819151180597816" name="com.mbeddr.core.udt.structure.StructType" flags="ng" index="1sgJKr">
-        <reference id="6394819151180597817" name="struct" index="1sgJKq" />
-      </concept>
-    </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
       <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
@@ -111,7 +100,6 @@
       </concept>
     </language>
     <language id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions">
-      <concept id="8463282783691618440" name="com.mbeddr.core.expressions.structure.Int32tType" flags="ng" index="26Vqph" />
       <concept id="8463282783691618426" name="com.mbeddr.core.expressions.structure.Int8tType" flags="ng" index="26Vqqz" />
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
@@ -157,50 +145,8 @@
         <property role="2hmy$m" value="10" />
       </node>
     </node>
-    <node concept="2NXPZ9" id="4ISByPp52YF" role="N3F5h">
-      <property role="TrG5h" value="empty_1453888721444_1" />
-    </node>
-    <node concept="1sgJKc" id="4ISByPp52Z0" role="N3F5h">
-      <property role="TrG5h" value="A" />
-      <node concept="1dpRTG" id="4ISByPp60s$" role="HszBJ">
-        <property role="TrG5h" value="a" />
-        <node concept="1sgJKr" id="4ISByPp60sz" role="2C2TGm">
-          <property role="2caQfQ" value="false" />
-          <property role="2c7vTL" value="false" />
-          <ref role="1sgJKq" node="4ISByPp52Z0" resolve="A" />
-        </node>
-      </node>
-      <node concept="QyKdJ" id="4ISByPp7qHb" role="HszBJ">
-        <property role="TrG5h" value="q" />
-        <node concept="1dpRTG" id="4ISByPp7qHs" role="HszBJ">
-          <property role="TrG5h" value="bb" />
-          <node concept="1sgJKr" id="4ISByPp7qHr" role="2C2TGm">
-            <property role="2caQfQ" value="false" />
-            <property role="2c7vTL" value="false" />
-            <ref role="1sgJKq" node="4ISByPp52Z0" resolve="A" />
-          </node>
-        </node>
-      </node>
-      <node concept="1dpRTG" id="4ISByPp7lUI" role="HszBJ">
-        <property role="TrG5h" value="b" />
-        <node concept="26Vqph" id="4ISByPp7lUG" role="2C2TGm">
-          <property role="2caQfQ" value="false" />
-          <property role="2c7vTL" value="false" />
-        </node>
-      </node>
-    </node>
-    <node concept="2NXPZ9" id="6uZAbUKexSG" role="N3F5h">
-      <property role="TrG5h" value="empty_1364212237400_2" />
-    </node>
-    <node concept="3GEVxB" id="6YocL3sys0H" role="2OODSX">
-      <property role="3GEa6x" value="false" />
-      <ref role="3GEb4d" node="6uZAbUKexTN" resolve="M2" />
-    </node>
-    <node concept="3GEVxB" id="6YocL3syrY_" role="2OODSX">
+    <node concept="3GEVxB" id="1Nl0v8EPVcj" role="2OODSX">
       <property role="3GEa6x" value="true" />
-      <ref role="3GEb4d" node="6uZAbUKeCcu" resolve="M3" />
-    </node>
-    <node concept="3GEVxB" id="4ISByPoXsPM" role="2OODSX">
       <ref role="3GEb4d" node="6uZAbUKexTN" resolve="M2" />
     </node>
   </node>
@@ -351,9 +297,6 @@
   </node>
   <node concept="N3F5e" id="6uZAbUKexTN">
     <property role="TrG5h" value="M2" />
-    <node concept="2NXPZ9" id="6uZAbUKexTO" role="N3F5h">
-      <property role="TrG5h" value="empty_1364212442086_9" />
-    </node>
     <node concept="1S7NMz" id="6uZAbUKexTR" role="N3F5h">
       <property role="TrG5h" value="M2x" />
       <property role="2OOxQR" value="false" />
@@ -364,7 +307,7 @@
     </node>
     <node concept="1S7NMz" id="6uZAbUKexTU" role="N3F5h">
       <property role="TrG5h" value="M2y" />
-      <property role="2OOxQR" value="true" />
+      <property role="2OOxQR" value="false" />
       <node concept="26Vqqz" id="6uZAbUKexTV" role="2C2TGm">
         <property role="2caQfQ" value="false" />
         <property role="2c7vTL" value="false" />
@@ -377,6 +320,7 @@
       <property role="TrG5h" value="empty_1364212442558_11" />
     </node>
     <node concept="3GEVxB" id="17fjvcLFTT9" role="2OODSX">
+      <property role="3GEa6x" value="true" />
       <ref role="3GEb4d" node="6uZAbUKeCcu" resolve="M3" />
     </node>
   </node>
@@ -439,9 +383,6 @@
     <node concept="2NXPZ9" id="6uZAbUKf2lb" role="N3F5h">
       <property role="TrG5h" value="empty_1364212442558_11" />
     </node>
-    <node concept="3GEVxB" id="17fjvcLFTTV" role="2OODSX">
-      <ref role="3GEb4d" node="6uZAbUKexSE" resolve="M1" />
-    </node>
   </node>
   <node concept="2v9HqL" id="4ifG318a7qu">
     <node concept="2xfidK" id="2nospmWkMyC" role="2AWWZH">
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/graph.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/graph.mps
index 38adc399679..e82a165e3c4 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/graph.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/graph.mps
@@ -2371,15 +2371,23 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="3fqX7Q" id="3NZq_n0Jl15" role="MpTkK">
-                            <node concept="2OqwBi" id="3NZq_n0Jl3H" role="3fr31v">
-                              <node concept="37vLTw" id="3NZq_n0Jl2k" role="2Oq$k0">
+                          <node concept="1Wc70l" id="1Nl0v8EPWL7" role="MpTkK">
+                            <node concept="3y3z36" id="1Nl0v8EPWOg" role="3uHU7B">
+                              <node concept="10Nm6u" id="1Nl0v8EPWPx" role="3uHU7w" />
+                              <node concept="37vLTw" id="1Nl0v8EPWMP" role="3uHU7B">
                                 <ref role="3cqZAo" node="3NZq_n0JkPo" resolve="targetNode" />
                               </node>
-                              <node concept="liA8E" id="3NZq_n0Jl8r" role="2OqNvi">
-                                <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
-                                <node concept="37vLTw" id="3NZq_n0Jlag" role="37wK5m">
-                                  <ref role="3cqZAo" node="3NZq_n0ImwG" resolve="currentNode" />
+                            </node>
+                            <node concept="3fqX7Q" id="3NZq_n0Jl15" role="3uHU7w">
+                              <node concept="2OqwBi" id="3NZq_n0Jl3H" role="3fr31v">
+                                <node concept="37vLTw" id="3NZq_n0Jl2k" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="3NZq_n0JkPo" resolve="targetNode" />
+                                </node>
+                                <node concept="liA8E" id="3NZq_n0Jl8r" role="2OqNvi">
+                                  <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
+                                  <node concept="37vLTw" id="3NZq_n0Jlag" role="37wK5m">
+                                    <ref role="3cqZAo" node="3NZq_n0ImwG" resolve="currentNode" />
+                                  </node>
                                 </node>
                               </node>
                             </node>

From c22d98a57173959209b8b29f214c849b7b870747 Mon Sep 17 00:00:00 2001
From: Tamas Szabo <tamas.szabo@itemis.de>
Date: Thu, 28 Jan 2016 14:31:27 +0100
Subject: [PATCH 4/4] early exit SCC lookup and enhanced cycle detection

---
 .../languageModels/behavior.mps               |   80 +-
 .../languageModels/typesystem.mps             |    9 +-
 .../languageModels/behavior.mps               |   24 +-
 .../languageModels/typesystem.mps             |   94 --
 .../test.ts.core/models/tests1@tests.mps      |   29 +-
 .../com/mbeddr/mpsutil/common/graph.mps       | 1412 ++++++++++-------
 6 files changed, 945 insertions(+), 703 deletions(-)

diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/behavior.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/behavior.mps
index 6036d493bfd..989e3b4a4a8 100755
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/behavior.mps
@@ -16937,6 +16937,20 @@
         </node>
       </node>
     </node>
+    <node concept="13i0hz" id="2G8yZXxNStd" role="13h7CS">
+      <property role="13i0iv" value="false" />
+      <property role="13i0it" value="true" />
+      <property role="TrG5h" value="getErrorMessageForElementInCycle" />
+      <node concept="3Tm1VV" id="2G8yZXxNSte" role="1B3o_S" />
+      <node concept="3clFbS" id="2G8yZXxNStf" role="3clF47">
+        <node concept="3cpWs6" id="2G8yZXxNSFQ" role="3cqZAp">
+          <node concept="Xl_RD" id="17fjvcLFfFr" role="3cqZAk">
+            <property role="Xl_RC" value="Involved in cyclic dependency!" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="2G8yZXxNSFN" role="3clF45" />
+    </node>
     <node concept="13i0hz" id="59HbAIOYtvQ" role="13h7CS">
       <property role="TrG5h" value="isInvolvedInCycle" />
       <node concept="3Tm1VV" id="59HbAIOYtvR" role="1B3o_S" />
@@ -17212,56 +17226,20 @@
             </node>
           </node>
         </node>
-        <node concept="3cpWs8" id="4ISByPoWhY0" role="3cqZAp">
-          <node concept="3cpWsn" id="4ISByPoWhY1" role="3cpWs9">
-            <property role="TrG5h" value="sccs" />
-            <node concept="2hMVRd" id="4ISByPoWhXR" role="1tU5fm">
-              <node concept="2hMVRd" id="4ISByPoWhXY" role="2hN53Y">
-                <node concept="3Tqbb2" id="4ISByPoWhXZ" role="2hN53Y">
-                  <ref role="ehGHo" to="vs0r:59HbAIOYkEn" resolve="IDetectCycle" />
-                </node>
-              </node>
-            </node>
-            <node concept="2YIFZM" id="4ISByPoWhY2" role="33vP2m">
-              <ref role="1Pybhc" to="gtp9:59VTJR_XXJb" resolve="GraphUtil" />
-              <ref role="37wK5l" to="gtp9:4kDlJ5bgbgK" resolve="computeSCC" />
-              <node concept="37vLTw" id="4ISByPoWhY3" role="37wK5m">
-                <ref role="3cqZAo" node="4ISByPoWhTf" resolve="graph" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="4ISByPoWqWy" role="3cqZAp">
-          <node concept="3cpWsn" id="4ISByPoWqWz" role="3cpWs9">
+        <node concept="3cpWs8" id="2G8yZXxK829" role="3cqZAp">
+          <node concept="3cpWsn" id="2G8yZXxK82a" role="3cpWs9">
             <property role="TrG5h" value="result" />
-            <node concept="2hMVRd" id="4ISByPoWqWq" role="1tU5fm">
-              <node concept="3Tqbb2" id="4ISByPoWqWt" role="2hN53Y">
+            <node concept="2hMVRd" id="2G8yZXxK825" role="1tU5fm">
+              <node concept="3Tqbb2" id="2G8yZXxK828" role="2hN53Y">
                 <ref role="ehGHo" to="vs0r:59HbAIOYkEn" resolve="IDetectCycle" />
               </node>
             </node>
-            <node concept="2OqwBi" id="4ISByPoWqW$" role="33vP2m">
-              <node concept="37vLTw" id="4ISByPoWqW_" role="2Oq$k0">
-                <ref role="3cqZAo" node="4ISByPoWhY1" resolve="sccs" />
-              </node>
-              <node concept="1z4cxt" id="4ISByPoWqWA" role="2OqNvi">
-                <node concept="1bVj0M" id="4ISByPoWqWB" role="23t8la">
-                  <node concept="3clFbS" id="4ISByPoWqWC" role="1bW5cS">
-                    <node concept="3clFbF" id="4ISByPoWqWD" role="3cqZAp">
-                      <node concept="2OqwBi" id="4ISByPoWqWE" role="3clFbG">
-                        <node concept="37vLTw" id="4ISByPoWqWF" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4ISByPoWqWI" resolve="it" />
-                        </node>
-                        <node concept="3JPx81" id="4ISByPoWqWG" role="2OqNvi">
-                          <node concept="13iPFW" id="4ISByPoWqWH" role="25WWJ7" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="Rh6nW" id="4ISByPoWqWI" role="1bW2Oz">
-                    <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="4ISByPoWqWJ" role="1tU5fm" />
-                  </node>
-                </node>
+            <node concept="2YIFZM" id="2G8yZXxK82b" role="33vP2m">
+              <ref role="37wK5l" to="gtp9:2G8yZXxJf6X" resolve="computeSCCSingle" />
+              <ref role="1Pybhc" to="gtp9:59VTJR_XXJb" resolve="GraphUtil" />
+              <node concept="13iPFW" id="2G8yZXxK82c" role="37wK5m" />
+              <node concept="37vLTw" id="2G8yZXxK82d" role="37wK5m">
+                <ref role="3cqZAo" node="4ISByPoWhTf" resolve="graph" />
               </node>
             </node>
           </node>
@@ -17270,7 +17248,7 @@
           <node concept="3y3z36" id="4ISByPoWs1t" role="1gVkn0">
             <node concept="10Nm6u" id="4ISByPoWs1Y" role="3uHU7w" />
             <node concept="37vLTw" id="4ISByPoWrNO" role="3uHU7B">
-              <ref role="3cqZAo" node="4ISByPoWqWz" resolve="result" />
+              <ref role="3cqZAo" node="2G8yZXxK82a" resolve="result" />
             </node>
           </node>
         </node>
@@ -17279,7 +17257,7 @@
           <node concept="3clFbS" id="4ISByPp632P" role="3clFbx">
             <node concept="3cpWs6" id="4ISByPp64qv" role="3cqZAp">
               <node concept="37vLTw" id="4ISByPp64qT" role="3cqZAk">
-                <ref role="3cqZAo" node="4ISByPoWqWz" resolve="result" />
+                <ref role="3cqZAo" node="2G8yZXxK82a" resolve="result" />
               </node>
             </node>
           </node>
@@ -17289,7 +17267,7 @@
             </node>
             <node concept="2OqwBi" id="4ISByPp63pb" role="3uHU7B">
               <node concept="37vLTw" id="4ISByPp63bC" role="2Oq$k0">
-                <ref role="3cqZAo" node="4ISByPoWqWz" resolve="result" />
+                <ref role="3cqZAo" node="2G8yZXxK82a" resolve="result" />
               </node>
               <node concept="34oBXx" id="4ISByPp63YC" role="2OqNvi" />
             </node>
@@ -17314,7 +17292,7 @@
                 <node concept="3clFbC" id="4ISByPp65W6" role="3uHU7B">
                   <node concept="2OqwBi" id="4ISByPp64WT" role="3uHU7B">
                     <node concept="37vLTw" id="4ISByPp64Je" role="2Oq$k0">
-                      <ref role="3cqZAo" node="4ISByPoWqWz" resolve="result" />
+                      <ref role="3cqZAo" node="2G8yZXxK82a" resolve="result" />
                     </node>
                     <node concept="34oBXx" id="4ISByPp65yu" role="2OqNvi" />
                   </node>
@@ -17344,7 +17322,7 @@
               </node>
               <node concept="3cpWs6" id="4ISByPp67dV" role="3cqZAp">
                 <node concept="37vLTw" id="4ISByPp67es" role="3cqZAk">
-                  <ref role="3cqZAo" node="4ISByPoWqWz" resolve="result" />
+                  <ref role="3cqZAo" node="2G8yZXxK82a" resolve="result" />
                 </node>
               </node>
             </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/typesystem.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/typesystem.mps
index 1574508d4de..b72ac5ec514 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.base/languageModels/typesystem.mps
@@ -2163,8 +2163,13 @@
                     </node>
                     <node concept="3clFbS" id="4ISByPoZ7Gr" role="2LFqv$">
                       <node concept="2MkqsV" id="17fjvcLFfFc" role="3cqZAp">
-                        <node concept="Xl_RD" id="17fjvcLFfFr" role="2MkJ7o">
-                          <property role="Xl_RC" value="Involved in cyclic dependency!" />
+                        <node concept="2OqwBi" id="2G8yZXxNY_o" role="2MkJ7o">
+                          <node concept="1YBJjd" id="2G8yZXxNYya" role="2Oq$k0">
+                            <ref role="1YBMHb" node="59HbAIOYAw1" resolve="source" />
+                          </node>
+                          <node concept="2qgKlT" id="2G8yZXxNYJK" role="2OqNvi">
+                            <ref role="37wK5l" to="hwgx:2G8yZXxNStd" resolve="getErrorMessageForElementInCycle" />
+                          </node>
                         </node>
                         <node concept="2GrUjf" id="4ISByPoZ7HO" role="2OEOjV">
                           <ref role="2Gs0qQ" node="4ISByPoZ7Gp" resolve="element" />
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/behavior.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/behavior.mps
index 3a15b3398ff..c8ff4f9d275 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/behavior.mps
@@ -4124,8 +4124,13 @@
                       <ref role="3cqZAo" node="4ISByPp7zSr" resolve="result" />
                     </node>
                     <node concept="TSZUe" id="4ISByPp7$JW" role="2OqNvi">
-                      <node concept="2GrUjf" id="4ISByPp7$P4" role="25WWJ7">
-                        <ref role="2Gs0qQ" node="4ISByPp7tfO" resolve="member" />
+                      <node concept="2OqwBi" id="2G8yZXxNX$T" role="25WWJ7">
+                        <node concept="2GrUjf" id="4ISByPp7$P4" role="2Oq$k0">
+                          <ref role="2Gs0qQ" node="4ISByPp7tfO" resolve="member" />
+                        </node>
+                        <node concept="3TrEf2" id="2G8yZXxNY5Z" role="2OqNvi">
+                          <ref role="3Tt5mk" to="mj1l:hEaDaGor64" />
+                        </node>
                       </node>
                     </node>
                   </node>
@@ -4174,6 +4179,21 @@
         <node concept="3Tqbb2" id="4ISByPp7qQK" role="2hN53Y" />
       </node>
     </node>
+    <node concept="13i0hz" id="2G8yZXxNWlk" role="13h7CS">
+      <property role="13i0iv" value="false" />
+      <property role="13i0it" value="false" />
+      <property role="TrG5h" value="getErrorMessageForElementInCycle" />
+      <ref role="13i0hy" to="hwgx:2G8yZXxNStd" resolve="getErrorMessageForElementInCycle" />
+      <node concept="3Tm1VV" id="2G8yZXxNWll" role="1B3o_S" />
+      <node concept="3clFbS" id="2G8yZXxNWlq" role="3clF47">
+        <node concept="3cpWs6" id="2G8yZXxNXfd" role="3cqZAp">
+          <node concept="Xl_RD" id="2G8yZXxNXh1" role="3cqZAk">
+            <property role="Xl_RC" value="Cyclic dependency makes this type incomplete!" />
+          </node>
+        </node>
+      </node>
+      <node concept="17QB3L" id="2G8yZXxNWlr" role="3clF45" />
+    </node>
     <node concept="13hLZK" id="6a5SBPfZs1y" role="13h7CW">
       <node concept="3clFbS" id="6a5SBPfZs1z" role="2VODD2" />
     </node>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/typesystem.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/typesystem.mps
index d6b0b0e5208..d5719f96ae2 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/typesystem.mps
@@ -316,7 +316,6 @@
       <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
-      <concept id="1204980550705" name="jetbrains.mps.baseLanguage.collections.structure.VisitAllOperation" flags="nn" index="2es0OD" />
       <concept id="1151688443754" name="jetbrains.mps.baseLanguage.collections.structure.ListType" flags="in" index="_YKpA">
         <child id="1151688676805" name="elementType" index="_ZDj9" />
       </concept>
@@ -2324,99 +2323,6 @@
       <ref role="1YaFvo" to="clbe:6a5SBPfXGBP" resolve="SUDeclaration" />
     </node>
   </node>
-  <node concept="18kY7G" id="59HbAIOWhug">
-    <property role="TrG5h" value="check_StructDeclaration" />
-    <property role="3GE5qa" value="su.struct" />
-    <node concept="3clFbS" id="59HbAIOWhuh" role="18ibNy">
-      <node concept="3clFbF" id="59HbAIOWiGX" role="3cqZAp">
-        <node concept="2OqwBi" id="59HbAIOWRMi" role="3clFbG">
-          <node concept="2OqwBi" id="59HbAIOWlm4" role="2Oq$k0">
-            <node concept="2OqwBi" id="59HbAIOWiM$" role="2Oq$k0">
-              <node concept="1YBJjd" id="59HbAIOWiGW" role="2Oq$k0">
-                <ref role="1YBMHb" node="59HbAIOWhuj" resolve="sd" />
-              </node>
-              <node concept="2qgKlT" id="59HbAIOWjKa" role="2OqNvi">
-                <ref role="37wK5l" to="2rho:7TdHRrCpjWZ" resolve="membersIncludingTransparent" />
-              </node>
-            </node>
-            <node concept="3zZkjj" id="59HbAIOWvJw" role="2OqNvi">
-              <node concept="1bVj0M" id="59HbAIOWvJy" role="23t8la">
-                <node concept="3clFbS" id="59HbAIOWvJz" role="1bW5cS">
-                  <node concept="3clFbF" id="59HbAIOWwbb" role="3cqZAp">
-                    <node concept="1Wc70l" id="59HbAIOWAX0" role="3clFbG">
-                      <node concept="3clFbC" id="59HbAIOWQ6f" role="3uHU7w">
-                        <node concept="1YBJjd" id="59HbAIOWR62" role="3uHU7w">
-                          <ref role="1YBMHb" node="59HbAIOWhuj" resolve="sd" />
-                        </node>
-                        <node concept="2OqwBi" id="59HbAIOWHQE" role="3uHU7B">
-                          <node concept="1PxgMI" id="59HbAIOWGSb" role="2Oq$k0">
-                            <ref role="1PxNhF" to="clbe:5yYXyc4Z0CS" resolve="StructType" />
-                            <node concept="2OqwBi" id="59HbAIOWBSF" role="1PxMeX">
-                              <node concept="37vLTw" id="59HbAIOWBlX" role="2Oq$k0">
-                                <ref role="3cqZAo" node="59HbAIOWvJ$" resolve="it" />
-                              </node>
-                              <node concept="3JvlWi" id="59HbAIOWF81" role="2OqNvi" />
-                            </node>
-                          </node>
-                          <node concept="2qgKlT" id="59HbAIOWPuo" role="2OqNvi">
-                            <ref role="37wK5l" to="2rho:3bHYGwztGSo" resolve="getSUDeclaration" />
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="2OqwBi" id="59HbAIOW_pQ" role="3uHU7B">
-                        <node concept="2OqwBi" id="59HbAIOWwvn" role="2Oq$k0">
-                          <node concept="37vLTw" id="59HbAIOWwba" role="2Oq$k0">
-                            <ref role="3cqZAo" node="59HbAIOWvJ$" resolve="it" />
-                          </node>
-                          <node concept="3JvlWi" id="59HbAIOWz$S" role="2OqNvi" />
-                        </node>
-                        <node concept="1mIQ4w" id="59HbAIOW_YT" role="2OqNvi">
-                          <node concept="chp4Y" id="59HbAIOWApJ" role="cj9EA">
-                            <ref role="cht4Q" to="clbe:5yYXyc4Z0CS" resolve="StructType" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="Rh6nW" id="59HbAIOWvJ$" role="1bW2Oz">
-                  <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="59HbAIOWvJ_" role="1tU5fm" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2es0OD" id="59HbAIOWTDM" role="2OqNvi">
-            <node concept="1bVj0M" id="59HbAIOWTDO" role="23t8la">
-              <node concept="3clFbS" id="59HbAIOWTDP" role="1bW5cS">
-                <node concept="2MkqsV" id="59HbAIOWUfU" role="3cqZAp">
-                  <node concept="Xl_RD" id="59HbAIOWUJy" role="2MkJ7o">
-                    <property role="Xl_RC" value="struct cannot contain itself (only as a pointer)" />
-                  </node>
-                  <node concept="2OqwBi" id="59HbAIOX15q" role="2OEOjV">
-                    <node concept="37vLTw" id="59HbAIOX0nO" role="2Oq$k0">
-                      <ref role="3cqZAo" node="59HbAIOWTDQ" resolve="it" />
-                    </node>
-                    <node concept="3TrEf2" id="59HbAIOX4t8" role="2OqNvi">
-                      <ref role="3Tt5mk" to="mj1l:hEaDaGor64" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="Rh6nW" id="59HbAIOWTDQ" role="1bW2Oz">
-                <property role="TrG5h" value="it" />
-                <node concept="2jxLKc" id="59HbAIOWTDR" role="1tU5fm" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1YaCAy" id="59HbAIOWhuj" role="1YuTPh">
-      <property role="TrG5h" value="sd" />
-      <ref role="1YaFvo" to="clbe:5yYXyc4Z0CJ" resolve="StructDeclaration" />
-    </node>
-  </node>
   <node concept="1YbPZF" id="3qdsM6yQr4m">
     <property role="TrG5h" value="typeof_ArbitraryMemeberRef" />
     <property role="3GE5qa" value="su" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ts.core/models/tests1@tests.mps b/code/languages/com.mbeddr.core/tests/test.ts.core/models/tests1@tests.mps
index 81e5e374581..21c81408ce7 100644
--- a/code/languages/com.mbeddr.core/tests/test.ts.core/models/tests1@tests.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ts.core/models/tests1@tests.mps
@@ -3099,11 +3099,7 @@
               <property role="2c7vTL" value="false" />
               <ref role="1sgJKq" node="59HbAIOWeRM" resolve="recursive" />
               <node concept="7CXmI" id="59HbAIOXlQy" role="lGtFl">
-                <node concept="1TM$A" id="1zouAvzWN6p" role="7EUXB">
-                  <node concept="2PYRI3" id="1zouAvzWN6q" role="3lydEf">
-                    <ref role="39XzEq" to="fvu6:59HbAIOWUfU" />
-                  </node>
-                </node>
+                <node concept="1TM$A" id="1zouAvzWN6p" role="7EUXB" />
               </node>
             </node>
           </node>
@@ -3119,13 +3115,6 @@
               </node>
             </node>
           </node>
-          <node concept="7CXmI" id="59HbAIP7vKX" role="lGtFl">
-            <node concept="1TM$A" id="1zouAvzRYIW" role="7EUXB">
-              <node concept="2PYRI3" id="1zouAvzRYIX" role="3lydEf">
-                <ref role="39XzEq" to="9zoj:59HbAIOYAV$" />
-              </node>
-            </node>
-          </node>
         </node>
         <node concept="2NXPZ9" id="59HbAIOVXTZ" role="N3F5h">
           <property role="TrG5h" value="empty_1397467096947_2" />
@@ -3138,12 +3127,8 @@
               <property role="2caQfQ" value="false" />
               <property role="2c7vTL" value="false" />
               <ref role="1sgJKq" node="59HbAIOY4sV" resolve="cyclicStructs2" />
-            </node>
-          </node>
-          <node concept="7CXmI" id="59HbAIP7vKG" role="lGtFl">
-            <node concept="1TM$A" id="1zouAvzUTFN" role="7EUXB">
-              <node concept="2PYRI3" id="1zouAvzUTFO" role="3lydEf">
-                <ref role="39XzEq" to="9zoj:59HbAIOYAV$" />
+              <node concept="7CXmI" id="2G8yZXxP4lH" role="lGtFl">
+                <node concept="1TM$A" id="2G8yZXxP4lI" role="7EUXB" />
               </node>
             </node>
           </node>
@@ -3159,12 +3144,8 @@
               <property role="2caQfQ" value="false" />
               <property role="2c7vTL" value="false" />
               <ref role="1sgJKq" node="59HbAIOY4p_" resolve="cyclicStructs1" />
-            </node>
-          </node>
-          <node concept="7CXmI" id="59HbAIP7vMo" role="lGtFl">
-            <node concept="1TM$A" id="1zouAvzWsXU" role="7EUXB">
-              <node concept="2PYRI3" id="1zouAvzWsXV" role="3lydEf">
-                <ref role="39XzEq" to="9zoj:59HbAIOYAV$" />
+              <node concept="7CXmI" id="2G8yZXxP4mG" role="lGtFl">
+                <node concept="1TM$A" id="2G8yZXxP4mH" role="7EUXB" />
               </node>
             </node>
           </node>
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/graph.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/graph.mps
index e82a165e3c4..e436be15ef2 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/graph.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/graph.mps
@@ -24,6 +24,7 @@
         <child id="1068498886297" name="rValue" index="37vLTx" />
         <child id="1068498886295" name="lValue" index="37vLTJ" />
       </concept>
+      <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="ng" index="2tJIrI" />
       <concept id="1076505808687" name="jetbrains.mps.baseLanguage.structure.WhileStatement" flags="nn" index="2$JKZl">
@@ -143,6 +144,9 @@
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
+      <concept id="1160998861373" name="jetbrains.mps.baseLanguage.structure.AssertStatement" flags="nn" index="1gVbGN">
+        <child id="1160998896846" name="condition" index="1gVkn0" />
+      </concept>
       <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
@@ -179,12 +183,33 @@
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
+    <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
+        <child id="1199569906740" name="parameter" index="1bW2Oz" />
+        <child id="1199569916463" name="body" index="1bW5cS" />
+      </concept>
+    </language>
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
+      <concept id="5858074156537516430" name="jetbrains.mps.baseLanguage.javadoc.structure.ReturnBlockDocTag" flags="ng" index="x79VA">
+        <property id="5858074156537516431" name="text" index="x79VB" />
+      </concept>
       <concept id="6832197706140896242" name="jetbrains.mps.baseLanguage.javadoc.structure.FieldDocComment" flags="ng" index="z59LJ" />
+      <concept id="6832197706140518104" name="jetbrains.mps.baseLanguage.javadoc.structure.DocMethodParameterReference" flags="ng" index="zr_55" />
+      <concept id="6832197706140518107" name="jetbrains.mps.baseLanguage.javadoc.structure.DocTypeParameterReference" flags="ng" index="zr_56" />
+      <concept id="6832197706140518103" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseParameterReference" flags="ng" index="zr_5a">
+        <reference id="6832197706140518108" name="param" index="zr_51" />
+      </concept>
       <concept id="5349172909345501395" name="jetbrains.mps.baseLanguage.javadoc.structure.BaseDocComment" flags="ng" index="P$AiS">
         <child id="8465538089690331502" name="body" index="TZ5H$" />
       </concept>
-      <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv" />
+      <concept id="5349172909345532724" name="jetbrains.mps.baseLanguage.javadoc.structure.MethodDocComment" flags="ng" index="P$JXv">
+        <child id="5858074156537516440" name="return" index="x79VK" />
+        <child id="8465538089690917625" name="param" index="TUOzN" />
+      </concept>
+      <concept id="8465538089690881930" name="jetbrains.mps.baseLanguage.javadoc.structure.ParameterBlockDocTag" flags="ng" index="TUZQ0">
+        <property id="8465538089690881934" name="text" index="TUZQ4" />
+        <child id="6832197706140518123" name="parameter" index="zr_5Q" />
+      </concept>
       <concept id="8465538089690331500" name="jetbrains.mps.baseLanguage.javadoc.structure.CommentLine" flags="ng" index="TZ5HA">
         <child id="8970989240999019149" name="part" index="1dT_Ay" />
       </concept>
@@ -202,6 +227,9 @@
       </concept>
     </language>
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
+      <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
+        <child id="1204796294226" name="closure" index="23t8la" />
+      </concept>
       <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
         <child id="540871147943773366" name="argument" index="25WWJ7" />
       </concept>
@@ -219,6 +247,7 @@
       </concept>
       <concept id="3358009230508699637" name="jetbrains.mps.baseLanguage.collections.structure.PopOperation" flags="nn" index="2AryhJ" />
       <concept id="3358009230508699932" name="jetbrains.mps.baseLanguage.collections.structure.PushOperation" flags="nn" index="2ArzE6" />
+      <concept id="1226934395923" name="jetbrains.mps.baseLanguage.collections.structure.ClearSetOperation" flags="nn" index="2EZike" />
       <concept id="1153943597977" name="jetbrains.mps.baseLanguage.collections.structure.ForEachStatement" flags="nn" index="2Gpval">
         <child id="1153944400369" name="variable" index="2Gsz3X" />
         <child id="1153944424730" name="inputSequence" index="2GsD0m" />
@@ -236,7 +265,11 @@
       <concept id="1201306600024" name="jetbrains.mps.baseLanguage.collections.structure.ContainsKeyOperation" flags="nn" index="2Nt0df">
         <child id="1201654602639" name="key" index="38cxEo" />
       </concept>
+      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
+      <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
+      <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
+      <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1167380149909" name="jetbrains.mps.baseLanguage.collections.structure.RemoveElementOperation" flags="nn" index="3dhRuq" />
       <concept id="1201872418428" name="jetbrains.mps.baseLanguage.collections.structure.GetKeysOperation" flags="nn" index="3lbrtF" />
       <concept id="1197683403723" name="jetbrains.mps.baseLanguage.collections.structure.MapType" flags="in" index="3rvAFt">
@@ -247,7 +280,9 @@
         <child id="1197687026896" name="keyType" index="3rHrn6" />
         <child id="1197687035757" name="valueType" index="3rHtpV" />
       </concept>
+      <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
+      <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
       <concept id="9042586985346099698" name="jetbrains.mps.baseLanguage.collections.structure.MultiForEachStatement" flags="nn" index="1_o_46">
         <child id="9042586985346099734" name="forEach" index="1_o_by" />
       </concept>
@@ -1517,570 +1552,823 @@
   </node>
   <node concept="312cEu" id="59VTJR_XXJb">
     <property role="TrG5h" value="GraphUtil" />
+    <node concept="2tJIrI" id="2G8yZXxJd$_" role="jymVt" />
     <node concept="2YIFZL" id="4kDlJ5bgbgK" role="jymVt">
       <property role="TrG5h" value="computeSCC" />
       <property role="od$2w" value="false" />
       <property role="DiZV1" value="false" />
       <node concept="3clFbS" id="4kDlJ5bgbgN" role="3clF47">
-        <node concept="3cpWs8" id="4kDlJ5bgeaI" role="3cqZAp">
-          <node concept="3cpWsn" id="4kDlJ5bgeaL" role="3cpWs9">
+        <node concept="3cpWs6" id="2G8yZXxJO4z" role="3cqZAp">
+          <node concept="1rXfSq" id="2G8yZXxJO5N" role="3cqZAk">
+            <ref role="37wK5l" node="2G8yZXxJhYU" resolve="computeSCC0" />
+            <node concept="10Nm6u" id="2G8yZXxJO7s" role="37wK5m" />
+            <node concept="37vLTw" id="2G8yZXxJO9L" role="37wK5m">
+              <ref role="3cqZAo" node="4kDlJ5bgbhI" resolve="graph" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="4kDlJ5bgbez" role="1B3o_S" />
+      <node concept="2hMVRd" id="4kDlJ5bgbeN" role="3clF45">
+        <node concept="2hMVRd" id="4kDlJ5bgbeV" role="2hN53Y">
+          <node concept="16syzq" id="4kDlJ5bgt36" role="2hN53Y">
+            <ref role="16sUi3" node="4kDlJ5bgbhr" resolve="T" />
+          </node>
+        </node>
+      </node>
+      <node concept="16euLQ" id="4kDlJ5bgbhr" role="16eVyc">
+        <property role="TrG5h" value="T" />
+      </node>
+      <node concept="37vLTG" id="4kDlJ5bgbhI" role="3clF46">
+        <property role="TrG5h" value="graph" />
+        <node concept="3uibUv" id="4kDlJ5bgbhH" role="1tU5fm">
+          <ref role="3uigEE" node="9NO9Tq8VKe" resolve="Graph" />
+          <node concept="16syzq" id="4kDlJ5bgsVq" role="11_B2D">
+            <ref role="16sUi3" node="4kDlJ5bgbhr" resolve="T" />
+          </node>
+        </node>
+      </node>
+      <node concept="P$JXv" id="2G8yZXxJdMs" role="lGtFl">
+        <node concept="TZ5HA" id="2G8yZXxJdMt" role="TZ5H$">
+          <node concept="1dT_AC" id="2G8yZXxJdMu" role="1dT_Ay">
+            <property role="1dT_AB" value="Computes the strongly connected components of the given graph." />
+          </node>
+        </node>
+        <node concept="TUZQ0" id="2G8yZXxJdMv" role="TUOzN">
+          <property role="TUZQ4" value="the graph" />
+          <node concept="zr_55" id="2G8yZXxJdMx" role="zr_5Q">
+            <ref role="zr_51" node="4kDlJ5bgbhI" resolve="graph" />
+          </node>
+        </node>
+        <node concept="TUZQ0" id="2G8yZXxJdMy" role="TUOzN">
+          <property role="TUZQ4" value="the type paramter of the nodes in the graph" />
+          <node concept="zr_56" id="2G8yZXxJdM$" role="zr_5Q">
+            <ref role="zr_51" node="4kDlJ5bgbhr" resolve="T" />
+          </node>
+        </node>
+        <node concept="x79VA" id="2G8yZXxJdM_" role="x79VK">
+          <property role="x79VB" value="the SCCs as sets of set of nodes" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2G8yZXxJeLw" role="jymVt" />
+    <node concept="2YIFZL" id="2G8yZXxJf6X" role="jymVt">
+      <property role="TrG5h" value="computeSCCSingle" />
+      <property role="od$2w" value="false" />
+      <property role="DiZV1" value="false" />
+      <property role="2aFKle" value="false" />
+      <node concept="3clFbS" id="2G8yZXxJf70" role="3clF47">
+        <node concept="3cpWs8" id="2G8yZXxJOlx" role="3cqZAp">
+          <node concept="3cpWsn" id="2G8yZXxJOly" role="3cpWs9">
+            <property role="TrG5h" value="sccs" />
+            <node concept="2hMVRd" id="2G8yZXxJOle" role="1tU5fm">
+              <node concept="2hMVRd" id="2G8yZXxJOll" role="2hN53Y">
+                <node concept="16syzq" id="2G8yZXxJOlm" role="2hN53Y">
+                  <ref role="16sUi3" node="2G8yZXxJfe_" resolve="T" />
+                </node>
+              </node>
+            </node>
+            <node concept="1rXfSq" id="2G8yZXxJOlz" role="33vP2m">
+              <ref role="37wK5l" node="2G8yZXxJhYU" resolve="computeSCC0" />
+              <node concept="37vLTw" id="2G8yZXxJOl$" role="37wK5m">
+                <ref role="3cqZAo" node="2G8yZXxJffp" resolve="sought" />
+              </node>
+              <node concept="37vLTw" id="2G8yZXxJOl_" role="37wK5m">
+                <ref role="3cqZAo" node="2G8yZXxJfeJ" resolve="graph" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1gVbGN" id="2G8yZXxJOt9" role="3cqZAp">
+          <node concept="1Wc70l" id="2G8yZXxJP1_" role="1gVkn0">
+            <node concept="2OqwBi" id="2G8yZXxJPGL" role="3uHU7w">
+              <node concept="2OqwBi" id="2G8yZXxJPca" role="2Oq$k0">
+                <node concept="37vLTw" id="2G8yZXxJP3A" role="2Oq$k0">
+                  <ref role="3cqZAo" node="2G8yZXxJOly" resolve="sccs" />
+                </node>
+                <node concept="1uHKPH" id="2G8yZXxJPty" role="2OqNvi" />
+              </node>
+              <node concept="3JPx81" id="2G8yZXxJPWQ" role="2OqNvi">
+                <node concept="37vLTw" id="2G8yZXxJQ0u" role="25WWJ7">
+                  <ref role="3cqZAo" node="2G8yZXxJffp" resolve="sought" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbC" id="2G8yZXxJOVu" role="3uHU7B">
+              <node concept="2OqwBi" id="2G8yZXxJOAD" role="3uHU7B">
+                <node concept="37vLTw" id="2G8yZXxJOvw" role="2Oq$k0">
+                  <ref role="3cqZAo" node="2G8yZXxJOly" resolve="sccs" />
+                </node>
+                <node concept="34oBXx" id="2G8yZXxJOIT" role="2OqNvi" />
+              </node>
+              <node concept="3cmrfG" id="2G8yZXxJOXb" role="3uHU7w">
+                <property role="3cmrfH" value="1" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="2G8yZXxJQ9R" role="3cqZAp">
+          <node concept="2OqwBi" id="2G8yZXxJQqx" role="3cqZAk">
+            <node concept="37vLTw" id="2G8yZXxJQfV" role="2Oq$k0">
+              <ref role="3cqZAo" node="2G8yZXxJOly" resolve="sccs" />
+            </node>
+            <node concept="1uHKPH" id="2G8yZXxJRc9" role="2OqNvi" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="2G8yZXxJeZD" role="1B3o_S" />
+      <node concept="2hMVRd" id="2G8yZXxJf6T" role="3clF45">
+        <node concept="16syzq" id="2G8yZXxJfeB" role="2hN53Y">
+          <ref role="16sUi3" node="2G8yZXxJfe_" resolve="T" />
+        </node>
+      </node>
+      <node concept="16euLQ" id="2G8yZXxJfe_" role="16eVyc">
+        <property role="TrG5h" value="T" />
+      </node>
+      <node concept="37vLTG" id="2G8yZXxJffp" role="3clF46">
+        <property role="TrG5h" value="sought" />
+        <node concept="16syzq" id="2G8yZXxJffL" role="1tU5fm">
+          <ref role="16sUi3" node="2G8yZXxJfe_" resolve="T" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="2G8yZXxJfeJ" role="3clF46">
+        <property role="TrG5h" value="graph" />
+        <node concept="3uibUv" id="2G8yZXxJfeI" role="1tU5fm">
+          <ref role="3uigEE" node="9NO9Tq8VKe" resolve="Graph" />
+          <node concept="16syzq" id="2G8yZXxJfeW" role="11_B2D">
+            <ref role="16sUi3" node="2G8yZXxJfe_" resolve="T" />
+          </node>
+        </node>
+      </node>
+      <node concept="P$JXv" id="2G8yZXxJRj9" role="lGtFl">
+        <node concept="TZ5HA" id="2G8yZXxJRja" role="TZ5H$">
+          <node concept="1dT_AC" id="2G8yZXxJRjb" role="1dT_Ay">
+            <property role="1dT_AB" value="Returns the set of nodes in the strongly connected component that the sought node is in. " />
+          </node>
+        </node>
+        <node concept="TUZQ0" id="2G8yZXxJRjc" role="TUOzN">
+          <property role="TUZQ4" value="the sought node" />
+          <node concept="zr_55" id="2G8yZXxJRje" role="zr_5Q">
+            <ref role="zr_51" node="2G8yZXxJffp" resolve="sought" />
+          </node>
+        </node>
+        <node concept="TUZQ0" id="2G8yZXxJRjf" role="TUOzN">
+          <property role="TUZQ4" value="the graph" />
+          <node concept="zr_55" id="2G8yZXxJRjh" role="zr_5Q">
+            <ref role="zr_51" node="2G8yZXxJfeJ" resolve="graph" />
+          </node>
+        </node>
+        <node concept="TUZQ0" id="2G8yZXxJRji" role="TUOzN">
+          <property role="TUZQ4" value="the type parameter of the nodes in the graph" />
+          <node concept="zr_56" id="2G8yZXxJRjk" role="zr_5Q">
+            <ref role="zr_51" node="2G8yZXxJfe_" resolve="T" />
+          </node>
+        </node>
+        <node concept="x79VA" id="2G8yZXxJRjl" role="x79VK">
+          <property role="x79VB" value="the SCC of the sought node" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2G8yZXxJhjL" role="jymVt" />
+    <node concept="2YIFZL" id="2G8yZXxJhYU" role="jymVt">
+      <property role="TrG5h" value="computeSCC0" />
+      <property role="od$2w" value="false" />
+      <property role="DiZV1" value="false" />
+      <property role="2aFKle" value="false" />
+      <node concept="3clFbS" id="2G8yZXxJhYX" role="3clF47">
+        <node concept="3cpWs8" id="2G8yZXxJifk" role="3cqZAp">
+          <node concept="3cpWsn" id="2G8yZXxJifl" role="3cpWs9">
             <property role="TrG5h" value="index" />
-            <node concept="10Oyi0" id="4kDlJ5bgeaG" role="1tU5fm" />
-            <node concept="3cmrfG" id="4kDlJ5bgedO" role="33vP2m">
+            <node concept="10Oyi0" id="2G8yZXxJifm" role="1tU5fm" />
+            <node concept="3cmrfG" id="2G8yZXxJifn" role="33vP2m">
               <property role="3cmrfH" value="0" />
             </node>
           </node>
         </node>
-        <node concept="3cpWs8" id="4kDlJ5bgefM" role="3cqZAp">
-          <node concept="3cpWsn" id="4kDlJ5bgefP" role="3cpWs9">
+        <node concept="3cpWs8" id="2G8yZXxJifo" role="3cqZAp">
+          <node concept="3cpWsn" id="2G8yZXxJifp" role="3cpWs9">
             <property role="TrG5h" value="result" />
-            <node concept="2hMVRd" id="4kDlJ5bgefI" role="1tU5fm">
-              <node concept="2hMVRd" id="4kDlJ5bgehe" role="2hN53Y">
-                <node concept="16syzq" id="4kDlJ5bgtd0" role="2hN53Y">
-                  <ref role="16sUi3" node="4kDlJ5bgbhr" resolve="T" />
+            <node concept="2hMVRd" id="2G8yZXxJifq" role="1tU5fm">
+              <node concept="2hMVRd" id="2G8yZXxJifr" role="2hN53Y">
+                <node concept="16syzq" id="2G8yZXxJifs" role="2hN53Y">
+                  <ref role="16sUi3" node="2G8yZXxJidG" resolve="T" />
                 </node>
               </node>
             </node>
-            <node concept="2ShNRf" id="4kDlJ5bgepo" role="33vP2m">
-              <node concept="2i4dXS" id="4kDlJ5bgg1k" role="2ShVmc">
-                <node concept="2hMVRd" id="4kDlJ5bgg8h" role="HW$YZ">
-                  <node concept="16syzq" id="4kDlJ5bgths" role="2hN53Y">
-                    <ref role="16sUi3" node="4kDlJ5bgbhr" resolve="T" />
+            <node concept="2ShNRf" id="2G8yZXxJift" role="33vP2m">
+              <node concept="2i4dXS" id="2G8yZXxJifu" role="2ShVmc">
+                <node concept="2hMVRd" id="2G8yZXxJifv" role="HW$YZ">
+                  <node concept="16syzq" id="2G8yZXxJifw" role="2hN53Y">
+                    <ref role="16sUi3" node="2G8yZXxJidG" resolve="T" />
                   </node>
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="3cpWs8" id="4kDlJ5bggoP" role="3cqZAp">
-          <node concept="3cpWsn" id="4kDlJ5bggoS" role="3cpWs9">
+        <node concept="3cpWs8" id="2G8yZXxJifx" role="3cqZAp">
+          <node concept="3cpWsn" id="2G8yZXxJify" role="3cpWs9">
             <property role="TrG5h" value="nodeMap" />
-            <node concept="3rvAFt" id="4kDlJ5bggoJ" role="1tU5fm">
-              <node concept="3uibUv" id="59VTJR_ZXMo" role="3rvSg0">
+            <node concept="3rvAFt" id="2G8yZXxJifz" role="1tU5fm">
+              <node concept="3uibUv" id="2G8yZXxJif$" role="3rvSg0">
                 <ref role="3uigEE" node="59VTJR_ZT1i" resolve="SCCProperty" />
               </node>
-              <node concept="16syzq" id="4kDlJ5bguN0" role="3rvQeY">
-                <ref role="16sUi3" node="4kDlJ5bgbhr" resolve="T" />
+              <node concept="16syzq" id="2G8yZXxJif_" role="3rvQeY">
+                <ref role="16sUi3" node="2G8yZXxJidG" resolve="T" />
               </node>
             </node>
-            <node concept="2ShNRf" id="4kDlJ5bggwX" role="33vP2m">
-              <node concept="3rGOSV" id="4kDlJ5bgg_V" role="2ShVmc">
-                <node concept="3uibUv" id="59VTJR_ZYtt" role="3rHtpV">
+            <node concept="2ShNRf" id="2G8yZXxJifA" role="33vP2m">
+              <node concept="3rGOSV" id="2G8yZXxJifB" role="2ShVmc">
+                <node concept="3uibUv" id="2G8yZXxJifC" role="3rHtpV">
                   <ref role="3uigEE" node="59VTJR_ZT1i" resolve="SCCProperty" />
                 </node>
-                <node concept="16syzq" id="4kDlJ5bgtrh" role="3rHrn6">
-                  <ref role="16sUi3" node="4kDlJ5bgbhr" resolve="T" />
+                <node concept="16syzq" id="2G8yZXxJifD" role="3rHrn6">
+                  <ref role="16sUi3" node="2G8yZXxJidG" resolve="T" />
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="3cpWs8" id="4kDlJ5bglct" role="3cqZAp">
-          <node concept="3cpWsn" id="4kDlJ5bglcw" role="3cpWs9">
+        <node concept="3cpWs8" id="2G8yZXxJifE" role="3cqZAp">
+          <node concept="3cpWsn" id="2G8yZXxJifF" role="3cpWs9">
             <property role="TrG5h" value="targetNodeMap" />
-            <node concept="3rvAFt" id="4kDlJ5bglcn" role="1tU5fm">
-              <node concept="_YKpA" id="4kDlJ5bglmz" role="3rvSg0">
-                <node concept="16syzq" id="4kDlJ5bgvtR" role="_ZDj9">
-                  <ref role="16sUi3" node="4kDlJ5bgbhr" resolve="T" />
+            <node concept="3rvAFt" id="2G8yZXxJifG" role="1tU5fm">
+              <node concept="_YKpA" id="2G8yZXxJifH" role="3rvSg0">
+                <node concept="16syzq" id="2G8yZXxJifI" role="_ZDj9">
+                  <ref role="16sUi3" node="2G8yZXxJidG" resolve="T" />
                 </node>
               </node>
-              <node concept="16syzq" id="4kDlJ5bgv1P" role="3rvQeY">
-                <ref role="16sUi3" node="4kDlJ5bgbhr" resolve="T" />
+              <node concept="16syzq" id="2G8yZXxJifJ" role="3rvQeY">
+                <ref role="16sUi3" node="2G8yZXxJidG" resolve="T" />
               </node>
             </node>
-            <node concept="2ShNRf" id="4kDlJ5bglyP" role="33vP2m">
-              <node concept="3rGOSV" id="4kDlJ5bglFh" role="2ShVmc">
-                <node concept="_YKpA" id="4kDlJ5bgmzp" role="3rHtpV">
-                  <node concept="16syzq" id="4kDlJ5bgugY" role="_ZDj9">
-                    <ref role="16sUi3" node="4kDlJ5bgbhr" resolve="T" />
+            <node concept="2ShNRf" id="2G8yZXxJifK" role="33vP2m">
+              <node concept="3rGOSV" id="2G8yZXxJifL" role="2ShVmc">
+                <node concept="_YKpA" id="2G8yZXxJifM" role="3rHtpV">
+                  <node concept="16syzq" id="2G8yZXxJifN" role="_ZDj9">
+                    <ref role="16sUi3" node="2G8yZXxJidG" resolve="T" />
                   </node>
                 </node>
-                <node concept="16syzq" id="4kDlJ5bgtOk" role="3rHrn6">
-                  <ref role="16sUi3" node="4kDlJ5bgbhr" resolve="T" />
+                <node concept="16syzq" id="2G8yZXxJifO" role="3rHrn6">
+                  <ref role="16sUi3" node="2G8yZXxJidG" resolve="T" />
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="3cpWs8" id="4kDlJ5bgnLh" role="3cqZAp">
-          <node concept="3cpWsn" id="4kDlJ5bgnLk" role="3cpWs9">
+        <node concept="3cpWs8" id="2G8yZXxJifP" role="3cqZAp">
+          <node concept="3cpWsn" id="2G8yZXxJifQ" role="3cpWs9">
             <property role="TrG5h" value="notVisitedMap" />
-            <node concept="3rvAFt" id="4kDlJ5bgnLb" role="1tU5fm">
-              <node concept="2hMVRd" id="4kDlJ5bgo0g" role="3rvSg0">
-                <node concept="16syzq" id="4kDlJ5bgvx0" role="2hN53Y">
-                  <ref role="16sUi3" node="4kDlJ5bgbhr" resolve="T" />
+            <node concept="3rvAFt" id="2G8yZXxJifR" role="1tU5fm">
+              <node concept="2hMVRd" id="2G8yZXxJifS" role="3rvSg0">
+                <node concept="16syzq" id="2G8yZXxJifT" role="2hN53Y">
+                  <ref role="16sUi3" node="2G8yZXxJidG" resolve="T" />
                 </node>
               </node>
-              <node concept="16syzq" id="4kDlJ5bgvgd" role="3rvQeY">
-                <ref role="16sUi3" node="4kDlJ5bgbhr" resolve="T" />
+              <node concept="16syzq" id="2G8yZXxJifU" role="3rvQeY">
+                <ref role="16sUi3" node="2G8yZXxJidG" resolve="T" />
               </node>
             </node>
-            <node concept="2ShNRf" id="4kDlJ5bgvAu" role="33vP2m">
-              <node concept="3rGOSV" id="4kDlJ5bgvGf" role="2ShVmc">
-                <node concept="16syzq" id="4kDlJ5bgvYP" role="3rHrn6">
-                  <ref role="16sUi3" node="4kDlJ5bgbhr" resolve="T" />
+            <node concept="2ShNRf" id="2G8yZXxJifV" role="33vP2m">
+              <node concept="3rGOSV" id="2G8yZXxJifW" role="2ShVmc">
+                <node concept="16syzq" id="2G8yZXxJifX" role="3rHrn6">
+                  <ref role="16sUi3" node="2G8yZXxJidG" resolve="T" />
                 </node>
-                <node concept="2hMVRd" id="4kDlJ5bgw8j" role="3rHtpV">
-                  <node concept="16syzq" id="4kDlJ5bgwkD" role="2hN53Y">
-                    <ref role="16sUi3" node="4kDlJ5bgbhr" resolve="T" />
+                <node concept="2hMVRd" id="2G8yZXxJifY" role="3rHtpV">
+                  <node concept="16syzq" id="2G8yZXxJifZ" role="2hN53Y">
+                    <ref role="16sUi3" node="2G8yZXxJidG" resolve="T" />
                   </node>
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="4kDlJ5bgnAj" role="3cqZAp" />
-        <node concept="3SKdUt" id="3NZq_n0JDDr" role="3cqZAp">
-          <node concept="3SKdUq" id="3NZq_n0JFGU" role="3SKWNk">
+        <node concept="3clFbH" id="2G8yZXxJig0" role="3cqZAp" />
+        <node concept="3SKdUt" id="2G8yZXxJig1" role="3cqZAp">
+          <node concept="3SKdUq" id="2G8yZXxJig2" role="3SKWNk">
             <property role="3SKdUp" value="the nodeStack will be used to keep track of the nodes, instead of using recursive calls" />
           </node>
         </node>
-        <node concept="3cpWs8" id="3NZq_n0HgEj" role="3cqZAp">
-          <node concept="3cpWsn" id="3NZq_n0HgEm" role="3cpWs9">
+        <node concept="3cpWs8" id="2G8yZXxJig3" role="3cqZAp">
+          <node concept="3cpWsn" id="2G8yZXxJig4" role="3cpWs9">
             <property role="TrG5h" value="nodeStack" />
-            <node concept="oyxx6" id="3NZq_n0HgEf" role="1tU5fm">
-              <node concept="16syzq" id="3NZq_n0HgOc" role="3O5elw">
-                <ref role="16sUi3" node="4kDlJ5bgbhr" resolve="T" />
+            <node concept="oyxx6" id="2G8yZXxJig5" role="1tU5fm">
+              <node concept="16syzq" id="2G8yZXxJig6" role="3O5elw">
+                <ref role="16sUi3" node="2G8yZXxJidG" resolve="T" />
               </node>
             </node>
-            <node concept="2ShNRf" id="3NZq_n0HgRT" role="33vP2m">
-              <node concept="2Jqq0_" id="3NZq_n0HiNm" role="2ShVmc">
-                <node concept="16syzq" id="3NZq_n0Hj1N" role="HW$YZ">
-                  <ref role="16sUi3" node="4kDlJ5bgbhr" resolve="T" />
+            <node concept="2ShNRf" id="2G8yZXxJig7" role="33vP2m">
+              <node concept="2Jqq0_" id="2G8yZXxJig8" role="2ShVmc">
+                <node concept="16syzq" id="2G8yZXxJig9" role="HW$YZ">
+                  <ref role="16sUi3" node="2G8yZXxJidG" resolve="T" />
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="3SKdUt" id="3NZq_n0JI_1" role="3cqZAp">
-          <node concept="3SKdUq" id="3NZq_n0JKN6" role="3SKWNk">
+        <node concept="3SKdUt" id="2G8yZXxJiga" role="3cqZAp">
+          <node concept="3SKdUq" id="2G8yZXxJigb" role="3SKWNk">
             <property role="3SKdUp" value="the scc stack stores the nodes which will be committed to an SCC (there can be nodes from multiple SCCs" />
           </node>
         </node>
-        <node concept="3SKdUt" id="3NZq_n0JNS5" role="3cqZAp">
-          <node concept="3SKdUq" id="3NZq_n0JQ56" role="3SKWNk">
+        <node concept="3SKdUt" id="2G8yZXxJigc" role="3cqZAp">
+          <node concept="3SKdUq" id="2G8yZXxJigd" role="3SKWNk">
             <property role="3SKdUp" value="in the stack at the same time)" />
           </node>
         </node>
-        <node concept="3cpWs8" id="3NZq_n0Hjg3" role="3cqZAp">
-          <node concept="3cpWsn" id="3NZq_n0Hjg6" role="3cpWs9">
+        <node concept="3cpWs8" id="2G8yZXxJige" role="3cqZAp">
+          <node concept="3cpWsn" id="2G8yZXxJigf" role="3cpWs9">
             <property role="TrG5h" value="sccStack" />
-            <node concept="oyxx6" id="3NZq_n0HjfZ" role="1tU5fm">
-              <node concept="16syzq" id="3NZq_n0Hjs5" role="3O5elw">
-                <ref role="16sUi3" node="4kDlJ5bgbhr" resolve="T" />
+            <node concept="oyxx6" id="2G8yZXxJigg" role="1tU5fm">
+              <node concept="16syzq" id="2G8yZXxJigh" role="3O5elw">
+                <ref role="16sUi3" node="2G8yZXxJidG" resolve="T" />
               </node>
             </node>
-            <node concept="2ShNRf" id="3NZq_n0HjyE" role="33vP2m">
-              <node concept="2Jqq0_" id="3NZq_n0HjDF" role="2ShVmc">
-                <node concept="16syzq" id="3NZq_n0HjS8" role="HW$YZ">
-                  <ref role="16sUi3" node="4kDlJ5bgbhr" resolve="T" />
+            <node concept="2ShNRf" id="2G8yZXxJigi" role="33vP2m">
+              <node concept="2Jqq0_" id="2G8yZXxJigj" role="2ShVmc">
+                <node concept="16syzq" id="2G8yZXxJigk" role="HW$YZ">
+                  <ref role="16sUi3" node="2G8yZXxJidG" resolve="T" />
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="3NZq_n0Hgw$" role="3cqZAp" />
-        <node concept="3cpWs8" id="3NZq_n0HkjU" role="3cqZAp">
-          <node concept="3cpWsn" id="3NZq_n0HkjX" role="3cpWs9">
+        <node concept="3clFbH" id="2G8yZXxJigl" role="3cqZAp" />
+        <node concept="3cpWs8" id="2G8yZXxJigm" role="3cqZAp">
+          <node concept="3cpWsn" id="2G8yZXxJign" role="3cpWs9">
             <property role="TrG5h" value="sink" />
-            <node concept="10P_77" id="3NZq_n0HkjS" role="1tU5fm" />
-            <node concept="3clFbT" id="3NZq_n0Hkze" role="33vP2m">
+            <node concept="10P_77" id="2G8yZXxJigo" role="1tU5fm" />
+            <node concept="3clFbT" id="2G8yZXxJigp" role="33vP2m">
               <property role="3clFbU" value="false" />
             </node>
           </node>
         </node>
-        <node concept="3cpWs8" id="3NZq_n0HkZ7" role="3cqZAp">
-          <node concept="3cpWsn" id="3NZq_n0HkZa" role="3cpWs9">
+        <node concept="3cpWs8" id="2G8yZXxJigq" role="3cqZAp">
+          <node concept="3cpWsn" id="2G8yZXxJigr" role="3cpWs9">
             <property role="TrG5h" value="finishedTraversal" />
-            <node concept="10P_77" id="3NZq_n0HkZ5" role="1tU5fm" />
-            <node concept="3clFbT" id="3NZq_n0Hlif" role="33vP2m">
+            <node concept="10P_77" id="2G8yZXxJigs" role="1tU5fm" />
+            <node concept="3clFbT" id="2G8yZXxJigt" role="33vP2m">
               <property role="3clFbU" value="true" />
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="3NZq_n0Hlj3" role="3cqZAp" />
-        <node concept="2Gpval" id="3NZq_n0I0ok" role="3cqZAp">
-          <node concept="2GrKxI" id="3NZq_n0I0om" role="2Gsz3X">
-            <property role="TrG5h" value="node" />
+        <node concept="3clFbH" id="2G8yZXxJigu" role="3cqZAp" />
+        <node concept="3SKdUt" id="2G8yZXxJEQZ" role="3cqZAp">
+          <node concept="3SKdUq" id="2G8yZXxJER1" role="3SKWNk">
+            <property role="3SKdUp" value="add the sought node to the very beginning of the list if it is not null" />
           </node>
-          <node concept="2OqwBi" id="3NZq_n0I0Ca" role="2GsD0m">
-            <node concept="37vLTw" id="3NZq_n0I0AC" role="2Oq$k0">
-              <ref role="3cqZAo" node="4kDlJ5bgbhI" resolve="graph" />
+        </node>
+        <node concept="3cpWs8" id="2G8yZXxJyl_" role="3cqZAp">
+          <node concept="3cpWsn" id="2G8yZXxJylC" role="3cpWs9">
+            <property role="TrG5h" value="allNodes" />
+            <node concept="_YKpA" id="2G8yZXxJylx" role="1tU5fm">
+              <node concept="16syzq" id="2G8yZXxJzhd" role="_ZDj9">
+                <ref role="16sUi3" node="2G8yZXxJidG" resolve="T" />
+              </node>
+            </node>
+            <node concept="2ShNRf" id="2G8yZXxJzlX" role="33vP2m">
+              <node concept="Tc6Ow" id="2G8yZXxJzl1" role="2ShVmc">
+                <node concept="16syzq" id="2G8yZXxJzl2" role="HW$YZ">
+                  <ref role="16sUi3" node="2G8yZXxJidG" resolve="T" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="2G8yZXxJGN3" role="3cqZAp">
+          <node concept="3clFbS" id="2G8yZXxJGN5" role="3clFbx">
+            <node concept="3clFbF" id="2G8yZXxJ$as" role="3cqZAp">
+              <node concept="2OqwBi" id="2G8yZXxJ$YZ" role="3clFbG">
+                <node concept="37vLTw" id="2G8yZXxJ$aq" role="2Oq$k0">
+                  <ref role="3cqZAo" node="2G8yZXxJylC" resolve="allNodes" />
+                </node>
+                <node concept="TSZUe" id="2G8yZXxJ_mt" role="2OqNvi">
+                  <node concept="37vLTw" id="2G8yZXxJ_o8" role="25WWJ7">
+                    <ref role="3cqZAo" node="2G8yZXxJiey" resolve="sought" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3y3z36" id="2G8yZXxJHMb" role="3clFbw">
+            <node concept="10Nm6u" id="2G8yZXxJHWN" role="3uHU7w" />
+            <node concept="37vLTw" id="2G8yZXxJHBr" role="3uHU7B">
+              <ref role="3cqZAo" node="2G8yZXxJiey" resolve="sought" />
             </node>
-            <node concept="liA8E" id="3NZq_n0I0PA" role="2OqNvi">
-              <ref role="37wK5l" node="9NO9Tq8VPO" resolve="getAllNodes" />
+          </node>
+        </node>
+        <node concept="3clFbF" id="2G8yZXxJAix" role="3cqZAp">
+          <node concept="2OqwBi" id="2G8yZXxJBiR" role="3clFbG">
+            <node concept="37vLTw" id="2G8yZXxJAiv" role="2Oq$k0">
+              <ref role="3cqZAo" node="2G8yZXxJylC" resolve="allNodes" />
             </node>
+            <node concept="X8dFx" id="2G8yZXxJWg_" role="2OqNvi">
+              <node concept="2OqwBi" id="2G8yZXxJBXy" role="25WWJ7">
+                <node concept="2OqwBi" id="2G8yZXxJBM9" role="2Oq$k0">
+                  <node concept="37vLTw" id="2G8yZXxJBKk" role="2Oq$k0">
+                    <ref role="3cqZAo" node="2G8yZXxJie3" resolve="graph" />
+                  </node>
+                  <node concept="liA8E" id="2G8yZXxJBSg" role="2OqNvi">
+                    <ref role="37wK5l" node="9NO9Tq8VPO" resolve="getAllNodes" />
+                  </node>
+                </node>
+                <node concept="3zZkjj" id="2G8yZXxJC6A" role="2OqNvi">
+                  <node concept="1bVj0M" id="2G8yZXxJC6C" role="23t8la">
+                    <node concept="3clFbS" id="2G8yZXxJC6D" role="1bW5cS">
+                      <node concept="3clFbF" id="2G8yZXxJCaU" role="3cqZAp">
+                        <node concept="3y3z36" id="2G8yZXxJCff" role="3clFbG">
+                          <node concept="37vLTw" id="2G8yZXxJCke" role="3uHU7w">
+                            <ref role="3cqZAo" node="2G8yZXxJiey" resolve="sought" />
+                          </node>
+                          <node concept="37vLTw" id="2G8yZXxJCaT" role="3uHU7B">
+                            <ref role="3cqZAo" node="2G8yZXxJC6E" resolve="it" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="Rh6nW" id="2G8yZXxJC6E" role="1bW2Oz">
+                      <property role="TrG5h" value="it" />
+                      <node concept="2jxLKc" id="2G8yZXxJC6F" role="1tU5fm" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="2G8yZXxJxnE" role="3cqZAp" />
+        <node concept="2Gpval" id="2G8yZXxJigv" role="3cqZAp">
+          <node concept="2GrKxI" id="2G8yZXxJigw" role="2Gsz3X">
+            <property role="TrG5h" value="node" />
           </node>
-          <node concept="3clFbS" id="3NZq_n0I0oq" role="2LFqv$">
-            <node concept="3clFbF" id="3NZq_n0I0Tp" role="3cqZAp">
-              <node concept="37vLTI" id="3NZq_n0I16f" role="3clFbG">
-                <node concept="2ShNRf" id="3NZq_n0I1bf" role="37vLTx">
-                  <node concept="1pGfFk" id="3NZq_n0I1m3" role="2ShVmc">
+          <node concept="37vLTw" id="2G8yZXxJDB$" role="2GsD0m">
+            <ref role="3cqZAo" node="2G8yZXxJylC" resolve="allNodes" />
+          </node>
+          <node concept="3clFbS" id="2G8yZXxJig$" role="2LFqv$">
+            <node concept="3clFbF" id="2G8yZXxJig_" role="3cqZAp">
+              <node concept="37vLTI" id="2G8yZXxJigA" role="3clFbG">
+                <node concept="2ShNRf" id="2G8yZXxJigB" role="37vLTx">
+                  <node concept="1pGfFk" id="2G8yZXxJigC" role="2ShVmc">
                     <ref role="37wK5l" node="4kDlJ5bgbYP" resolve="SCCProperty" />
-                    <node concept="3cmrfG" id="3NZq_n0I1qL" role="37wK5m">
+                    <node concept="3cmrfG" id="2G8yZXxJigD" role="37wK5m">
                       <property role="3cmrfH" value="0" />
                     </node>
-                    <node concept="3cmrfG" id="3NZq_n0I1T8" role="37wK5m">
+                    <node concept="3cmrfG" id="2G8yZXxJigE" role="37wK5m">
                       <property role="3cmrfH" value="0" />
                     </node>
                   </node>
                 </node>
-                <node concept="3EllGN" id="3NZq_n0I12g" role="37vLTJ">
-                  <node concept="2GrUjf" id="3NZq_n0I13X" role="3ElVtu">
-                    <ref role="2Gs0qQ" node="3NZq_n0I0om" resolve="node" />
+                <node concept="3EllGN" id="2G8yZXxJigF" role="37vLTJ">
+                  <node concept="2GrUjf" id="2G8yZXxJigG" role="3ElVtu">
+                    <ref role="2Gs0qQ" node="2G8yZXxJigw" resolve="node" />
                   </node>
-                  <node concept="37vLTw" id="3NZq_n0I0To" role="3ElQJh">
-                    <ref role="3cqZAo" node="4kDlJ5bggoS" resolve="nodeMap" />
+                  <node concept="37vLTw" id="2G8yZXxJigH" role="3ElQJh">
+                    <ref role="3cqZAo" node="2G8yZXxJify" resolve="nodeMap" />
                   </node>
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="3NZq_n0I1Yb" role="3cqZAp" />
-        <node concept="1_o_46" id="3NZq_n0I2uh" role="3cqZAp">
-          <node concept="1_o_bx" id="3NZq_n0I2uj" role="1_o_by">
-            <node concept="1_o_bG" id="3NZq_n0I2ul" role="1_o_aQ">
+        <node concept="3clFbH" id="2G8yZXxJigI" role="3cqZAp" />
+        <node concept="1_o_46" id="2G8yZXxJigJ" role="3cqZAp">
+          <node concept="1_o_bx" id="2G8yZXxJigK" role="1_o_by">
+            <node concept="1_o_bG" id="2G8yZXxJigL" role="1_o_aQ">
               <property role="TrG5h" value="node" />
             </node>
-            <node concept="2OqwBi" id="3NZq_n0I2LS" role="1_o_bz">
-              <node concept="37vLTw" id="3NZq_n0I2Ky" role="2Oq$k0">
-                <ref role="3cqZAo" node="4kDlJ5bgbhI" resolve="graph" />
-              </node>
-              <node concept="liA8E" id="3NZq_n0I2ZN" role="2OqNvi">
-                <ref role="37wK5l" node="9NO9Tq8VPO" resolve="getAllNodes" />
-              </node>
+            <node concept="37vLTw" id="2G8yZXxJDWb" role="1_o_bz">
+              <ref role="3cqZAo" node="2G8yZXxJylC" resolve="allNodes" />
             </node>
           </node>
-          <node concept="3clFbS" id="3NZq_n0I2up" role="2LFqv$">
-            <node concept="3SKdUt" id="3NZq_n0I4q_" role="3cqZAp">
-              <node concept="3SKdUq" id="3NZq_n0I4yO" role="3SKWNk">
+          <node concept="3clFbS" id="2G8yZXxJigP" role="2LFqv$">
+            <node concept="3SKdUt" id="2G8yZXxJigQ" role="3cqZAp">
+              <node concept="3SKdUq" id="2G8yZXxJigR" role="3SKWNk">
                 <property role="3SKdUp" value="if we haven't already visited the node" />
               </node>
             </node>
-            <node concept="3clFbJ" id="3NZq_n0I33l" role="3cqZAp">
-              <node concept="3clFbS" id="3NZq_n0I33m" role="3clFbx">
-                <node concept="3clFbF" id="3NZq_n0Ih3x" role="3cqZAp">
-                  <node concept="2OqwBi" id="3NZq_n0IhLQ" role="3clFbG">
-                    <node concept="37vLTw" id="3NZq_n0Ih3w" role="2Oq$k0">
-                      <ref role="3cqZAo" node="3NZq_n0HgEm" resolve="nodeStack" />
+            <node concept="3clFbJ" id="2G8yZXxJigS" role="3cqZAp">
+              <node concept="3clFbS" id="2G8yZXxJigT" role="3clFbx">
+                <node concept="3clFbF" id="2G8yZXxJigU" role="3cqZAp">
+                  <node concept="2OqwBi" id="2G8yZXxJigV" role="3clFbG">
+                    <node concept="37vLTw" id="2G8yZXxJigW" role="2Oq$k0">
+                      <ref role="3cqZAo" node="2G8yZXxJig4" resolve="nodeStack" />
                     </node>
-                    <node concept="2ArzE6" id="3NZq_n0Iigf" role="2OqNvi">
-                      <node concept="3M$PaV" id="3NZq_n0IiiD" role="25WWJ7">
-                        <ref role="3M$S_o" node="3NZq_n0I2ul" resolve="node" />
+                    <node concept="2ArzE6" id="2G8yZXxJigX" role="2OqNvi">
+                      <node concept="3M$PaV" id="2G8yZXxJigY" role="25WWJ7">
+                        <ref role="3M$S_o" node="2G8yZXxJigL" resolve="node" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="3clFbH" id="3NZq_n0Iilb" role="3cqZAp" />
-                <node concept="3SKdUt" id="3NZq_n0Ij4E" role="3cqZAp">
-                  <node concept="3SKdUq" id="3NZq_n0IjN7" role="3SKWNk">
+                <node concept="3clFbH" id="2G8yZXxJigZ" role="3cqZAp" />
+                <node concept="3SKdUt" id="2G8yZXxJih0" role="3cqZAp">
+                  <node concept="3SKdUq" id="2G8yZXxJih1" role="3SKWNk">
                     <property role="3SKdUp" value="perform the DFS like traversal" />
                   </node>
                 </node>
-                <node concept="2$JKZl" id="3NZq_n0IkGM" role="3cqZAp">
-                  <node concept="3clFbS" id="3NZq_n0IkGO" role="2LFqv$">
-                    <node concept="3cpWs8" id="3NZq_n0ImwD" role="3cqZAp">
-                      <node concept="3cpWsn" id="3NZq_n0ImwG" role="3cpWs9">
+                <node concept="2$JKZl" id="2G8yZXxJih2" role="3cqZAp">
+                  <node concept="3clFbS" id="2G8yZXxJih3" role="2LFqv$">
+                    <node concept="3cpWs8" id="2G8yZXxJih4" role="3cqZAp">
+                      <node concept="3cpWsn" id="2G8yZXxJih5" role="3cpWs9">
                         <property role="TrG5h" value="currentNode" />
-                        <node concept="16syzq" id="3NZq_n0ImwC" role="1tU5fm">
-                          <ref role="16sUi3" node="4kDlJ5bgbhr" resolve="T" />
+                        <node concept="16syzq" id="2G8yZXxJih6" role="1tU5fm">
+                          <ref role="16sUi3" node="2G8yZXxJidG" resolve="T" />
                         </node>
-                        <node concept="2OqwBi" id="3NZq_n0ImYs" role="33vP2m">
-                          <node concept="37vLTw" id="3NZq_n0ImCM" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3NZq_n0HgEm" resolve="nodeStack" />
+                        <node concept="2OqwBi" id="2G8yZXxJih7" role="33vP2m">
+                          <node concept="37vLTw" id="2G8yZXxJih8" role="2Oq$k0">
+                            <ref role="3cqZAo" node="2G8yZXxJig4" resolve="nodeStack" />
                           </node>
-                          <node concept="2oR75g" id="3NZq_n0InHE" role="2OqNvi" />
+                          <node concept="2oR75g" id="2G8yZXxJih9" role="2OqNvi" />
                         </node>
                       </node>
                     </node>
-                    <node concept="3clFbF" id="3NZq_n0InME" role="3cqZAp">
-                      <node concept="37vLTI" id="3NZq_n0InU5" role="3clFbG">
-                        <node concept="3clFbT" id="3NZq_n0InV2" role="37vLTx">
+                    <node concept="3clFbF" id="2G8yZXxJiha" role="3cqZAp">
+                      <node concept="37vLTI" id="2G8yZXxJihb" role="3clFbG">
+                        <node concept="3clFbT" id="2G8yZXxJihc" role="37vLTx">
                           <property role="3clFbU" value="false" />
                         </node>
-                        <node concept="37vLTw" id="3NZq_n0InMD" role="37vLTJ">
-                          <ref role="3cqZAo" node="3NZq_n0HkjX" resolve="sink" />
+                        <node concept="37vLTw" id="2G8yZXxJihd" role="37vLTJ">
+                          <ref role="3cqZAo" node="2G8yZXxJign" resolve="sink" />
                         </node>
                       </node>
                     </node>
-                    <node concept="3clFbF" id="3NZq_n0Io9m" role="3cqZAp">
-                      <node concept="37vLTI" id="3NZq_n0IogI" role="3clFbG">
-                        <node concept="3clFbT" id="3NZq_n0Iohj" role="37vLTx">
+                    <node concept="3clFbF" id="2G8yZXxJihe" role="3cqZAp">
+                      <node concept="37vLTI" id="2G8yZXxJihf" role="3clFbG">
+                        <node concept="3clFbT" id="2G8yZXxJihg" role="37vLTx">
                           <property role="3clFbU" value="false" />
                         </node>
-                        <node concept="37vLTw" id="3NZq_n0Io9l" role="37vLTJ">
-                          <ref role="3cqZAo" node="3NZq_n0HkZa" resolve="finishedTraversal" />
+                        <node concept="37vLTw" id="2G8yZXxJihh" role="37vLTJ">
+                          <ref role="3cqZAo" node="2G8yZXxJigr" resolve="finishedTraversal" />
                         </node>
                       </node>
                     </node>
-                    <node concept="3cpWs8" id="3NZq_n0Ionx" role="3cqZAp">
-                      <node concept="3cpWsn" id="3NZq_n0Iony" role="3cpWs9">
+                    <node concept="3cpWs8" id="2G8yZXxJihi" role="3cqZAp">
+                      <node concept="3cpWsn" id="2G8yZXxJihj" role="3cpWs9">
                         <property role="TrG5h" value="prop" />
-                        <node concept="3uibUv" id="59VTJR_Y7K4" role="1tU5fm">
+                        <node concept="3uibUv" id="2G8yZXxJihk" role="1tU5fm">
                           <ref role="3uigEE" node="59VTJR_ZT1i" resolve="SCCProperty" />
                         </node>
-                        <node concept="3EllGN" id="3NZq_n0IqUY" role="33vP2m">
-                          <node concept="37vLTw" id="3NZq_n0IrC_" role="3ElVtu">
-                            <ref role="3cqZAo" node="3NZq_n0ImwG" resolve="currentNode" />
+                        <node concept="3EllGN" id="2G8yZXxJihl" role="33vP2m">
+                          <node concept="37vLTw" id="2G8yZXxJihm" role="3ElVtu">
+                            <ref role="3cqZAo" node="2G8yZXxJih5" resolve="currentNode" />
                           </node>
-                          <node concept="37vLTw" id="3NZq_n0IosG" role="3ElQJh">
-                            <ref role="3cqZAo" node="4kDlJ5bggoS" resolve="nodeMap" />
+                          <node concept="37vLTw" id="2G8yZXxJihn" role="3ElQJh">
+                            <ref role="3cqZAo" node="2G8yZXxJify" resolve="nodeMap" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="3clFbH" id="3NZq_n0Ip01" role="3cqZAp" />
-                    <node concept="3SKdUt" id="3NZq_n0IvGJ" role="3cqZAp">
-                      <node concept="3SKdUq" id="3NZq_n0IwuY" role="3SKWNk">
+                    <node concept="3clFbH" id="2G8yZXxJiho" role="3cqZAp" />
+                    <node concept="3SKdUt" id="2G8yZXxJihp" role="3cqZAp">
+                      <node concept="3SKdUq" id="2G8yZXxJihq" role="3SKWNk">
                         <property role="3SKdUp" value="if the node has not been visited" />
                       </node>
                     </node>
-                    <node concept="3clFbJ" id="3NZq_n0It4U" role="3cqZAp">
-                      <node concept="3clFbS" id="3NZq_n0It4X" role="3clFbx">
-                        <node concept="3clFbF" id="3NZq_n0I4zw" role="3cqZAp">
-                          <node concept="3uNrnE" id="3NZq_n0I4IA" role="3clFbG">
-                            <node concept="37vLTw" id="3NZq_n0I4IC" role="2$L3a6">
-                              <ref role="3cqZAo" node="4kDlJ5bgeaL" resolve="index" />
+                    <node concept="3clFbJ" id="2G8yZXxJihr" role="3cqZAp">
+                      <node concept="3clFbS" id="2G8yZXxJihs" role="3clFbx">
+                        <node concept="3clFbF" id="2G8yZXxJiht" role="3cqZAp">
+                          <node concept="3uNrnE" id="2G8yZXxJihu" role="3clFbG">
+                            <node concept="37vLTw" id="2G8yZXxJihv" role="2$L3a6">
+                              <ref role="3cqZAo" node="2G8yZXxJifl" resolve="index" />
                             </node>
                           </node>
                         </node>
-                        <node concept="3clFbF" id="3NZq_n0I4Og" role="3cqZAp">
-                          <node concept="2OqwBi" id="3NZq_n0I4Zw" role="3clFbG">
-                            <node concept="37vLTw" id="3NZq_n0I4Of" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3NZq_n0Hjg6" resolve="sccStack" />
+                        <node concept="3clFbF" id="2G8yZXxJihw" role="3cqZAp">
+                          <node concept="2OqwBi" id="2G8yZXxJihx" role="3clFbG">
+                            <node concept="37vLTw" id="2G8yZXxJihy" role="2Oq$k0">
+                              <ref role="3cqZAo" node="2G8yZXxJigf" resolve="sccStack" />
                             </node>
-                            <node concept="2ArzE6" id="3NZq_n0I5l9" role="2OqNvi">
-                              <node concept="37vLTw" id="3NZq_n0ISxX" role="25WWJ7">
-                                <ref role="3cqZAo" node="3NZq_n0ImwG" resolve="currentNode" />
+                            <node concept="2ArzE6" id="2G8yZXxJihz" role="2OqNvi">
+                              <node concept="37vLTw" id="2G8yZXxJih$" role="25WWJ7">
+                                <ref role="3cqZAo" node="2G8yZXxJih5" resolve="currentNode" />
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="3clFbF" id="59VTJRA007o" role="3cqZAp">
-                          <node concept="37vLTI" id="59VTJRA00OX" role="3clFbG">
-                            <node concept="37vLTw" id="59VTJRA00Rz" role="37vLTx">
-                              <ref role="3cqZAo" node="4kDlJ5bgeaL" resolve="index" />
+                        <node concept="3clFbF" id="2G8yZXxJih_" role="3cqZAp">
+                          <node concept="37vLTI" id="2G8yZXxJihA" role="3clFbG">
+                            <node concept="37vLTw" id="2G8yZXxJihB" role="37vLTx">
+                              <ref role="3cqZAo" node="2G8yZXxJifl" resolve="index" />
                             </node>
-                            <node concept="2OqwBi" id="59VTJRA00qh" role="37vLTJ">
-                              <node concept="3EllGN" id="59VTJRA007q" role="2Oq$k0">
-                                <node concept="37vLTw" id="59VTJRA007r" role="3ElVtu">
-                                  <ref role="3cqZAo" node="3NZq_n0ImwG" resolve="currentNode" />
+                            <node concept="2OqwBi" id="2G8yZXxJihC" role="37vLTJ">
+                              <node concept="3EllGN" id="2G8yZXxJihD" role="2Oq$k0">
+                                <node concept="37vLTw" id="2G8yZXxJihE" role="3ElVtu">
+                                  <ref role="3cqZAo" node="2G8yZXxJih5" resolve="currentNode" />
                                 </node>
-                                <node concept="37vLTw" id="59VTJRA007s" role="3ElQJh">
-                                  <ref role="3cqZAo" node="4kDlJ5bggoS" resolve="nodeMap" />
+                                <node concept="37vLTw" id="2G8yZXxJihF" role="3ElQJh">
+                                  <ref role="3cqZAo" node="2G8yZXxJify" resolve="nodeMap" />
                                 </node>
                               </node>
-                              <node concept="2OwXpG" id="59VTJRA00yg" role="2OqNvi">
+                              <node concept="2OwXpG" id="2G8yZXxJihG" role="2OqNvi">
                                 <ref role="2Oxat5" node="4kDlJ5bgbXo" resolve="index" />
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="3clFbF" id="59VTJRA00TW" role="3cqZAp">
-                          <node concept="37vLTI" id="59VTJRA00TX" role="3clFbG">
-                            <node concept="37vLTw" id="59VTJRA00TY" role="37vLTx">
-                              <ref role="3cqZAo" node="4kDlJ5bgeaL" resolve="index" />
+                        <node concept="3clFbF" id="2G8yZXxJihH" role="3cqZAp">
+                          <node concept="37vLTI" id="2G8yZXxJihI" role="3clFbG">
+                            <node concept="37vLTw" id="2G8yZXxJihJ" role="37vLTx">
+                              <ref role="3cqZAo" node="2G8yZXxJifl" resolve="index" />
                             </node>
-                            <node concept="2OqwBi" id="59VTJRA00TZ" role="37vLTJ">
-                              <node concept="3EllGN" id="59VTJRA00U0" role="2Oq$k0">
-                                <node concept="37vLTw" id="59VTJRA00U1" role="3ElVtu">
-                                  <ref role="3cqZAo" node="3NZq_n0ImwG" resolve="currentNode" />
+                            <node concept="2OqwBi" id="2G8yZXxJihK" role="37vLTJ">
+                              <node concept="3EllGN" id="2G8yZXxJihL" role="2Oq$k0">
+                                <node concept="37vLTw" id="2G8yZXxJihM" role="3ElVtu">
+                                  <ref role="3cqZAo" node="2G8yZXxJih5" resolve="currentNode" />
                                 </node>
-                                <node concept="37vLTw" id="59VTJRA00U2" role="3ElQJh">
-                                  <ref role="3cqZAo" node="4kDlJ5bggoS" resolve="nodeMap" />
+                                <node concept="37vLTw" id="2G8yZXxJihN" role="3ElQJh">
+                                  <ref role="3cqZAo" node="2G8yZXxJify" resolve="nodeMap" />
                                 </node>
                               </node>
-                              <node concept="2OwXpG" id="59VTJRA01sz" role="2OqNvi">
+                              <node concept="2OwXpG" id="2G8yZXxJihO" role="2OqNvi">
                                 <ref role="2Oxat5" node="4kDlJ5bgbY9" resolve="lowLink" />
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="3clFbF" id="3NZq_n0I7R2" role="3cqZAp">
-                          <node concept="37vLTI" id="3NZq_n0I8XK" role="3clFbG">
-                            <node concept="2ShNRf" id="3NZq_n0I9fA" role="37vLTx">
-                              <node concept="2i4dXS" id="3NZq_n0I9fn" role="2ShVmc">
-                                <node concept="16syzq" id="3NZq_n0I9fo" role="HW$YZ">
-                                  <ref role="16sUi3" node="4kDlJ5bgbhr" resolve="T" />
+                        <node concept="3clFbF" id="2G8yZXxJihP" role="3cqZAp">
+                          <node concept="37vLTI" id="2G8yZXxJihQ" role="3clFbG">
+                            <node concept="2ShNRf" id="2G8yZXxJihR" role="37vLTx">
+                              <node concept="2i4dXS" id="2G8yZXxJihS" role="2ShVmc">
+                                <node concept="16syzq" id="2G8yZXxJihT" role="HW$YZ">
+                                  <ref role="16sUi3" node="2G8yZXxJidG" resolve="T" />
                                 </node>
                               </node>
                             </node>
-                            <node concept="3EllGN" id="3NZq_n0I8BR" role="37vLTJ">
-                              <node concept="37vLTw" id="3NZq_n0IUPt" role="3ElVtu">
-                                <ref role="3cqZAo" node="3NZq_n0ImwG" resolve="currentNode" />
+                            <node concept="3EllGN" id="2G8yZXxJihU" role="37vLTJ">
+                              <node concept="37vLTw" id="2G8yZXxJihV" role="3ElVtu">
+                                <ref role="3cqZAo" node="2G8yZXxJih5" resolve="currentNode" />
                               </node>
-                              <node concept="37vLTw" id="3NZq_n0I7R1" role="3ElQJh">
-                                <ref role="3cqZAo" node="4kDlJ5bgnLk" resolve="notVisitedMap" />
+                              <node concept="37vLTw" id="2G8yZXxJihW" role="3ElQJh">
+                                <ref role="3cqZAo" node="2G8yZXxJifQ" resolve="notVisitedMap" />
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="3clFbJ" id="3NZq_n0I9Fl" role="3cqZAp">
-                          <node concept="3clFbS" id="3NZq_n0I9Fo" role="3clFbx">
-                            <node concept="3clFbF" id="3NZq_n0Ibey" role="3cqZAp">
-                              <node concept="37vLTI" id="3NZq_n0IbZ0" role="3clFbG">
-                                <node concept="2ShNRf" id="3NZq_n0Iclk" role="37vLTx">
-                                  <node concept="2Jqq0_" id="3NZq_n0Icli" role="2ShVmc">
-                                    <node concept="16syzq" id="3NZq_n0Iclj" role="HW$YZ">
-                                      <ref role="16sUi3" node="4kDlJ5bgbhr" resolve="T" />
+                        <node concept="3clFbJ" id="2G8yZXxJihX" role="3cqZAp">
+                          <node concept="3clFbS" id="2G8yZXxJihY" role="3clFbx">
+                            <node concept="3clFbF" id="2G8yZXxJihZ" role="3cqZAp">
+                              <node concept="37vLTI" id="2G8yZXxJii0" role="3clFbG">
+                                <node concept="2ShNRf" id="2G8yZXxJii1" role="37vLTx">
+                                  <node concept="2Jqq0_" id="2G8yZXxJii2" role="2ShVmc">
+                                    <node concept="16syzq" id="2G8yZXxJii3" role="HW$YZ">
+                                      <ref role="16sUi3" node="2G8yZXxJidG" resolve="T" />
                                     </node>
-                                    <node concept="2OqwBi" id="3NZq_n0IdW4" role="I$8f6">
-                                      <node concept="37vLTw" id="3NZq_n0Idzj" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="4kDlJ5bgbhI" resolve="graph" />
+                                    <node concept="2OqwBi" id="2G8yZXxJii4" role="I$8f6">
+                                      <node concept="37vLTw" id="2G8yZXxJii5" role="2Oq$k0">
+                                        <ref role="3cqZAo" node="2G8yZXxJie3" resolve="graph" />
                                       </node>
-                                      <node concept="liA8E" id="3NZq_n0If0r" role="2OqNvi">
+                                      <node concept="liA8E" id="2G8yZXxJii6" role="2OqNvi">
                                         <ref role="37wK5l" node="9NO9Tq8VOy" resolve="getTargets" />
-                                        <node concept="37vLTw" id="3NZq_n0J47h" role="37wK5m">
-                                          <ref role="3cqZAo" node="3NZq_n0ImwG" resolve="currentNode" />
+                                        <node concept="37vLTw" id="2G8yZXxJii7" role="37wK5m">
+                                          <ref role="3cqZAo" node="2G8yZXxJih5" resolve="currentNode" />
                                         </node>
                                       </node>
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="3EllGN" id="3NZq_n0IbAH" role="37vLTJ">
-                                  <node concept="37vLTw" id="3NZq_n0J3qa" role="3ElVtu">
-                                    <ref role="3cqZAo" node="3NZq_n0ImwG" resolve="currentNode" />
+                                <node concept="3EllGN" id="2G8yZXxJii8" role="37vLTJ">
+                                  <node concept="37vLTw" id="2G8yZXxJii9" role="3ElVtu">
+                                    <ref role="3cqZAo" node="2G8yZXxJih5" resolve="currentNode" />
                                   </node>
-                                  <node concept="37vLTw" id="3NZq_n0Ibex" role="3ElQJh">
-                                    <ref role="3cqZAo" node="4kDlJ5bglcw" resolve="targetNodeMap" />
+                                  <node concept="37vLTw" id="2G8yZXxJiia" role="3ElQJh">
+                                    <ref role="3cqZAo" node="2G8yZXxJifF" resolve="targetNodeMap" />
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
-                          <node concept="3y3z36" id="3NZq_n0Ia_S" role="3clFbw">
-                            <node concept="10Nm6u" id="3NZq_n0IaU7" role="3uHU7w" />
-                            <node concept="2OqwBi" id="3NZq_n0I9IZ" role="3uHU7B">
-                              <node concept="37vLTw" id="3NZq_n0I9H7" role="2Oq$k0">
-                                <ref role="3cqZAo" node="4kDlJ5bgbhI" resolve="graph" />
+                          <node concept="3y3z36" id="2G8yZXxJiib" role="3clFbw">
+                            <node concept="10Nm6u" id="2G8yZXxJiic" role="3uHU7w" />
+                            <node concept="2OqwBi" id="2G8yZXxJiid" role="3uHU7B">
+                              <node concept="37vLTw" id="2G8yZXxJiie" role="2Oq$k0">
+                                <ref role="3cqZAo" node="2G8yZXxJie3" resolve="graph" />
                               </node>
-                              <node concept="liA8E" id="3NZq_n0I9Wq" role="2OqNvi">
+                              <node concept="liA8E" id="2G8yZXxJiif" role="2OqNvi">
                                 <ref role="37wK5l" node="9NO9Tq8VOy" resolve="getTargets" />
-                                <node concept="37vLTw" id="3NZq_n0J2Gj" role="37wK5m">
-                                  <ref role="3cqZAo" node="3NZq_n0ImwG" resolve="currentNode" />
+                                <node concept="37vLTw" id="2G8yZXxJiig" role="37wK5m">
+                                  <ref role="3cqZAo" node="2G8yZXxJih5" resolve="currentNode" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="3clFbC" id="3NZq_n0IuFf" role="3clFbw">
-                        <node concept="3cmrfG" id="3NZq_n0IuXf" role="3uHU7w">
+                      <node concept="3clFbC" id="2G8yZXxJiih" role="3clFbw">
+                        <node concept="3cmrfG" id="2G8yZXxJiii" role="3uHU7w">
                           <property role="3cmrfH" value="0" />
                         </node>
-                        <node concept="2OqwBi" id="3NZq_n0Iu9G" role="3uHU7B">
-                          <node concept="3EllGN" id="3NZq_n0Iu5b" role="2Oq$k0">
-                            <node concept="37vLTw" id="3NZq_n0Iu7t" role="3ElVtu">
-                              <ref role="3cqZAo" node="3NZq_n0ImwG" resolve="currentNode" />
+                        <node concept="2OqwBi" id="2G8yZXxJiij" role="3uHU7B">
+                          <node concept="3EllGN" id="2G8yZXxJiik" role="2Oq$k0">
+                            <node concept="37vLTw" id="2G8yZXxJiil" role="3ElVtu">
+                              <ref role="3cqZAo" node="2G8yZXxJih5" resolve="currentNode" />
                             </node>
-                            <node concept="37vLTw" id="3NZq_n0ItOB" role="3ElQJh">
-                              <ref role="3cqZAo" node="4kDlJ5bggoS" resolve="nodeMap" />
+                            <node concept="37vLTw" id="2G8yZXxJiim" role="3ElQJh">
+                              <ref role="3cqZAo" node="2G8yZXxJify" resolve="nodeMap" />
                             </node>
                           </node>
-                          <node concept="2OwXpG" id="59VTJR_ZZQA" role="2OqNvi">
+                          <node concept="2OwXpG" id="2G8yZXxJiin" role="2OqNvi">
                             <ref role="2Oxat5" node="4kDlJ5bgbXo" resolve="index" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="3clFbH" id="3NZq_n0J6vi" role="3cqZAp" />
-                    <node concept="3clFbJ" id="3NZq_n0J7Ym" role="3cqZAp">
-                      <node concept="3clFbS" id="3NZq_n0J7Yp" role="3clFbx">
-                        <node concept="3clFbJ" id="3NZq_n0Jsls" role="3cqZAp">
-                          <node concept="3clFbS" id="3NZq_n0Jslv" role="3clFbx">
-                            <node concept="3SKdUt" id="3NZq_n0J_3c" role="3cqZAp">
-                              <node concept="3SKdUq" id="3NZq_n0J_3Z" role="3SKWNk">
+                    <node concept="3clFbH" id="2G8yZXxJiio" role="3cqZAp" />
+                    <node concept="3clFbJ" id="2G8yZXxJiip" role="3cqZAp">
+                      <node concept="3clFbS" id="2G8yZXxJiiq" role="3clFbx">
+                        <node concept="3clFbJ" id="2G8yZXxJiir" role="3cqZAp">
+                          <node concept="3clFbS" id="2G8yZXxJiis" role="3clFbx">
+                            <node concept="3SKdUt" id="2G8yZXxJiit" role="3cqZAp">
+                              <node concept="3SKdUq" id="2G8yZXxJiiu" role="3SKWNk">
                                 <property role="3SKdUp" value="the exploration of currentNode and its children has been finished" />
                               </node>
                             </node>
-                            <node concept="3clFbF" id="3NZq_n0J$8Q" role="3cqZAp">
-                              <node concept="2OqwBi" id="3NZq_n0J$ku" role="3clFbG">
-                                <node concept="37vLTw" id="3NZq_n0J$8P" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="4kDlJ5bglcw" resolve="targetNodeMap" />
+                            <node concept="3clFbF" id="2G8yZXxJiiv" role="3cqZAp">
+                              <node concept="2OqwBi" id="2G8yZXxJiiw" role="3clFbG">
+                                <node concept="37vLTw" id="2G8yZXxJiix" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="2G8yZXxJifF" resolve="targetNodeMap" />
                                 </node>
-                                <node concept="kI3uX" id="3NZq_n0J$yd" role="2OqNvi">
-                                  <node concept="37vLTw" id="3NZq_n0J$$B" role="kIiFs">
-                                    <ref role="3cqZAo" node="3NZq_n0ImwG" resolve="currentNode" />
+                                <node concept="kI3uX" id="2G8yZXxJiiy" role="2OqNvi">
+                                  <node concept="37vLTw" id="2G8yZXxJiiz" role="kIiFs">
+                                    <ref role="3cqZAo" node="2G8yZXxJih5" resolve="currentNode" />
                                   </node>
                                 </node>
                               </node>
                             </node>
-                            <node concept="3clFbF" id="3NZq_n0J$Dv" role="3cqZAp">
-                              <node concept="2OqwBi" id="3NZq_n0J$OM" role="3clFbG">
-                                <node concept="37vLTw" id="3NZq_n0J$Du" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="3NZq_n0HgEm" resolve="nodeStack" />
+                            <node concept="3clFbF" id="2G8yZXxJii$" role="3cqZAp">
+                              <node concept="2OqwBi" id="2G8yZXxJii_" role="3clFbG">
+                                <node concept="37vLTw" id="2G8yZXxJiiA" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="2G8yZXxJig4" resolve="nodeStack" />
                                 </node>
-                                <node concept="2AryhJ" id="3NZq_n0J_04" role="2OqNvi" />
+                                <node concept="2AryhJ" id="2G8yZXxJiiB" role="2OqNvi" />
                               </node>
                             </node>
-                            <node concept="3clFbH" id="3NZq_n0J$Bd" role="3cqZAp" />
-                            <node concept="3cpWs8" id="3NZq_n0J_4I" role="3cqZAp">
-                              <node concept="3cpWsn" id="3NZq_n0J_4L" role="3cpWs9">
+                            <node concept="3clFbH" id="2G8yZXxJiiC" role="3cqZAp" />
+                            <node concept="3cpWs8" id="2G8yZXxJiiD" role="3cqZAp">
+                              <node concept="3cpWsn" id="2G8yZXxJiiE" role="3cpWs9">
                                 <property role="TrG5h" value="targets" />
-                                <node concept="2OqwBi" id="3NZq_n0J_c2" role="33vP2m">
-                                  <node concept="37vLTw" id="3NZq_n0J_9Q" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="4kDlJ5bgbhI" resolve="graph" />
+                                <node concept="2OqwBi" id="2G8yZXxJiiF" role="33vP2m">
+                                  <node concept="37vLTw" id="2G8yZXxJiiG" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="2G8yZXxJie3" resolve="graph" />
                                   </node>
-                                  <node concept="liA8E" id="3NZq_n0J_qf" role="2OqNvi">
+                                  <node concept="liA8E" id="2G8yZXxJiiH" role="2OqNvi">
                                     <ref role="37wK5l" node="9NO9Tq8VOy" resolve="getTargets" />
-                                    <node concept="37vLTw" id="3NZq_n0J_Ad" role="37wK5m">
-                                      <ref role="3cqZAo" node="3NZq_n0ImwG" resolve="currentNode" />
+                                    <node concept="37vLTw" id="2G8yZXxJiiI" role="37wK5m">
+                                      <ref role="3cqZAo" node="2G8yZXxJih5" resolve="currentNode" />
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="2hMVRd" id="3NZq_n0JAAI" role="1tU5fm">
-                                  <node concept="16syzq" id="3NZq_n0JAER" role="2hN53Y">
-                                    <ref role="16sUi3" node="4kDlJ5bgbhr" resolve="T" />
+                                <node concept="2hMVRd" id="2G8yZXxJiiJ" role="1tU5fm">
+                                  <node concept="16syzq" id="2G8yZXxJiiK" role="2hN53Y">
+                                    <ref role="16sUi3" node="2G8yZXxJidG" resolve="T" />
                                   </node>
                                 </node>
                               </node>
                             </node>
-                            <node concept="3clFbJ" id="3NZq_n0J_Zr" role="3cqZAp">
-                              <node concept="3clFbS" id="3NZq_n0J_Zu" role="3clFbx">
-                                <node concept="1_o_46" id="3NZq_n0JAYw" role="3cqZAp">
-                                  <node concept="1_o_bx" id="3NZq_n0JAYx" role="1_o_by">
-                                    <node concept="1_o_bG" id="3NZq_n0JAYy" role="1_o_aQ">
+                            <node concept="3clFbJ" id="2G8yZXxJiiL" role="3cqZAp">
+                              <node concept="3clFbS" id="2G8yZXxJiiM" role="3clFbx">
+                                <node concept="1_o_46" id="2G8yZXxJiiN" role="3cqZAp">
+                                  <node concept="1_o_bx" id="2G8yZXxJiiO" role="1_o_by">
+                                    <node concept="1_o_bG" id="2G8yZXxJiiP" role="1_o_aQ">
                                       <property role="TrG5h" value="targetNode" />
                                     </node>
-                                    <node concept="37vLTw" id="3NZq_n0JB3v" role="1_o_bz">
-                                      <ref role="3cqZAo" node="3NZq_n0J_4L" resolve="targets" />
+                                    <node concept="37vLTw" id="2G8yZXxJiiQ" role="1_o_bz">
+                                      <ref role="3cqZAo" node="2G8yZXxJiiE" resolve="targets" />
                                     </node>
                                   </node>
-                                  <node concept="3clFbS" id="3NZq_n0JAY$" role="2LFqv$">
-                                    <node concept="3clFbJ" id="3NZq_n0JQTZ" role="3cqZAp">
-                                      <node concept="3clFbS" id="3NZq_n0JQU0" role="3clFbx">
-                                        <node concept="3clFbF" id="59VTJR_YkzE" role="3cqZAp">
-                                          <node concept="37vLTI" id="59VTJRA04Cy" role="3clFbG">
-                                            <node concept="2OqwBi" id="3NZq_n0JShi" role="37vLTJ">
-                                              <node concept="37vLTw" id="3NZq_n0JSgc" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="3NZq_n0Iony" resolve="prop" />
+                                  <node concept="3clFbS" id="2G8yZXxJiiR" role="2LFqv$">
+                                    <node concept="3clFbJ" id="2G8yZXxJiiS" role="3cqZAp">
+                                      <node concept="3clFbS" id="2G8yZXxJiiT" role="3clFbx">
+                                        <node concept="3clFbF" id="2G8yZXxJiiU" role="3cqZAp">
+                                          <node concept="37vLTI" id="2G8yZXxJiiV" role="3clFbG">
+                                            <node concept="2OqwBi" id="2G8yZXxJiiW" role="37vLTJ">
+                                              <node concept="37vLTw" id="2G8yZXxJiiX" role="2Oq$k0">
+                                                <ref role="3cqZAo" node="2G8yZXxJihj" resolve="prop" />
                                               </node>
-                                              <node concept="2OwXpG" id="59VTJRA04l6" role="2OqNvi">
+                                              <node concept="2OwXpG" id="2G8yZXxJiiY" role="2OqNvi">
                                                 <ref role="2Oxat5" node="4kDlJ5bgbY9" resolve="lowLink" />
                                               </node>
                                             </node>
-                                            <node concept="2YIFZM" id="3NZq_n0JSTO" role="37vLTx">
-                                              <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
+                                            <node concept="2YIFZM" id="2G8yZXxJiiZ" role="37vLTx">
                                               <ref role="37wK5l" to="wyt6:~Math.min(int,int):int" resolve="min" />
-                                              <node concept="2OqwBi" id="3NZq_n0JT9u" role="37wK5m">
-                                                <node concept="37vLTw" id="3NZq_n0JT3X" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="3NZq_n0Iony" resolve="prop" />
+                                              <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
+                                              <node concept="2OqwBi" id="2G8yZXxJij0" role="37wK5m">
+                                                <node concept="37vLTw" id="2G8yZXxJij1" role="2Oq$k0">
+                                                  <ref role="3cqZAo" node="2G8yZXxJihj" resolve="prop" />
                                                 </node>
-                                                <node concept="2OwXpG" id="59VTJRA05lg" role="2OqNvi">
+                                                <node concept="2OwXpG" id="2G8yZXxJij2" role="2OqNvi">
                                                   <ref role="2Oxat5" node="4kDlJ5bgbY9" resolve="lowLink" />
                                                 </node>
                                               </node>
-                                              <node concept="2OqwBi" id="3NZq_n0JVyY" role="37wK5m">
-                                                <node concept="3EllGN" id="3NZq_n0JUT3" role="2Oq$k0">
-                                                  <node concept="3M$PaV" id="3NZq_n0JVho" role="3ElVtu">
-                                                    <ref role="3M$S_o" node="3NZq_n0JAYy" resolve="targetNode" />
+                                              <node concept="2OqwBi" id="2G8yZXxJij3" role="37wK5m">
+                                                <node concept="3EllGN" id="2G8yZXxJij4" role="2Oq$k0">
+                                                  <node concept="3M$PaV" id="2G8yZXxJij5" role="3ElVtu">
+                                                    <ref role="3M$S_o" node="2G8yZXxJiiP" resolve="targetNode" />
                                                   </node>
-                                                  <node concept="37vLTw" id="3NZq_n0JTZA" role="3ElQJh">
-                                                    <ref role="3cqZAo" node="4kDlJ5bggoS" resolve="nodeMap" />
+                                                  <node concept="37vLTw" id="2G8yZXxJij6" role="3ElQJh">
+                                                    <ref role="3cqZAo" node="2G8yZXxJify" resolve="nodeMap" />
                                                   </node>
                                                 </node>
-                                                <node concept="2OwXpG" id="59VTJRA05IV" role="2OqNvi">
+                                                <node concept="2OwXpG" id="2G8yZXxJij7" role="2OqNvi">
                                                   <ref role="2Oxat5" node="4kDlJ5bgbY9" resolve="lowLink" />
                                                 </node>
                                               </node>
@@ -2088,64 +2376,64 @@
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="2OqwBi" id="3NZq_n0JRKw" role="3clFbw">
-                                        <node concept="3EllGN" id="3NZq_n0JRh7" role="2Oq$k0">
-                                          <node concept="37vLTw" id="3NZq_n0JRsw" role="3ElVtu">
-                                            <ref role="3cqZAo" node="3NZq_n0ImwG" resolve="currentNode" />
+                                      <node concept="2OqwBi" id="2G8yZXxJij8" role="3clFbw">
+                                        <node concept="3EllGN" id="2G8yZXxJij9" role="2Oq$k0">
+                                          <node concept="37vLTw" id="2G8yZXxJija" role="3ElVtu">
+                                            <ref role="3cqZAo" node="2G8yZXxJih5" resolve="currentNode" />
                                           </node>
-                                          <node concept="37vLTw" id="3NZq_n0JQUU" role="3ElQJh">
-                                            <ref role="3cqZAo" node="4kDlJ5bgnLk" resolve="notVisitedMap" />
+                                          <node concept="37vLTw" id="2G8yZXxJijb" role="3ElQJh">
+                                            <ref role="3cqZAo" node="2G8yZXxJifQ" resolve="notVisitedMap" />
                                           </node>
                                         </node>
-                                        <node concept="3JPx81" id="3NZq_n0JSbl" role="2OqNvi">
-                                          <node concept="3M$PaV" id="3NZq_n0JSd7" role="25WWJ7">
-                                            <ref role="3M$S_o" node="3NZq_n0JAYy" resolve="targetNode" />
+                                        <node concept="3JPx81" id="2G8yZXxJijc" role="2OqNvi">
+                                          <node concept="3M$PaV" id="2G8yZXxJijd" role="25WWJ7">
+                                            <ref role="3M$S_o" node="2G8yZXxJiiP" resolve="targetNode" />
                                           </node>
                                         </node>
                                       </node>
-                                      <node concept="3eNFk2" id="3NZq_n0JW_i" role="3eNLev">
-                                        <node concept="2OqwBi" id="3NZq_n0JXbv" role="3eO9$A">
-                                          <node concept="37vLTw" id="3NZq_n0JWP_" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="3NZq_n0Hjg6" resolve="sccStack" />
+                                      <node concept="3eNFk2" id="2G8yZXxJije" role="3eNLev">
+                                        <node concept="2OqwBi" id="2G8yZXxJijf" role="3eO9$A">
+                                          <node concept="37vLTw" id="2G8yZXxJijg" role="2Oq$k0">
+                                            <ref role="3cqZAo" node="2G8yZXxJigf" resolve="sccStack" />
                                           </node>
-                                          <node concept="3JPx81" id="3NZq_n0JXxs" role="2OqNvi">
-                                            <node concept="3M$PaV" id="3NZq_n0JXLw" role="25WWJ7">
-                                              <ref role="3M$S_o" node="3NZq_n0JAYy" resolve="targetNode" />
+                                          <node concept="3JPx81" id="2G8yZXxJijh" role="2OqNvi">
+                                            <node concept="3M$PaV" id="2G8yZXxJiji" role="25WWJ7">
+                                              <ref role="3M$S_o" node="2G8yZXxJiiP" resolve="targetNode" />
                                             </node>
                                           </node>
                                         </node>
-                                        <node concept="3clFbS" id="3NZq_n0JW_k" role="3eOfB_">
-                                          <node concept="3clFbF" id="59VTJR_Ylyw" role="3cqZAp">
-                                            <node concept="37vLTI" id="59VTJRA03_6" role="3clFbG">
-                                              <node concept="2OqwBi" id="3NZq_n0JXOP" role="37vLTJ">
-                                                <node concept="37vLTw" id="3NZq_n0JXNJ" role="2Oq$k0">
-                                                  <ref role="3cqZAo" node="3NZq_n0Iony" resolve="prop" />
+                                        <node concept="3clFbS" id="2G8yZXxJijj" role="3eOfB_">
+                                          <node concept="3clFbF" id="2G8yZXxJijk" role="3cqZAp">
+                                            <node concept="37vLTI" id="2G8yZXxJijl" role="3clFbG">
+                                              <node concept="2OqwBi" id="2G8yZXxJijm" role="37vLTJ">
+                                                <node concept="37vLTw" id="2G8yZXxJijn" role="2Oq$k0">
+                                                  <ref role="3cqZAo" node="2G8yZXxJihj" resolve="prop" />
                                                 </node>
-                                                <node concept="2OwXpG" id="59VTJRA03hA" role="2OqNvi">
+                                                <node concept="2OwXpG" id="2G8yZXxJijo" role="2OqNvi">
                                                   <ref role="2Oxat5" node="4kDlJ5bgbY9" resolve="lowLink" />
                                                 </node>
                                               </node>
-                                              <node concept="2YIFZM" id="3NZq_n0JYty" role="37vLTx">
+                                              <node concept="2YIFZM" id="2G8yZXxJijp" role="37vLTx">
                                                 <ref role="37wK5l" to="wyt6:~Math.min(int,int):int" resolve="min" />
                                                 <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                                <node concept="2OqwBi" id="3NZq_n0JYMk" role="37wK5m">
-                                                  <node concept="37vLTw" id="3NZq_n0JYBF" role="2Oq$k0">
-                                                    <ref role="3cqZAo" node="3NZq_n0Iony" resolve="prop" />
+                                                <node concept="2OqwBi" id="2G8yZXxJijq" role="37wK5m">
+                                                  <node concept="37vLTw" id="2G8yZXxJijr" role="2Oq$k0">
+                                                    <ref role="3cqZAo" node="2G8yZXxJihj" resolve="prop" />
                                                   </node>
-                                                  <node concept="2OwXpG" id="59VTJRA02_D" role="2OqNvi">
+                                                  <node concept="2OwXpG" id="2G8yZXxJijs" role="2OqNvi">
                                                     <ref role="2Oxat5" node="4kDlJ5bgbY9" resolve="lowLink" />
                                                   </node>
                                                 </node>
-                                                <node concept="2OqwBi" id="3NZq_n0K12U" role="37wK5m">
-                                                  <node concept="3EllGN" id="3NZq_n0K0oV" role="2Oq$k0">
-                                                    <node concept="3M$PaV" id="3NZq_n0K0Li" role="3ElVtu">
-                                                      <ref role="3M$S_o" node="3NZq_n0JAYy" resolve="targetNode" />
+                                                <node concept="2OqwBi" id="2G8yZXxJijt" role="37wK5m">
+                                                  <node concept="3EllGN" id="2G8yZXxJiju" role="2Oq$k0">
+                                                    <node concept="3M$PaV" id="2G8yZXxJijv" role="3ElVtu">
+                                                      <ref role="3M$S_o" node="2G8yZXxJiiP" resolve="targetNode" />
                                                     </node>
-                                                    <node concept="37vLTw" id="3NZq_n0JZvR" role="3ElQJh">
-                                                      <ref role="3cqZAo" node="4kDlJ5bggoS" resolve="nodeMap" />
+                                                    <node concept="37vLTw" id="2G8yZXxJijw" role="3ElQJh">
+                                                      <ref role="3cqZAo" node="2G8yZXxJify" resolve="nodeMap" />
                                                     </node>
                                                   </node>
-                                                  <node concept="2OwXpG" id="59VTJRA02SD" role="2OqNvi">
+                                                  <node concept="2OwXpG" id="2G8yZXxJijx" role="2OqNvi">
                                                     <ref role="2Oxat5" node="4kDlJ5bgbXo" resolve="index" />
                                                   </node>
                                                 </node>
@@ -2158,113 +2446,113 @@
                                   </node>
                                 </node>
                               </node>
-                              <node concept="3y3z36" id="3NZq_n0JAwC" role="3clFbw">
-                                <node concept="10Nm6u" id="3NZq_n0JAxM" role="3uHU7w" />
-                                <node concept="37vLTw" id="3NZq_n0JAcy" role="3uHU7B">
-                                  <ref role="3cqZAo" node="3NZq_n0J_4L" resolve="targets" />
+                              <node concept="3y3z36" id="2G8yZXxJijy" role="3clFbw">
+                                <node concept="10Nm6u" id="2G8yZXxJijz" role="3uHU7w" />
+                                <node concept="37vLTw" id="2G8yZXxJij$" role="3uHU7B">
+                                  <ref role="3cqZAo" node="2G8yZXxJiiE" resolve="targets" />
                                 </node>
                               </node>
                             </node>
-                            <node concept="3clFbH" id="3NZq_n0JATs" role="3cqZAp" />
-                            <node concept="3clFbF" id="3NZq_n0JAIi" role="3cqZAp">
-                              <node concept="37vLTI" id="3NZq_n0JARB" role="3clFbG">
-                                <node concept="3clFbT" id="3NZq_n0JAS$" role="37vLTx">
+                            <node concept="3clFbH" id="2G8yZXxJij_" role="3cqZAp" />
+                            <node concept="3clFbF" id="2G8yZXxJijA" role="3cqZAp">
+                              <node concept="37vLTI" id="2G8yZXxJijB" role="3clFbG">
+                                <node concept="3clFbT" id="2G8yZXxJijC" role="37vLTx">
                                   <property role="3clFbU" value="true" />
                                 </node>
-                                <node concept="37vLTw" id="3NZq_n0JAIh" role="37vLTJ">
-                                  <ref role="3cqZAo" node="3NZq_n0HkZa" resolve="finishedTraversal" />
+                                <node concept="37vLTw" id="2G8yZXxJijD" role="37vLTJ">
+                                  <ref role="3cqZAo" node="2G8yZXxJigr" resolve="finishedTraversal" />
                                 </node>
                               </node>
                             </node>
                           </node>
-                          <node concept="2OqwBi" id="3NZq_n0Jteq" role="3clFbw">
-                            <node concept="3EllGN" id="3NZq_n0JsH6" role="2Oq$k0">
-                              <node concept="37vLTw" id="3NZq_n0JsSN" role="3ElVtu">
-                                <ref role="3cqZAo" node="3NZq_n0ImwG" resolve="currentNode" />
+                          <node concept="2OqwBi" id="2G8yZXxJijE" role="3clFbw">
+                            <node concept="3EllGN" id="2G8yZXxJijF" role="2Oq$k0">
+                              <node concept="37vLTw" id="2G8yZXxJijG" role="3ElVtu">
+                                <ref role="3cqZAo" node="2G8yZXxJih5" resolve="currentNode" />
                               </node>
-                              <node concept="37vLTw" id="3NZq_n0Jsms" role="3ElQJh">
-                                <ref role="3cqZAo" node="4kDlJ5bglcw" resolve="targetNodeMap" />
+                              <node concept="37vLTw" id="2G8yZXxJijH" role="3ElQJh">
+                                <ref role="3cqZAo" node="2G8yZXxJifF" resolve="targetNodeMap" />
                               </node>
                             </node>
-                            <node concept="1v1jN8" id="3NZq_n0JtId" role="2OqNvi" />
+                            <node concept="1v1jN8" id="2G8yZXxJijI" role="2OqNvi" />
                           </node>
-                          <node concept="9aQIb" id="3NZq_n0JtJa" role="9aQIa">
-                            <node concept="3clFbS" id="3NZq_n0JtJb" role="9aQI4">
-                              <node concept="3cpWs8" id="3NZq_n0JtNF" role="3cqZAp">
-                                <node concept="3cpWsn" id="3NZq_n0JtNI" role="3cpWs9">
+                          <node concept="9aQIb" id="2G8yZXxJijJ" role="9aQIa">
+                            <node concept="3clFbS" id="2G8yZXxJijK" role="9aQI4">
+                              <node concept="3cpWs8" id="2G8yZXxJijL" role="3cqZAp">
+                                <node concept="3cpWsn" id="2G8yZXxJijM" role="3cpWs9">
                                   <property role="TrG5h" value="targetNode" />
-                                  <node concept="16syzq" id="3NZq_n0JtNE" role="1tU5fm">
-                                    <ref role="16sUi3" node="4kDlJ5bgbhr" resolve="T" />
+                                  <node concept="16syzq" id="2G8yZXxJijN" role="1tU5fm">
+                                    <ref role="16sUi3" node="2G8yZXxJidG" resolve="T" />
                                   </node>
-                                  <node concept="2OqwBi" id="3NZq_n0JuMW" role="33vP2m">
-                                    <node concept="3EllGN" id="3NZq_n0Juhq" role="2Oq$k0">
-                                      <node concept="37vLTw" id="3NZq_n0Jutl" role="3ElVtu">
-                                        <ref role="3cqZAo" node="3NZq_n0ImwG" resolve="currentNode" />
+                                  <node concept="2OqwBi" id="2G8yZXxJijO" role="33vP2m">
+                                    <node concept="3EllGN" id="2G8yZXxJijP" role="2Oq$k0">
+                                      <node concept="37vLTw" id="2G8yZXxJijQ" role="3ElVtu">
+                                        <ref role="3cqZAo" node="2G8yZXxJih5" resolve="currentNode" />
                                       </node>
-                                      <node concept="37vLTw" id="3NZq_n0JtUF" role="3ElQJh">
-                                        <ref role="3cqZAo" node="4kDlJ5bglcw" resolve="targetNodeMap" />
+                                      <node concept="37vLTw" id="2G8yZXxJijR" role="3ElQJh">
+                                        <ref role="3cqZAo" node="2G8yZXxJifF" resolve="targetNodeMap" />
                                       </node>
                                     </node>
-                                    <node concept="2Kt2Hk" id="3NZq_n0JviN" role="2OqNvi" />
+                                    <node concept="2Kt2Hk" id="2G8yZXxJijS" role="2OqNvi" />
                                   </node>
                                 </node>
                               </node>
-                              <node concept="3SKdUt" id="3NZq_n0JwJR" role="3cqZAp">
-                                <node concept="3SKdUq" id="3NZq_n0JwUj" role="3SKWNk">
+                              <node concept="3SKdUt" id="2G8yZXxJijT" role="3cqZAp">
+                                <node concept="3SKdUq" id="2G8yZXxJijU" role="3SKWNk">
                                   <property role="3SKdUp" value="if the node has not been visited add it to the nodeStack" />
                                 </node>
                               </node>
-                              <node concept="3SKdUt" id="3NZq_n0Jx5r" role="3cqZAp">
-                                <node concept="3SKdUq" id="3NZq_n0JxfT" role="3SKWNk">
+                              <node concept="3SKdUt" id="2G8yZXxJijV" role="3cqZAp">
+                                <node concept="3SKdUq" id="2G8yZXxJijW" role="3SKWNk">
                                   <property role="3SKdUp" value="and mark it as a not visited node for currentNode" />
                                 </node>
                               </node>
-                              <node concept="3clFbJ" id="3NZq_n0JvrI" role="3cqZAp">
-                                <node concept="3clFbS" id="3NZq_n0JvrL" role="3clFbx">
-                                  <node concept="3clFbF" id="3NZq_n0JxgH" role="3cqZAp">
-                                    <node concept="2OqwBi" id="3NZq_n0JxDQ" role="3clFbG">
-                                      <node concept="3EllGN" id="3NZq_n0Jxsx" role="2Oq$k0">
-                                        <node concept="37vLTw" id="3NZq_n0JxuC" role="3ElVtu">
-                                          <ref role="3cqZAo" node="3NZq_n0ImwG" resolve="currentNode" />
+                              <node concept="3clFbJ" id="2G8yZXxJijX" role="3cqZAp">
+                                <node concept="3clFbS" id="2G8yZXxJijY" role="3clFbx">
+                                  <node concept="3clFbF" id="2G8yZXxJijZ" role="3cqZAp">
+                                    <node concept="2OqwBi" id="2G8yZXxJik0" role="3clFbG">
+                                      <node concept="3EllGN" id="2G8yZXxJik1" role="2Oq$k0">
+                                        <node concept="37vLTw" id="2G8yZXxJik2" role="3ElVtu">
+                                          <ref role="3cqZAo" node="2G8yZXxJih5" resolve="currentNode" />
                                         </node>
-                                        <node concept="37vLTw" id="3NZq_n0JxgG" role="3ElQJh">
-                                          <ref role="3cqZAo" node="4kDlJ5bgnLk" resolve="notVisitedMap" />
+                                        <node concept="37vLTw" id="2G8yZXxJik3" role="3ElQJh">
+                                          <ref role="3cqZAo" node="2G8yZXxJifQ" resolve="notVisitedMap" />
                                         </node>
                                       </node>
-                                      <node concept="TSZUe" id="3NZq_n0Jy4x" role="2OqNvi">
-                                        <node concept="37vLTw" id="3NZq_n0Jy9f" role="25WWJ7">
-                                          <ref role="3cqZAo" node="3NZq_n0JtNI" resolve="targetNode" />
+                                      <node concept="TSZUe" id="2G8yZXxJik4" role="2OqNvi">
+                                        <node concept="37vLTw" id="2G8yZXxJik5" role="25WWJ7">
+                                          <ref role="3cqZAo" node="2G8yZXxJijM" resolve="targetNode" />
                                         </node>
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="3clFbF" id="3NZq_n0Jyxq" role="3cqZAp">
-                                    <node concept="2OqwBi" id="3NZq_n0JyGS" role="3clFbG">
-                                      <node concept="37vLTw" id="3NZq_n0Jyxp" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="3NZq_n0HgEm" resolve="nodeStack" />
+                                  <node concept="3clFbF" id="2G8yZXxJik6" role="3cqZAp">
+                                    <node concept="2OqwBi" id="2G8yZXxJik7" role="3clFbG">
+                                      <node concept="37vLTw" id="2G8yZXxJik8" role="2Oq$k0">
+                                        <ref role="3cqZAo" node="2G8yZXxJig4" resolve="nodeStack" />
                                       </node>
-                                      <node concept="2ArzE6" id="3NZq_n0JzDD" role="2OqNvi">
-                                        <node concept="37vLTw" id="3NZq_n0JzTi" role="25WWJ7">
-                                          <ref role="3cqZAo" node="3NZq_n0JtNI" resolve="targetNode" />
+                                      <node concept="2ArzE6" id="2G8yZXxJik9" role="2OqNvi">
+                                        <node concept="37vLTw" id="2G8yZXxJika" role="25WWJ7">
+                                          <ref role="3cqZAo" node="2G8yZXxJijM" resolve="targetNode" />
                                         </node>
                                       </node>
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="3clFbC" id="3NZq_n0Jwoj" role="3clFbw">
-                                  <node concept="3cmrfG" id="3NZq_n0Jwvk" role="3uHU7w">
+                                <node concept="3clFbC" id="2G8yZXxJikb" role="3clFbw">
+                                  <node concept="3cmrfG" id="2G8yZXxJikc" role="3uHU7w">
                                     <property role="3cmrfH" value="0" />
                                   </node>
-                                  <node concept="2OqwBi" id="3NZq_n0JvQF" role="3uHU7B">
-                                    <node concept="3EllGN" id="3NZq_n0JvM4" role="2Oq$k0">
-                                      <node concept="37vLTw" id="3NZq_n0JvOx" role="3ElVtu">
-                                        <ref role="3cqZAo" node="3NZq_n0JtNI" resolve="targetNode" />
+                                  <node concept="2OqwBi" id="2G8yZXxJikd" role="3uHU7B">
+                                    <node concept="3EllGN" id="2G8yZXxJike" role="2Oq$k0">
+                                      <node concept="37vLTw" id="2G8yZXxJikf" role="3ElVtu">
+                                        <ref role="3cqZAo" node="2G8yZXxJijM" resolve="targetNode" />
                                       </node>
-                                      <node concept="37vLTw" id="3NZq_n0Jvx7" role="3ElQJh">
-                                        <ref role="3cqZAo" node="4kDlJ5bggoS" resolve="nodeMap" />
+                                      <node concept="37vLTw" id="2G8yZXxJikg" role="3ElQJh">
+                                        <ref role="3cqZAo" node="2G8yZXxJify" resolve="nodeMap" />
                                       </node>
                                     </node>
-                                    <node concept="2OwXpG" id="59VTJRA02kH" role="2OqNvi">
+                                    <node concept="2OwXpG" id="2G8yZXxJikh" role="2OqNvi">
                                       <ref role="2Oxat5" node="4kDlJ5bgbXo" resolve="index" />
                                     </node>
                                   </node>
@@ -2274,195 +2562,249 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="3y3z36" id="3NZq_n0JcHH" role="3clFbw">
-                        <node concept="10Nm6u" id="3NZq_n0JcK9" role="3uHU7w" />
-                        <node concept="3EllGN" id="3NZq_n0Jc2L" role="3uHU7B">
-                          <node concept="37vLTw" id="3NZq_n0Jceu" role="3ElVtu">
-                            <ref role="3cqZAo" node="3NZq_n0ImwG" resolve="currentNode" />
+                      <node concept="3y3z36" id="2G8yZXxJiki" role="3clFbw">
+                        <node concept="10Nm6u" id="2G8yZXxJikj" role="3uHU7w" />
+                        <node concept="3EllGN" id="2G8yZXxJikk" role="3uHU7B">
+                          <node concept="37vLTw" id="2G8yZXxJikl" role="3ElVtu">
+                            <ref role="3cqZAo" node="2G8yZXxJih5" resolve="currentNode" />
                           </node>
-                          <node concept="37vLTw" id="3NZq_n0J8MC" role="3ElQJh">
-                            <ref role="3cqZAo" node="4kDlJ5bglcw" resolve="targetNodeMap" />
+                          <node concept="37vLTw" id="2G8yZXxJikm" role="3ElQJh">
+                            <ref role="3cqZAo" node="2G8yZXxJifF" resolve="targetNodeMap" />
                           </node>
                         </node>
                       </node>
-                      <node concept="9aQIb" id="3NZq_n0JdCP" role="9aQIa">
-                        <node concept="3clFbS" id="3NZq_n0JdCQ" role="9aQI4">
-                          <node concept="3clFbF" id="3NZq_n0JdQb" role="3cqZAp">
-                            <node concept="2OqwBi" id="3NZq_n0Je1q" role="3clFbG">
-                              <node concept="37vLTw" id="3NZq_n0JdQa" role="2Oq$k0">
-                                <ref role="3cqZAo" node="3NZq_n0HgEm" resolve="nodeStack" />
+                      <node concept="9aQIb" id="2G8yZXxJikn" role="9aQIa">
+                        <node concept="3clFbS" id="2G8yZXxJiko" role="9aQI4">
+                          <node concept="3clFbF" id="2G8yZXxJikp" role="3cqZAp">
+                            <node concept="2OqwBi" id="2G8yZXxJikq" role="3clFbG">
+                              <node concept="37vLTw" id="2G8yZXxJikr" role="2Oq$k0">
+                                <ref role="3cqZAo" node="2G8yZXxJig4" resolve="nodeStack" />
                               </node>
-                              <node concept="2AryhJ" id="3NZq_n0JecG" role="2OqNvi" />
+                              <node concept="2AryhJ" id="2G8yZXxJiks" role="2OqNvi" />
                             </node>
                           </node>
-                          <node concept="3clFbF" id="3NZq_n0JdFs" role="3cqZAp">
-                            <node concept="37vLTI" id="3NZq_n0JdKW" role="3clFbG">
-                              <node concept="3clFbT" id="3NZq_n0JdLT" role="37vLTx">
+                          <node concept="3clFbF" id="2G8yZXxJikt" role="3cqZAp">
+                            <node concept="37vLTI" id="2G8yZXxJiku" role="3clFbG">
+                              <node concept="3clFbT" id="2G8yZXxJikv" role="37vLTx">
                                 <property role="3clFbU" value="true" />
                               </node>
-                              <node concept="37vLTw" id="3NZq_n0JdFr" role="37vLTJ">
-                                <ref role="3cqZAo" node="3NZq_n0HkjX" resolve="sink" />
+                              <node concept="37vLTw" id="2G8yZXxJikw" role="37vLTJ">
+                                <ref role="3cqZAo" node="2G8yZXxJign" resolve="sink" />
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="3clFbH" id="3NZq_n0JeeT" role="3cqZAp" />
-                    <node concept="3SKdUt" id="3NZq_n0JqAW" role="3cqZAp">
-                      <node concept="3SKdUq" id="3NZq_n0JrJj" role="3SKWNk">
+                    <node concept="3clFbH" id="2G8yZXxJikx" role="3cqZAp" />
+                    <node concept="3SKdUt" id="2G8yZXxJiky" role="3cqZAp">
+                      <node concept="3SKdUq" id="2G8yZXxJikz" role="3SKWNk">
                         <property role="3SKdUp" value="create the new SCC by popping the elements off the stack" />
                       </node>
                     </node>
-                    <node concept="3clFbJ" id="3NZq_n0JeY1" role="3cqZAp">
-                      <node concept="3clFbS" id="3NZq_n0JeY4" role="3clFbx">
-                        <node concept="3cpWs8" id="3NZq_n0JhLk" role="3cqZAp">
-                          <node concept="3cpWsn" id="3NZq_n0JhLn" role="3cpWs9">
+                    <node concept="3clFbJ" id="2G8yZXxJik$" role="3cqZAp">
+                      <node concept="3clFbS" id="2G8yZXxJik_" role="3clFbx">
+                        <node concept="3cpWs8" id="2G8yZXxJikA" role="3cqZAp">
+                          <node concept="3cpWsn" id="2G8yZXxJikB" role="3cpWs9">
                             <property role="TrG5h" value="newSCC" />
-                            <node concept="2hMVRd" id="3NZq_n0JhLi" role="1tU5fm">
-                              <node concept="16syzq" id="3NZq_n0JhMe" role="2hN53Y">
-                                <ref role="16sUi3" node="4kDlJ5bgbhr" resolve="T" />
+                            <node concept="2hMVRd" id="2G8yZXxJikC" role="1tU5fm">
+                              <node concept="16syzq" id="2G8yZXxJikD" role="2hN53Y">
+                                <ref role="16sUi3" node="2G8yZXxJidG" resolve="T" />
                               </node>
                             </node>
-                            <node concept="2ShNRf" id="3NZq_n0JhPV" role="33vP2m">
-                              <node concept="2i4dXS" id="3NZq_n0JkH6" role="2ShVmc">
-                                <node concept="16syzq" id="3NZq_n0JkMi" role="HW$YZ">
-                                  <ref role="16sUi3" node="4kDlJ5bgbhr" resolve="T" />
+                            <node concept="2ShNRf" id="2G8yZXxJikE" role="33vP2m">
+                              <node concept="2i4dXS" id="2G8yZXxJikF" role="2ShVmc">
+                                <node concept="16syzq" id="2G8yZXxJikG" role="HW$YZ">
+                                  <ref role="16sUi3" node="2G8yZXxJidG" resolve="T" />
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="3cpWs8" id="3NZq_n0JkPl" role="3cqZAp">
-                          <node concept="3cpWsn" id="3NZq_n0JkPo" role="3cpWs9">
+                        <node concept="3cpWs8" id="2G8yZXxJikH" role="3cqZAp">
+                          <node concept="3cpWsn" id="2G8yZXxJikI" role="3cpWs9">
                             <property role="TrG5h" value="targetNode" />
-                            <node concept="16syzq" id="3NZq_n0JkPk" role="1tU5fm">
-                              <ref role="16sUi3" node="4kDlJ5bgbhr" resolve="T" />
+                            <node concept="16syzq" id="2G8yZXxJikJ" role="1tU5fm">
+                              <ref role="16sUi3" node="2G8yZXxJidG" resolve="T" />
                             </node>
-                            <node concept="10Nm6u" id="3NZq_n0JkV0" role="33vP2m" />
+                            <node concept="10Nm6u" id="2G8yZXxJikK" role="33vP2m" />
                           </node>
                         </node>
-                        <node concept="3clFbH" id="3NZq_n0JkVP" role="3cqZAp" />
-                        <node concept="MpOyq" id="3NZq_n0JkZ1" role="3cqZAp">
-                          <node concept="3clFbS" id="3NZq_n0JkZ3" role="2LFqv$">
-                            <node concept="3clFbF" id="3NZq_n0Jlcr" role="3cqZAp">
-                              <node concept="37vLTI" id="3NZq_n0Jldm" role="3clFbG">
-                                <node concept="2OqwBi" id="3NZq_n0Jl$d" role="37vLTx">
-                                  <node concept="37vLTw" id="3NZq_n0Jlev" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="3NZq_n0Hjg6" resolve="sccStack" />
+                        <node concept="3clFbH" id="2G8yZXxJikL" role="3cqZAp" />
+                        <node concept="MpOyq" id="2G8yZXxJikM" role="3cqZAp">
+                          <node concept="3clFbS" id="2G8yZXxJikN" role="2LFqv$">
+                            <node concept="3clFbF" id="2G8yZXxJikO" role="3cqZAp">
+                              <node concept="37vLTI" id="2G8yZXxJikP" role="3clFbG">
+                                <node concept="2OqwBi" id="2G8yZXxJikQ" role="37vLTx">
+                                  <node concept="37vLTw" id="2G8yZXxJikR" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="2G8yZXxJigf" resolve="sccStack" />
                                   </node>
-                                  <node concept="2AryhJ" id="3NZq_n0JlUa" role="2OqNvi" />
+                                  <node concept="2AryhJ" id="2G8yZXxJikS" role="2OqNvi" />
                                 </node>
-                                <node concept="37vLTw" id="3NZq_n0Jlcq" role="37vLTJ">
-                                  <ref role="3cqZAo" node="3NZq_n0JkPo" resolve="targetNode" />
+                                <node concept="37vLTw" id="2G8yZXxJikT" role="37vLTJ">
+                                  <ref role="3cqZAo" node="2G8yZXxJikI" resolve="targetNode" />
                                 </node>
                               </node>
                             </node>
-                            <node concept="3clFbF" id="3NZq_n0JlZl" role="3cqZAp">
-                              <node concept="2OqwBi" id="3NZq_n0Jmb2" role="3clFbG">
-                                <node concept="37vLTw" id="3NZq_n0JlZk" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="3NZq_n0JhLn" resolve="newSCC" />
+                            <node concept="3clFbF" id="2G8yZXxJikU" role="3cqZAp">
+                              <node concept="2OqwBi" id="2G8yZXxJikV" role="3clFbG">
+                                <node concept="37vLTw" id="2G8yZXxJikW" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="2G8yZXxJikB" resolve="newSCC" />
                                 </node>
-                                <node concept="TSZUe" id="3NZq_n0JmxX" role="2OqNvi">
-                                  <node concept="37vLTw" id="3NZq_n0JmAF" role="25WWJ7">
-                                    <ref role="3cqZAo" node="3NZq_n0JkPo" resolve="targetNode" />
+                                <node concept="TSZUe" id="2G8yZXxJikX" role="2OqNvi">
+                                  <node concept="37vLTw" id="2G8yZXxJikY" role="25WWJ7">
+                                    <ref role="3cqZAo" node="2G8yZXxJikI" resolve="targetNode" />
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
-                          <node concept="1Wc70l" id="1Nl0v8EPWL7" role="MpTkK">
-                            <node concept="3y3z36" id="1Nl0v8EPWOg" role="3uHU7B">
-                              <node concept="10Nm6u" id="1Nl0v8EPWPx" role="3uHU7w" />
-                              <node concept="37vLTw" id="1Nl0v8EPWMP" role="3uHU7B">
-                                <ref role="3cqZAo" node="3NZq_n0JkPo" resolve="targetNode" />
+                          <node concept="1Wc70l" id="2G8yZXxJikZ" role="MpTkK">
+                            <node concept="3y3z36" id="2G8yZXxJil0" role="3uHU7B">
+                              <node concept="10Nm6u" id="2G8yZXxJil1" role="3uHU7w" />
+                              <node concept="37vLTw" id="2G8yZXxJil2" role="3uHU7B">
+                                <ref role="3cqZAo" node="2G8yZXxJikI" resolve="targetNode" />
                               </node>
                             </node>
-                            <node concept="3fqX7Q" id="3NZq_n0Jl15" role="3uHU7w">
-                              <node concept="2OqwBi" id="3NZq_n0Jl3H" role="3fr31v">
-                                <node concept="37vLTw" id="3NZq_n0Jl2k" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="3NZq_n0JkPo" resolve="targetNode" />
+                            <node concept="3fqX7Q" id="2G8yZXxJil3" role="3uHU7w">
+                              <node concept="2OqwBi" id="2G8yZXxJil4" role="3fr31v">
+                                <node concept="37vLTw" id="2G8yZXxJil5" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="2G8yZXxJikI" resolve="targetNode" />
                                 </node>
-                                <node concept="liA8E" id="3NZq_n0Jl8r" role="2OqNvi">
+                                <node concept="liA8E" id="2G8yZXxJil6" role="2OqNvi">
                                   <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
-                                  <node concept="37vLTw" id="3NZq_n0Jlag" role="37wK5m">
-                                    <ref role="3cqZAo" node="3NZq_n0ImwG" resolve="currentNode" />
+                                  <node concept="37vLTw" id="2G8yZXxJil7" role="37wK5m">
+                                    <ref role="3cqZAo" node="2G8yZXxJih5" resolve="currentNode" />
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="3clFbH" id="3NZq_n0JmFc" role="3cqZAp" />
-                        <node concept="3clFbF" id="3NZq_n0JnmW" role="3cqZAp">
-                          <node concept="2OqwBi" id="3NZq_n0JnNU" role="3clFbG">
-                            <node concept="37vLTw" id="3NZq_n0JnmV" role="2Oq$k0">
-                              <ref role="3cqZAo" node="4kDlJ5bgefP" resolve="result" />
+                        <node concept="3clFbH" id="2G8yZXxJil8" role="3cqZAp" />
+                        <node concept="3SKdUt" id="2G8yZXxNmu0" role="3cqZAp">
+                          <node concept="3SKdUq" id="2G8yZXxNmu1" role="3SKWNk">
+                            <property role="3SKdUp" value="early exit if the sought node is found" />
+                          </node>
+                        </node>
+                        <node concept="3clFbJ" id="2G8yZXxNg2u" role="3cqZAp">
+                          <node concept="3clFbS" id="2G8yZXxNg2v" role="3clFbx">
+                            <node concept="3clFbF" id="2G8yZXxNg2w" role="3cqZAp">
+                              <node concept="2OqwBi" id="2G8yZXxNg2x" role="3clFbG">
+                                <node concept="37vLTw" id="2G8yZXxNg2y" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="2G8yZXxJifp" resolve="result" />
+                                </node>
+                                <node concept="2EZike" id="2G8yZXxNg2z" role="2OqNvi" />
+                              </node>
+                            </node>
+                            <node concept="3clFbF" id="2G8yZXxNpqC" role="3cqZAp">
+                              <node concept="2OqwBi" id="2G8yZXxNpqD" role="3clFbG">
+                                <node concept="37vLTw" id="2G8yZXxNpqE" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="2G8yZXxJifp" resolve="result" />
+                                </node>
+                                <node concept="TSZUe" id="2G8yZXxNpqF" role="2OqNvi">
+                                  <node concept="37vLTw" id="2G8yZXxNpqG" role="25WWJ7">
+                                    <ref role="3cqZAo" node="2G8yZXxJikB" resolve="newSCC" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="3cpWs6" id="2G8yZXxNsFf" role="3cqZAp">
+                              <node concept="37vLTw" id="2G8yZXxNtOr" role="3cqZAk">
+                                <ref role="3cqZAo" node="2G8yZXxJifp" resolve="result" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="1Wc70l" id="2G8yZXxNg2A" role="3clFbw">
+                            <node concept="2OqwBi" id="2G8yZXxNg2B" role="3uHU7w">
+                              <node concept="37vLTw" id="2G8yZXxNg2C" role="2Oq$k0">
+                                <ref role="3cqZAo" node="2G8yZXxJikB" resolve="newSCC" />
+                              </node>
+                              <node concept="3JPx81" id="2G8yZXxNg2D" role="2OqNvi">
+                                <node concept="37vLTw" id="2G8yZXxNg2E" role="25WWJ7">
+                                  <ref role="3cqZAo" node="2G8yZXxJiey" resolve="sought" />
+                                </node>
+                              </node>
                             </node>
-                            <node concept="TSZUe" id="3NZq_n0Joqt" role="2OqNvi">
-                              <node concept="37vLTw" id="3NZq_n0JoQb" role="25WWJ7">
-                                <ref role="3cqZAo" node="3NZq_n0JhLn" resolve="newSCC" />
+                            <node concept="3y3z36" id="2G8yZXxNg2F" role="3uHU7B">
+                              <node concept="37vLTw" id="2G8yZXxNg2G" role="3uHU7B">
+                                <ref role="3cqZAo" node="2G8yZXxJiey" resolve="sought" />
+                              </node>
+                              <node concept="10Nm6u" id="2G8yZXxNg2H" role="3uHU7w" />
+                            </node>
+                          </node>
+                          <node concept="9aQIb" id="2G8yZXxNuXd" role="9aQIa">
+                            <node concept="3clFbS" id="2G8yZXxNuXe" role="9aQI4">
+                              <node concept="3clFbF" id="2G8yZXxJil9" role="3cqZAp">
+                                <node concept="2OqwBi" id="2G8yZXxJila" role="3clFbG">
+                                  <node concept="37vLTw" id="2G8yZXxJilb" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="2G8yZXxJifp" resolve="result" />
+                                  </node>
+                                  <node concept="TSZUe" id="2G8yZXxJilc" role="2OqNvi">
+                                    <node concept="37vLTw" id="2G8yZXxJild" role="25WWJ7">
+                                      <ref role="3cqZAo" node="2G8yZXxJikB" resolve="newSCC" />
+                                    </node>
+                                  </node>
+                                </node>
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="1Wc70l" id="3NZq_n0Jg9C" role="3clFbw">
-                        <node concept="3clFbC" id="3NZq_n0JgLl" role="3uHU7w">
-                          <node concept="2OqwBi" id="3NZq_n0Jhsh" role="3uHU7w">
-                            <node concept="37vLTw" id="3NZq_n0JgRx" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3NZq_n0Iony" resolve="prop" />
+                      <node concept="1Wc70l" id="2G8yZXxJile" role="3clFbw">
+                        <node concept="3clFbC" id="2G8yZXxJilf" role="3uHU7w">
+                          <node concept="2OqwBi" id="2G8yZXxJilg" role="3uHU7w">
+                            <node concept="37vLTw" id="2G8yZXxJilh" role="2Oq$k0">
+                              <ref role="3cqZAo" node="2G8yZXxJihj" resolve="prop" />
                             </node>
-                            <node concept="2OwXpG" id="59VTJRA02aZ" role="2OqNvi">
+                            <node concept="2OwXpG" id="2G8yZXxJili" role="2OqNvi">
                               <ref role="2Oxat5" node="4kDlJ5bgbXo" resolve="index" />
                             </node>
                           </node>
-                          <node concept="2OqwBi" id="3NZq_n0JgdC" role="3uHU7B">
-                            <node concept="37vLTw" id="3NZq_n0Jgbz" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3NZq_n0Iony" resolve="prop" />
+                          <node concept="2OqwBi" id="2G8yZXxJilj" role="3uHU7B">
+                            <node concept="37vLTw" id="2G8yZXxJilk" role="2Oq$k0">
+                              <ref role="3cqZAo" node="2G8yZXxJihj" resolve="prop" />
                             </node>
-                            <node concept="2OwXpG" id="59VTJRA023m" role="2OqNvi">
+                            <node concept="2OwXpG" id="2G8yZXxJill" role="2OqNvi">
                               <ref role="2Oxat5" node="4kDlJ5bgbY9" resolve="lowLink" />
                             </node>
                           </node>
                         </node>
-                        <node concept="1eOMI4" id="3NZq_n0JfQy" role="3uHU7B">
-                          <node concept="22lmx$" id="3NZq_n0JfXc" role="1eOMHV">
-                            <node concept="37vLTw" id="3NZq_n0JfYJ" role="3uHU7w">
-                              <ref role="3cqZAo" node="3NZq_n0HkZa" resolve="finishedTraversal" />
+                        <node concept="1eOMI4" id="2G8yZXxJilm" role="3uHU7B">
+                          <node concept="22lmx$" id="2G8yZXxJiln" role="1eOMHV">
+                            <node concept="37vLTw" id="2G8yZXxJilo" role="3uHU7w">
+                              <ref role="3cqZAo" node="2G8yZXxJigr" resolve="finishedTraversal" />
                             </node>
-                            <node concept="37vLTw" id="3NZq_n0JfR$" role="3uHU7B">
-                              <ref role="3cqZAo" node="3NZq_n0HkjX" resolve="sink" />
+                            <node concept="37vLTw" id="2G8yZXxJilp" role="3uHU7B">
+                              <ref role="3cqZAo" node="2G8yZXxJign" resolve="sink" />
                             </node>
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="3clFbH" id="59VTJR_Ya4X" role="3cqZAp" />
-                    <node concept="3clFbH" id="3NZq_n0JcMP" role="3cqZAp" />
                   </node>
-                  <node concept="2OqwBi" id="3NZq_n0IlMw" role="2$JKZa">
-                    <node concept="37vLTw" id="3NZq_n0IlsH" role="2Oq$k0">
-                      <ref role="3cqZAo" node="3NZq_n0HgEm" resolve="nodeStack" />
+                  <node concept="2OqwBi" id="2G8yZXxJilq" role="2$JKZa">
+                    <node concept="37vLTw" id="2G8yZXxJilr" role="2Oq$k0">
+                      <ref role="3cqZAo" node="2G8yZXxJig4" resolve="nodeStack" />
                     </node>
-                    <node concept="3GX2aA" id="3NZq_n0Imvu" role="2OqNvi" />
+                    <node concept="3GX2aA" id="2G8yZXxJils" role="2OqNvi" />
                   </node>
                 </node>
               </node>
-              <node concept="3clFbC" id="3NZq_n0I41f" role="3clFbw">
-                <node concept="3cmrfG" id="3NZq_n0I49X" role="3uHU7w">
+              <node concept="3clFbC" id="2G8yZXxJilt" role="3clFbw">
+                <node concept="3cmrfG" id="2G8yZXxJilu" role="3uHU7w">
                   <property role="3cmrfH" value="0" />
                 </node>
-                <node concept="2OqwBi" id="3NZq_n0I3ph" role="3uHU7B">
-                  <node concept="3EllGN" id="3NZq_n0I3kT" role="2Oq$k0">
-                    <node concept="3M$PaV" id="3NZq_n0I3n7" role="3ElVtu">
-                      <ref role="3M$S_o" node="3NZq_n0I2ul" resolve="node" />
+                <node concept="2OqwBi" id="2G8yZXxJilv" role="3uHU7B">
+                  <node concept="3EllGN" id="2G8yZXxJilw" role="2Oq$k0">
+                    <node concept="3M$PaV" id="2G8yZXxJilx" role="3ElVtu">
+                      <ref role="3M$S_o" node="2G8yZXxJigL" resolve="node" />
                     </node>
-                    <node concept="37vLTw" id="3NZq_n0I34l" role="3ElQJh">
-                      <ref role="3cqZAo" node="4kDlJ5bggoS" resolve="nodeMap" />
+                    <node concept="37vLTw" id="2G8yZXxJily" role="3ElQJh">
+                      <ref role="3cqZAo" node="2G8yZXxJify" resolve="nodeMap" />
                     </node>
                   </node>
-                  <node concept="2OwXpG" id="59VTJR_ZZEf" role="2OqNvi">
+                  <node concept="2OwXpG" id="2G8yZXxJilz" role="2OqNvi">
                     <ref role="2Oxat5" node="4kDlJ5bgbXo" resolve="index" />
                   </node>
                 </node>
@@ -2470,36 +2812,46 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="3NZq_n0Hk78" role="3cqZAp" />
-        <node concept="3cpWs6" id="4kDlJ5bgbk$" role="3cqZAp">
-          <node concept="37vLTw" id="3NZq_n0HgiV" role="3cqZAk">
-            <ref role="3cqZAo" node="4kDlJ5bgefP" resolve="result" />
+        <node concept="3clFbH" id="2G8yZXxJil$" role="3cqZAp" />
+        <node concept="3SKdUt" id="2G8yZXxJN6t" role="3cqZAp">
+          <node concept="3SKdUq" id="2G8yZXxJN6v" role="3SKWNk">
+            <property role="3SKdUp" value="full SCC computation exit" />
+          </node>
+        </node>
+        <node concept="3cpWs6" id="2G8yZXxJil_" role="3cqZAp">
+          <node concept="37vLTw" id="2G8yZXxJilA" role="3cqZAk">
+            <ref role="3cqZAo" node="2G8yZXxJifp" resolve="result" />
           </node>
         </node>
       </node>
-      <node concept="3Tm1VV" id="4kDlJ5bgbez" role="1B3o_S" />
-      <node concept="2hMVRd" id="4kDlJ5bgbeN" role="3clF45">
-        <node concept="2hMVRd" id="4kDlJ5bgbeV" role="2hN53Y">
-          <node concept="16syzq" id="4kDlJ5bgt36" role="2hN53Y">
-            <ref role="16sUi3" node="4kDlJ5bgbhr" resolve="T" />
+      <node concept="3Tm6S6" id="2G8yZXxJhK0" role="1B3o_S" />
+      <node concept="2hMVRd" id="2G8yZXxJidI" role="3clF45">
+        <node concept="2hMVRd" id="2G8yZXxJidT" role="2hN53Y">
+          <node concept="16syzq" id="2G8yZXxJidZ" role="2hN53Y">
+            <ref role="16sUi3" node="2G8yZXxJidG" resolve="T" />
           </node>
         </node>
       </node>
-      <node concept="16euLQ" id="4kDlJ5bgbhr" role="16eVyc">
+      <node concept="16euLQ" id="2G8yZXxJidG" role="16eVyc">
         <property role="TrG5h" value="T" />
       </node>
-      <node concept="37vLTG" id="4kDlJ5bgbhI" role="3clF46">
+      <node concept="37vLTG" id="2G8yZXxJiey" role="3clF46">
+        <property role="TrG5h" value="sought" />
+        <node concept="16syzq" id="2G8yZXxJifb" role="1tU5fm">
+          <ref role="16sUi3" node="2G8yZXxJidG" resolve="T" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="2G8yZXxJie3" role="3clF46">
         <property role="TrG5h" value="graph" />
-        <node concept="3uibUv" id="4kDlJ5bgbhH" role="1tU5fm">
+        <node concept="3uibUv" id="2G8yZXxJie2" role="1tU5fm">
           <ref role="3uigEE" node="9NO9Tq8VKe" resolve="Graph" />
-          <node concept="16syzq" id="4kDlJ5bgsVq" role="11_B2D">
-            <ref role="16sUi3" node="4kDlJ5bgbhr" resolve="T" />
+          <node concept="16syzq" id="2G8yZXxJieg" role="11_B2D">
+            <ref role="16sUi3" node="2G8yZXxJidG" resolve="T" />
           </node>
         </node>
       </node>
     </node>
     <node concept="2tJIrI" id="4kDlJ5bg9HO" role="jymVt" />
-    <node concept="2tJIrI" id="59VTJR_XXSK" role="jymVt" />
     <node concept="3Tm1VV" id="59VTJR_XXJc" role="1B3o_S" />
   </node>
   <node concept="312cEu" id="59VTJR_ZT1i">