From cf7eda0e370be62de5216934e943e3ad5a67dcef Mon Sep 17 00:00:00 2001
From: Ludovic Apvrille <ludovic.apvrille@telecom-paris.fr>
Date: Wed, 9 Mar 2022 16:07:02 +0100
Subject: [PATCH] New grammer for TML: removing min and max functions

---
 modeling/AVATAR/CoffeeMachine_Avatar.xml      |  537 ++-
 modeling/SysMLSec/stuxnet.xml                 | 3020 ++++++++++-------
 .../compiler/tmlgrammar/TMLExprParser0.2.jjt  |    2 -
 3 files changed, 1970 insertions(+), 1589 deletions(-)

diff --git a/modeling/AVATAR/CoffeeMachine_Avatar.xml b/modeling/AVATAR/CoffeeMachine_Avatar.xml
index c6af5a9745..80bf7f36fd 100644
--- a/modeling/AVATAR/CoffeeMachine_Avatar.xml
+++ b/modeling/AVATAR/CoffeeMachine_Avatar.xml
@@ -27,7 +27,6 @@
 <TGConnectingPoint num="14" id="15" />
 <TGConnectingPoint num="15" id="16" />
 <extraparam>
-<Line value="" />
 </extraparam>
 </COMPONENT>
 
@@ -759,7 +758,7 @@
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
 <TGConnectingPoint num="0" id="449" />
-<P1  x="302" y="261" id="493" />
+<P1  x="302" y="261" id="480" />
 <P2  x="361" y="261" id="468" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -777,7 +776,7 @@
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
 <TGConnectingPoint num="0" id="453" />
-<P1  x="305" y="211" id="480" />
+<P1  x="305" y="211" id="493" />
 <P2  x="361" y="211" id="467" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
@@ -864,13 +863,13 @@
 <TGConnectingPoint num="22" id="526" />
 <TGConnectingPoint num="23" id="527" />
 </COMPONENT>
-<SUBCOMPONENT type="5304" id="490" index="13" uid="2dbef5cf-57eb-4674-94d5-4b37c6777b4a" >
+<SUBCOMPONENT type="5304" id="490" index="13" uid="e14fd5a7-c9ae-42ab-b99a-306f91c69127" >
 <father id="528" num="0" />
-<cdparam x="166" y="191" />
-<sizeparam width="139" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="154" y="241" />
+<sizeparam width="148" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="29" minY="0" maxY="114" />
-<infoparam name="TGComponent" value="WaitingForFirstCoin_exit" />
+<cdrectangleparam minX="0" maxX="20" minY="0" maxY="114" />
+<infoparam name="TGComponent" value="WaitingForFirstCoin_enter" />
 <TGConnectingPoint num="0" id="478" />
 <TGConnectingPoint num="1" id="479" />
 <TGConnectingPoint num="2" id="480" />
@@ -884,13 +883,13 @@
 <TGConnectingPoint num="10" id="488" />
 <TGConnectingPoint num="11" id="489" />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5304" id="503" index="14" uid="e14fd5a7-c9ae-42ab-b99a-306f91c69127" >
+<SUBCOMPONENT type="5304" id="503" index="14" uid="2dbef5cf-57eb-4674-94d5-4b37c6777b4a" >
 <father id="528" num="1" />
-<cdparam x="154" y="241" />
-<sizeparam width="148" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="166" y="191" />
+<sizeparam width="139" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="20" minY="0" maxY="114" />
-<infoparam name="TGComponent" value="WaitingForFirstCoin_enter" />
+<cdrectangleparam minX="0" maxX="29" minY="0" maxY="114" />
+<infoparam name="TGComponent" value="WaitingForFirstCoin_exit" />
 <TGConnectingPoint num="0" id="491" />
 <TGConnectingPoint num="1" id="492" />
 <TGConnectingPoint num="2" id="493" />
@@ -1020,7 +1019,7 @@
 <TGConnectingPoint num="0" id="587" />
 <TGConnectingPoint num="1" id="588" />
 <TGConnectingPoint num="2" id="589" />
-<P1  x="581" y="154" id="663" />
+<P1  x="581" y="154" id="676" />
 <P2  x="546" y="305" id="733" />
 <Point x="518" y="154" />
 <Point x="518" y="305" />
@@ -1048,7 +1047,7 @@
 <infoparam name="connector from TGComponent to TGComponent" value="" />
 <TGConnectingPoint num="0" id="592" />
 <TGConnectingPoint num="1" id="593" />
-<P1  x="631" y="164" id="658" />
+<P1  x="631" y="164" id="671" />
 <P2  x="667" y="310" id="720" />
 <Point x="631" y="310" />
 <AutomaticDrawing  data="true" />
@@ -1076,7 +1075,7 @@
 <infoparam name="connector from TGComponent to TGComponent" value="" />
 <TGConnectingPoint num="0" id="598" />
 <TGConnectingPoint num="1" id="599" />
-<P1  x="721" y="158" id="669" />
+<P1  x="721" y="158" id="656" />
 <P2  x="700" y="204" id="710" />
 <Point x="700" y="158" />
 <AutomaticDrawing  data="true" />
@@ -1231,13 +1230,13 @@
 <TGConnectingPoint num="22" id="703" />
 <TGConnectingPoint num="23" id="704" />
 </COMPONENT>
-<SUBCOMPONENT type="5304" id="667" index="24" uid="5ba2c908-950a-4288-889b-0b4c00bd9d79" >
+<SUBCOMPONENT type="5303" id="667" index="24" uid="bf44a33b-5344-46b2-9170-509d38670a83" >
 <father id="705" num="0" />
-<cdparam x="581" y="125" />
-<sizeparam width="100" height="39" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="721" y="133" />
+<sizeparam width="100" height="50" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="168" minY="0" maxY="76" />
-<infoparam name="TGComponent" value="Start" />
+<cdrectangleparam minX="0" maxX="168" minY="0" maxY="65" />
+<infoparam name="TGComponent" value="nbOfCoins" />
 <TGConnectingPoint num="0" id="655" />
 <TGConnectingPoint num="1" id="656" />
 <TGConnectingPoint num="2" id="657" />
@@ -1250,14 +1249,17 @@
 <TGConnectingPoint num="9" id="664" />
 <TGConnectingPoint num="10" id="665" />
 <TGConnectingPoint num="11" id="666" />
+<extraparam>
+<Toggle value="" />
+</extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5303" id="680" index="25" uid="bf44a33b-5344-46b2-9170-509d38670a83" >
+<SUBCOMPONENT type="5304" id="680" index="25" uid="5ba2c908-950a-4288-889b-0b4c00bd9d79" >
 <father id="705" num="1" />
-<cdparam x="721" y="133" />
-<sizeparam width="100" height="50" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="581" y="125" />
+<sizeparam width="100" height="39" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="168" minY="0" maxY="65" />
-<infoparam name="TGComponent" value="nbOfCoins" />
+<cdrectangleparam minX="0" maxX="168" minY="0" maxY="76" />
+<infoparam name="TGComponent" value="Start" />
 <TGConnectingPoint num="0" id="668" />
 <TGConnectingPoint num="1" id="669" />
 <TGConnectingPoint num="2" id="670" />
@@ -1270,9 +1272,6 @@
 <TGConnectingPoint num="9" id="677" />
 <TGConnectingPoint num="10" id="678" />
 <TGConnectingPoint num="11" id="679" />
-<extraparam>
-<Toggle value="" />
-</extraparam>
 </SUBCOMPONENT>
 
 <COMPONENT type="5306" id="717" index="14" uid="7a1c9320-1617-4710-a22f-ae8365f354ef" >
@@ -1395,7 +1394,7 @@
 <MainCode value="}"/>
 <Optimized value="true" />
 <considerTimingOperators value="true" />
-<Validated value="Wallet;CoffeeMachine;CoffeeButton;TeaButton;" />
+<Validated value="" />
 <Ignored value="" />
 
 <CONNECTOR type="5002" id="771" index="0" uid="f480e606-bbb6-4ab7-8f89-8abb37ff40bb" >
@@ -1403,7 +1402,7 @@
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Block1 to Block0" value="" />
 <TGConnectingPoint num="0" id="770" />
-<P1  x="557" y="348" id="881" />
+<P1  x="557" y="348" id="840" />
 <P2  x="558" y="375" id="930" />
 <AutomaticDrawing  data="true" />
 <extraparam>
@@ -1433,7 +1432,7 @@
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Block1 to Block0" value="" />
 <TGConnectingPoint num="0" id="774" />
-<P1  x="788" y="347" id="840" />
+<P1  x="788" y="347" id="881" />
 <P2  x="788" y="375" id="931" />
 <AutomaticDrawing  data="true" />
 <extraparam>
@@ -1624,13 +1623,13 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 <Signal value="out ejectCoin(int nbOfCoins)" attached="true" />
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="5000" id="874" index="6" uid="a5114e80-03e3-4820-b57a-bfcefd90a9c8" >
+<SUBCOMPONENT type="5000" id="874" index="6" uid="7a21d6ab-e515-4a9c-b908-bcb26c800cfb" >
 <father id="956" num="0" />
-<cdparam x="695" y="246" />
-<sizeparam width="187" height="101" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="463" y="247" />
+<sizeparam width="188" height="101" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="273" minY="0" maxY="256" />
-<infoparam name="Block1" value="TeaButton" />
+<cdrectangleparam minX="0" maxX="272" minY="0" maxY="256" />
+<infoparam name="Block1" value="CoffeeButton" />
 <TGConnectingPoint num="0" id="834" />
 <TGConnectingPoint num="1" id="835" />
 <TGConnectingPoint num="2" id="836" />
@@ -1678,13 +1677,13 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 <Signal value="out push()" attached="true" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5000" id="915" index="7" uid="7a21d6ab-e515-4a9c-b908-bcb26c800cfb" >
+<SUBCOMPONENT type="5000" id="915" index="7" uid="a5114e80-03e3-4820-b57a-bfcefd90a9c8" >
 <father id="956" num="1" />
-<cdparam x="463" y="247" />
-<sizeparam width="188" height="101" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="695" y="246" />
+<sizeparam width="187" height="101" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
-<cdrectangleparam minX="0" maxX="272" minY="0" maxY="256" />
-<infoparam name="Block1" value="CoffeeButton" />
+<cdrectangleparam minX="0" maxX="273" minY="0" maxY="256" />
+<infoparam name="Block1" value="TeaButton" />
 <TGConnectingPoint num="0" id="875" />
 <TGConnectingPoint num="1" id="876" />
 <TGConnectingPoint num="2" id="877" />
@@ -1742,8 +1741,8 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to Send signal" value="null" />
 <TGConnectingPoint num="0" id="962" />
-<P1  x="340" y="233" id="1133" />
-<P2  x="353" y="252" id="1135" />
+<P1  x="340" y="233" id="1144" />
+<P2  x="353" y="252" id="1133" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="961" index="8" uid="4b47f2ec-3073-4a06-b6e0-da7704454345" >
 <father id="963" num="0" />
@@ -1841,7 +1840,7 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to state0" value="null" />
 <TGConnectingPoint num="0" id="983" />
-<P1  x="353" y="282" id="1136" />
+<P1  x="353" y="282" id="1134" />
 <P2  x="399" y="352" id="986" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="982" index="11" uid="ef1e1204-6711-4c2c-b81f-515c0e412fcb" >
@@ -2126,33 +2125,33 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 <extraparam>
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="5100" id="1134" index="12" uid="4ea28494-de50-4f99-8981-3ef7a87d7d34" >
+<SUBCOMPONENT type="5103" id="1143" index="12" uid="71f14636-3c96-4e4e-8d0e-c1cd11e52641" >
 <father id="1218" num="0" />
-<cdparam x="333" y="213" />
-<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="169" minY="0" maxY="115" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="1133" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5103" id="1145" index="13" uid="71f14636-3c96-4e4e-8d0e-c1cd11e52641" >
-<father id="1218" num="1" />
 <cdparam x="330" y="257" />
 <sizeparam width="46" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="0" maxX="138" minY="0" maxY="110" />
 <infoparam name="Send signal" value="push()" />
-<TGConnectingPoint num="0" id="1135" />
-<TGConnectingPoint num="1" id="1136" />
-<TGConnectingPoint num="2" id="1137" />
-<TGConnectingPoint num="3" id="1138" />
-<TGConnectingPoint num="4" id="1139" />
-<TGConnectingPoint num="5" id="1140" />
-<TGConnectingPoint num="6" id="1141" />
-<TGConnectingPoint num="7" id="1142" />
-<TGConnectingPoint num="8" id="1143" />
-<TGConnectingPoint num="9" id="1144" />
+<TGConnectingPoint num="0" id="1133" />
+<TGConnectingPoint num="1" id="1134" />
+<TGConnectingPoint num="2" id="1135" />
+<TGConnectingPoint num="3" id="1136" />
+<TGConnectingPoint num="4" id="1137" />
+<TGConnectingPoint num="5" id="1138" />
+<TGConnectingPoint num="6" id="1139" />
+<TGConnectingPoint num="7" id="1140" />
+<TGConnectingPoint num="8" id="1141" />
+<TGConnectingPoint num="9" id="1142" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5100" id="1145" index="13" uid="4ea28494-de50-4f99-8981-3ef7a87d7d34" >
+<father id="1218" num="1" />
+<cdparam x="333" y="213" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="169" minY="0" maxY="115" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="1144" />
 </SUBCOMPONENT>
 
 
@@ -2729,8 +2728,8 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from start state to state0" value="null" />
 <TGConnectingPoint num="0" id="1460" />
-<P1  x="261" y="421" id="2106" />
-<P2  x="260" y="437" id="2109" />
+<P1  x="261" y="421" id="2095" />
+<P2  x="260" y="437" id="2023" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="1459" index="38" uid="a28ea541-81ef-4713-8ea6-c7f5ba166daa" >
 <father id="1461" num="0" />
@@ -2762,8 +2761,8 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
 <TGConnectingPoint num="0" id="1467" />
-<P1  x="227" y="477" id="2122" />
-<P2  x="126" y="524" id="2095" />
+<P1  x="227" y="477" id="2036" />
+<P2  x="126" y="524" id="2097" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="1466" index="39" uid="2484893a-3443-40dc-8f74-e1443edc2bde" >
 <father id="1468" num="0" />
@@ -2795,8 +2794,8 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to stop state" value="null" />
 <TGConnectingPoint num="0" id="1474" />
-<P1  x="126" y="554" id="2096" />
-<P2  x="126" y="653" id="2012" />
+<P1  x="126" y="554" id="2098" />
+<P2  x="126" y="653" id="2120" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="1473" index="40" uid="6f6c6e3e-0702-4e99-b1e6-da999207526e" >
 <father id="1475" num="0" />
@@ -2830,8 +2829,8 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
 <TGConnectingPoint num="0" id="1481" />
-<P1  x="293" y="477" id="2123" />
-<P2  x="298" y="524" id="2181" />
+<P1  x="293" y="477" id="2037" />
+<P2  x="298" y="524" id="2011" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="1480" index="41" uid="18f77c23-d770-43b2-a9ca-161802d8a987" >
 <father id="1482" num="0" />
@@ -2863,7 +2862,7 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from Send signal to stop state" value="null" />
 <TGConnectingPoint num="0" id="1488" />
-<P1  x="298" y="554" id="2182" />
+<P1  x="298" y="554" id="2012" />
 <P2  x="296" y="650" id="1939" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="1487" index="42" uid="a2a44349-5c04-4880-b1fb-76fa61d0f788" >
@@ -2898,8 +2897,8 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from state0 to Send signal" value="null" />
 <TGConnectingPoint num="0" id="1495" />
-<P1  x="326" y="457" id="2112" />
-<P2  x="442" y="497" id="2084" />
+<P1  x="326" y="457" id="2026" />
+<P2  x="442" y="497" id="2108" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="1494" index="43" uid="1286b08f-20a2-44ff-9ae2-d3d09cf02647" >
 <father id="1496" num="0" />
@@ -2932,7 +2931,7 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 <infoparam name="connector from Send signal to stop state" value="null" />
 <TGConnectingPoint num="0" id="1503" />
 <TGConnectingPoint num="1" id="1504" />
-<P1  x="442" y="527" id="2085" />
+<P1  x="442" y="527" id="2109" />
 <P2  x="323" y="748" id="1801" />
 <Point x="442" y="737" />
 <AutomaticDrawing  data="true" />
@@ -3016,7 +3015,7 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="null" />
 <TGConnectingPoint num="0" id="1519" />
-<P1  x="126" y="702" id="2017" />
+<P1  x="126" y="702" id="2125" />
 <P2  x="221" y="758" id="1802" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR><SUBCOMPONENT type="-1" id="1518" index="47" uid="96753e12-f1ba-45d7-9fc5-e71fe53eb22b" >
@@ -3721,14 +3720,14 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 <extraparam>
 </extraparam>
 </COMPONENT>
-<SUBCOMPONENT type="5106" id="2083" index="48" uid="52044bb2-8b01-4108-a1ac-b5e7886ea624" >
+<SUBCOMPONENT type="5104" id="2021" index="48" uid="8718a1dd-4942-43e5-b6ce-b5f78b82a355" >
 <father id="2264" num="0" />
-<cdparam x="53" y="653" />
-<sizeparam width="146" height="49" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="242" y="529" />
+<sizeparam width="112" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="0" maxX="431" minY="0" maxY="305" />
-<infoparam name="state0" value="CoffeeDelivered" />
+<cdrectangleparam minX="0" maxX="465" minY="0" maxY="334" />
+<infoparam name="Send signal" value="pushTeaButton()" />
 <TGConnectingPoint num="0" id="2011" />
 <TGConnectingPoint num="1" id="2012" />
 <TGConnectingPoint num="2" id="2013" />
@@ -3739,128 +3738,129 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 <TGConnectingPoint num="7" id="2018" />
 <TGConnectingPoint num="8" id="2019" />
 <TGConnectingPoint num="9" id="2020" />
-<TGConnectingPoint num="10" id="2021" />
-<TGConnectingPoint num="11" id="2022" />
-<TGConnectingPoint num="12" id="2023" />
-<TGConnectingPoint num="13" id="2024" />
-<TGConnectingPoint num="14" id="2025" />
-<TGConnectingPoint num="15" id="2026" />
-<TGConnectingPoint num="16" id="2027" />
-<TGConnectingPoint num="17" id="2028" />
-<TGConnectingPoint num="18" id="2029" />
-<TGConnectingPoint num="19" id="2030" />
-<TGConnectingPoint num="20" id="2031" />
-<TGConnectingPoint num="21" id="2032" />
-<TGConnectingPoint num="22" id="2033" />
-<TGConnectingPoint num="23" id="2034" />
-<TGConnectingPoint num="24" id="2035" />
-<TGConnectingPoint num="25" id="2036" />
-<TGConnectingPoint num="26" id="2037" />
-<TGConnectingPoint num="27" id="2038" />
-<TGConnectingPoint num="28" id="2039" />
-<TGConnectingPoint num="29" id="2040" />
-<TGConnectingPoint num="30" id="2041" />
-<TGConnectingPoint num="31" id="2042" />
-<TGConnectingPoint num="32" id="2043" />
-<TGConnectingPoint num="33" id="2044" />
-<TGConnectingPoint num="34" id="2045" />
-<TGConnectingPoint num="35" id="2046" />
-<TGConnectingPoint num="36" id="2047" />
-<TGConnectingPoint num="37" id="2048" />
-<TGConnectingPoint num="38" id="2049" />
-<TGConnectingPoint num="39" id="2050" />
-<TGConnectingPoint num="40" id="2051" />
-<TGConnectingPoint num="41" id="2052" />
-<TGConnectingPoint num="42" id="2053" />
-<TGConnectingPoint num="43" id="2054" />
-<TGConnectingPoint num="44" id="2055" />
-<TGConnectingPoint num="45" id="2056" />
-<TGConnectingPoint num="46" id="2057" />
-<TGConnectingPoint num="47" id="2058" />
-<TGConnectingPoint num="48" id="2059" />
-<TGConnectingPoint num="49" id="2060" />
-<TGConnectingPoint num="50" id="2061" />
-<TGConnectingPoint num="51" id="2062" />
-<TGConnectingPoint num="52" id="2063" />
-<TGConnectingPoint num="53" id="2064" />
-<TGConnectingPoint num="54" id="2065" />
-<TGConnectingPoint num="55" id="2066" />
-<TGConnectingPoint num="56" id="2067" />
-<TGConnectingPoint num="57" id="2068" />
-<TGConnectingPoint num="58" id="2069" />
-<TGConnectingPoint num="59" id="2070" />
-<TGConnectingPoint num="60" id="2071" />
-<TGConnectingPoint num="61" id="2072" />
-<TGConnectingPoint num="62" id="2073" />
-<TGConnectingPoint num="63" id="2074" />
-<TGConnectingPoint num="64" id="2075" />
-<TGConnectingPoint num="65" id="2076" />
-<TGConnectingPoint num="66" id="2077" />
-<TGConnectingPoint num="67" id="2078" />
-<TGConnectingPoint num="68" id="2079" />
-<TGConnectingPoint num="69" id="2080" />
-<TGConnectingPoint num="70" id="2081" />
-<TGConnectingPoint num="71" id="2082" />
-<extraparam>
-</extraparam>
+<accessibility />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5103" id="2094" index="49" uid="9c813d39-192a-47ff-98b2-607e27617acf" >
+<SUBCOMPONENT type="5106" id="2094" index="49" uid="542c0583-8080-46a1-9ae2-775c6446817c" >
 <father id="2264" num="1" />
-<cdparam x="377" y="502" />
-<sizeparam width="130" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="194" y="437" />
+<sizeparam width="132" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="0" maxX="447" minY="0" maxY="334" />
-<infoparam name="Send signal" value="ejectCoin(nbOfCoins)" />
-<TGConnectingPoint num="0" id="2084" />
-<TGConnectingPoint num="1" id="2085" />
-<TGConnectingPoint num="2" id="2086" />
-<TGConnectingPoint num="3" id="2087" />
-<TGConnectingPoint num="4" id="2088" />
-<TGConnectingPoint num="5" id="2089" />
-<TGConnectingPoint num="6" id="2090" />
-<TGConnectingPoint num="7" id="2091" />
-<TGConnectingPoint num="8" id="2092" />
-<TGConnectingPoint num="9" id="2093" />
-<accessibility />
+<cdrectangleparam minX="0" maxX="445" minY="0" maxY="314" />
+<infoparam name="state0" value="WaitingForSelection" />
+<TGConnectingPoint num="0" id="2022" />
+<TGConnectingPoint num="1" id="2023" />
+<TGConnectingPoint num="2" id="2024" />
+<TGConnectingPoint num="3" id="2025" />
+<TGConnectingPoint num="4" id="2026" />
+<TGConnectingPoint num="5" id="2027" />
+<TGConnectingPoint num="6" id="2028" />
+<TGConnectingPoint num="7" id="2029" />
+<TGConnectingPoint num="8" id="2030" />
+<TGConnectingPoint num="9" id="2031" />
+<TGConnectingPoint num="10" id="2032" />
+<TGConnectingPoint num="11" id="2033" />
+<TGConnectingPoint num="12" id="2034" />
+<TGConnectingPoint num="13" id="2035" />
+<TGConnectingPoint num="14" id="2036" />
+<TGConnectingPoint num="15" id="2037" />
+<TGConnectingPoint num="16" id="2038" />
+<TGConnectingPoint num="17" id="2039" />
+<TGConnectingPoint num="18" id="2040" />
+<TGConnectingPoint num="19" id="2041" />
+<TGConnectingPoint num="20" id="2042" />
+<TGConnectingPoint num="21" id="2043" />
+<TGConnectingPoint num="22" id="2044" />
+<TGConnectingPoint num="23" id="2045" />
+<TGConnectingPoint num="24" id="2046" />
+<TGConnectingPoint num="25" id="2047" />
+<TGConnectingPoint num="26" id="2048" />
+<TGConnectingPoint num="27" id="2049" />
+<TGConnectingPoint num="28" id="2050" />
+<TGConnectingPoint num="29" id="2051" />
+<TGConnectingPoint num="30" id="2052" />
+<TGConnectingPoint num="31" id="2053" />
+<TGConnectingPoint num="32" id="2054" />
+<TGConnectingPoint num="33" id="2055" />
+<TGConnectingPoint num="34" id="2056" />
+<TGConnectingPoint num="35" id="2057" />
+<TGConnectingPoint num="36" id="2058" />
+<TGConnectingPoint num="37" id="2059" />
+<TGConnectingPoint num="38" id="2060" />
+<TGConnectingPoint num="39" id="2061" />
+<TGConnectingPoint num="40" id="2062" />
+<TGConnectingPoint num="41" id="2063" />
+<TGConnectingPoint num="42" id="2064" />
+<TGConnectingPoint num="43" id="2065" />
+<TGConnectingPoint num="44" id="2066" />
+<TGConnectingPoint num="45" id="2067" />
+<TGConnectingPoint num="46" id="2068" />
+<TGConnectingPoint num="47" id="2069" />
+<TGConnectingPoint num="48" id="2070" />
+<TGConnectingPoint num="49" id="2071" />
+<TGConnectingPoint num="50" id="2072" />
+<TGConnectingPoint num="51" id="2073" />
+<TGConnectingPoint num="52" id="2074" />
+<TGConnectingPoint num="53" id="2075" />
+<TGConnectingPoint num="54" id="2076" />
+<TGConnectingPoint num="55" id="2077" />
+<TGConnectingPoint num="56" id="2078" />
+<TGConnectingPoint num="57" id="2079" />
+<TGConnectingPoint num="58" id="2080" />
+<TGConnectingPoint num="59" id="2081" />
+<TGConnectingPoint num="60" id="2082" />
+<TGConnectingPoint num="61" id="2083" />
+<TGConnectingPoint num="62" id="2084" />
+<TGConnectingPoint num="63" id="2085" />
+<TGConnectingPoint num="64" id="2086" />
+<TGConnectingPoint num="65" id="2087" />
+<TGConnectingPoint num="66" id="2088" />
+<TGConnectingPoint num="67" id="2089" />
+<TGConnectingPoint num="68" id="2090" />
+<TGConnectingPoint num="69" id="2091" />
+<TGConnectingPoint num="70" id="2092" />
+<TGConnectingPoint num="71" id="2093" />
+<latencyCheck />
+<extraparam>
+</extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5104" id="2105" index="50" uid="f73b994e-357b-446d-a13d-97a66d7a4653" >
+<SUBCOMPONENT type="5100" id="2096" index="50" uid="d60fd6d2-14be-4b25-b424-35a9ae5e3ba3" >
 <father id="2264" num="2" />
+<cdparam x="254" y="401" />
+<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="562" minY="0" maxY="339" />
+<infoparam name="start state" value="null" />
+<TGConnectingPoint num="0" id="2095" />
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5104" id="2107" index="51" uid="f73b994e-357b-446d-a13d-97a66d7a4653" >
+<father id="2264" num="3" />
 <cdparam x="63" y="529" />
 <sizeparam width="127" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="0" maxX="450" minY="0" maxY="334" />
 <infoparam name="Send signal" value="pushCoffeeButton()" />
-<TGConnectingPoint num="0" id="2095" />
-<TGConnectingPoint num="1" id="2096" />
-<TGConnectingPoint num="2" id="2097" />
-<TGConnectingPoint num="3" id="2098" />
-<TGConnectingPoint num="4" id="2099" />
-<TGConnectingPoint num="5" id="2100" />
-<TGConnectingPoint num="6" id="2101" />
-<TGConnectingPoint num="7" id="2102" />
-<TGConnectingPoint num="8" id="2103" />
-<TGConnectingPoint num="9" id="2104" />
+<TGConnectingPoint num="0" id="2097" />
+<TGConnectingPoint num="1" id="2098" />
+<TGConnectingPoint num="2" id="2099" />
+<TGConnectingPoint num="3" id="2100" />
+<TGConnectingPoint num="4" id="2101" />
+<TGConnectingPoint num="5" id="2102" />
+<TGConnectingPoint num="6" id="2103" />
+<TGConnectingPoint num="7" id="2104" />
+<TGConnectingPoint num="8" id="2105" />
+<TGConnectingPoint num="9" id="2106" />
 <accessibility />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5100" id="2107" index="51" uid="d60fd6d2-14be-4b25-b424-35a9ae5e3ba3" >
-<father id="2264" num="3" />
-<cdparam x="254" y="401" />
-<sizeparam width="15" height="15" minWidth="1" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
-<hidden value="false" />
-<cdrectangleparam minX="0" maxX="562" minY="0" maxY="339" />
-<infoparam name="start state" value="null" />
-<TGConnectingPoint num="0" id="2106" />
-</SUBCOMPONENT>
-<SUBCOMPONENT type="5106" id="2180" index="52" uid="542c0583-8080-46a1-9ae2-775c6446817c" >
+<SUBCOMPONENT type="5103" id="2118" index="52" uid="9c813d39-192a-47ff-98b2-607e27617acf" >
 <father id="2264" num="4" />
-<cdparam x="194" y="437" />
-<sizeparam width="132" height="40" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="377" y="502" />
+<sizeparam width="130" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="0" maxX="445" minY="0" maxY="314" />
-<infoparam name="state0" value="WaitingForSelection" />
+<cdrectangleparam minX="0" maxX="447" minY="0" maxY="334" />
+<infoparam name="Send signal" value="ejectCoin(nbOfCoins)" />
 <TGConnectingPoint num="0" id="2108" />
 <TGConnectingPoint num="1" id="2109" />
 <TGConnectingPoint num="2" id="2110" />
@@ -3871,91 +3871,90 @@ CoffeeMachine.CoffeeDelivered --&gt; CoffeeMachine.nbOfCoins&lt;2
 <TGConnectingPoint num="7" id="2115" />
 <TGConnectingPoint num="8" id="2116" />
 <TGConnectingPoint num="9" id="2117" />
-<TGConnectingPoint num="10" id="2118" />
-<TGConnectingPoint num="11" id="2119" />
-<TGConnectingPoint num="12" id="2120" />
-<TGConnectingPoint num="13" id="2121" />
-<TGConnectingPoint num="14" id="2122" />
-<TGConnectingPoint num="15" id="2123" />
-<TGConnectingPoint num="16" id="2124" />
-<TGConnectingPoint num="17" id="2125" />
-<TGConnectingPoint num="18" id="2126" />
-<TGConnectingPoint num="19" id="2127" />
-<TGConnectingPoint num="20" id="2128" />
-<TGConnectingPoint num="21" id="2129" />
-<TGConnectingPoint num="22" id="2130" />
-<TGConnectingPoint num="23" id="2131" />
-<TGConnectingPoint num="24" id="2132" />
-<TGConnectingPoint num="25" id="2133" />
-<TGConnectingPoint num="26" id="2134" />
-<TGConnectingPoint num="27" id="2135" />
-<TGConnectingPoint num="28" id="2136" />
-<TGConnectingPoint num="29" id="2137" />
-<TGConnectingPoint num="30" id="2138" />
-<TGConnectingPoint num="31" id="2139" />
-<TGConnectingPoint num="32" id="2140" />
-<TGConnectingPoint num="33" id="2141" />
-<TGConnectingPoint num="34" id="2142" />
-<TGConnectingPoint num="35" id="2143" />
-<TGConnectingPoint num="36" id="2144" />
-<TGConnectingPoint num="37" id="2145" />
-<TGConnectingPoint num="38" id="2146" />
-<TGConnectingPoint num="39" id="2147" />
-<TGConnectingPoint num="40" id="2148" />
-<TGConnectingPoint num="41" id="2149" />
-<TGConnectingPoint num="42" id="2150" />
-<TGConnectingPoint num="43" id="2151" />
-<TGConnectingPoint num="44" id="2152" />
-<TGConnectingPoint num="45" id="2153" />
-<TGConnectingPoint num="46" id="2154" />
-<TGConnectingPoint num="47" id="2155" />
-<TGConnectingPoint num="48" id="2156" />
-<TGConnectingPoint num="49" id="2157" />
-<TGConnectingPoint num="50" id="2158" />
-<TGConnectingPoint num="51" id="2159" />
-<TGConnectingPoint num="52" id="2160" />
-<TGConnectingPoint num="53" id="2161" />
-<TGConnectingPoint num="54" id="2162" />
-<TGConnectingPoint num="55" id="2163" />
-<TGConnectingPoint num="56" id="2164" />
-<TGConnectingPoint num="57" id="2165" />
-<TGConnectingPoint num="58" id="2166" />
-<TGConnectingPoint num="59" id="2167" />
-<TGConnectingPoint num="60" id="2168" />
-<TGConnectingPoint num="61" id="2169" />
-<TGConnectingPoint num="62" id="2170" />
-<TGConnectingPoint num="63" id="2171" />
-<TGConnectingPoint num="64" id="2172" />
-<TGConnectingPoint num="65" id="2173" />
-<TGConnectingPoint num="66" id="2174" />
-<TGConnectingPoint num="67" id="2175" />
-<TGConnectingPoint num="68" id="2176" />
-<TGConnectingPoint num="69" id="2177" />
-<TGConnectingPoint num="70" id="2178" />
-<TGConnectingPoint num="71" id="2179" />
-<latencyCheck />
-<extraparam>
-</extraparam>
+<accessibility />
 </SUBCOMPONENT>
-<SUBCOMPONENT type="5104" id="2191" index="53" uid="8718a1dd-4942-43e5-b6ce-b5f78b82a355" >
+<SUBCOMPONENT type="5106" id="2191" index="53" uid="52044bb2-8b01-4108-a1ac-b5e7886ea624" >
 <father id="2264" num="5" />
-<cdparam x="242" y="529" />
-<sizeparam width="112" height="20" minWidth="30" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="53" y="653" />
+<sizeparam width="146" height="49" minWidth="40" minHeight="30" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
-<cdrectangleparam minX="0" maxX="465" minY="0" maxY="334" />
-<infoparam name="Send signal" value="pushTeaButton()" />
-<TGConnectingPoint num="0" id="2181" />
-<TGConnectingPoint num="1" id="2182" />
-<TGConnectingPoint num="2" id="2183" />
-<TGConnectingPoint num="3" id="2184" />
-<TGConnectingPoint num="4" id="2185" />
-<TGConnectingPoint num="5" id="2186" />
-<TGConnectingPoint num="6" id="2187" />
-<TGConnectingPoint num="7" id="2188" />
-<TGConnectingPoint num="8" id="2189" />
-<TGConnectingPoint num="9" id="2190" />
-<accessibility />
+<cdrectangleparam minX="0" maxX="431" minY="0" maxY="305" />
+<infoparam name="state0" value="CoffeeDelivered" />
+<TGConnectingPoint num="0" id="2119" />
+<TGConnectingPoint num="1" id="2120" />
+<TGConnectingPoint num="2" id="2121" />
+<TGConnectingPoint num="3" id="2122" />
+<TGConnectingPoint num="4" id="2123" />
+<TGConnectingPoint num="5" id="2124" />
+<TGConnectingPoint num="6" id="2125" />
+<TGConnectingPoint num="7" id="2126" />
+<TGConnectingPoint num="8" id="2127" />
+<TGConnectingPoint num="9" id="2128" />
+<TGConnectingPoint num="10" id="2129" />
+<TGConnectingPoint num="11" id="2130" />
+<TGConnectingPoint num="12" id="2131" />
+<TGConnectingPoint num="13" id="2132" />
+<TGConnectingPoint num="14" id="2133" />
+<TGConnectingPoint num="15" id="2134" />
+<TGConnectingPoint num="16" id="2135" />
+<TGConnectingPoint num="17" id="2136" />
+<TGConnectingPoint num="18" id="2137" />
+<TGConnectingPoint num="19" id="2138" />
+<TGConnectingPoint num="20" id="2139" />
+<TGConnectingPoint num="21" id="2140" />
+<TGConnectingPoint num="22" id="2141" />
+<TGConnectingPoint num="23" id="2142" />
+<TGConnectingPoint num="24" id="2143" />
+<TGConnectingPoint num="25" id="2144" />
+<TGConnectingPoint num="26" id="2145" />
+<TGConnectingPoint num="27" id="2146" />
+<TGConnectingPoint num="28" id="2147" />
+<TGConnectingPoint num="29" id="2148" />
+<TGConnectingPoint num="30" id="2149" />
+<TGConnectingPoint num="31" id="2150" />
+<TGConnectingPoint num="32" id="2151" />
+<TGConnectingPoint num="33" id="2152" />
+<TGConnectingPoint num="34" id="2153" />
+<TGConnectingPoint num="35" id="2154" />
+<TGConnectingPoint num="36" id="2155" />
+<TGConnectingPoint num="37" id="2156" />
+<TGConnectingPoint num="38" id="2157" />
+<TGConnectingPoint num="39" id="2158" />
+<TGConnectingPoint num="40" id="2159" />
+<TGConnectingPoint num="41" id="2160" />
+<TGConnectingPoint num="42" id="2161" />
+<TGConnectingPoint num="43" id="2162" />
+<TGConnectingPoint num="44" id="2163" />
+<TGConnectingPoint num="45" id="2164" />
+<TGConnectingPoint num="46" id="2165" />
+<TGConnectingPoint num="47" id="2166" />
+<TGConnectingPoint num="48" id="2167" />
+<TGConnectingPoint num="49" id="2168" />
+<TGConnectingPoint num="50" id="2169" />
+<TGConnectingPoint num="51" id="2170" />
+<TGConnectingPoint num="52" id="2171" />
+<TGConnectingPoint num="53" id="2172" />
+<TGConnectingPoint num="54" id="2173" />
+<TGConnectingPoint num="55" id="2174" />
+<TGConnectingPoint num="56" id="2175" />
+<TGConnectingPoint num="57" id="2176" />
+<TGConnectingPoint num="58" id="2177" />
+<TGConnectingPoint num="59" id="2178" />
+<TGConnectingPoint num="60" id="2179" />
+<TGConnectingPoint num="61" id="2180" />
+<TGConnectingPoint num="62" id="2181" />
+<TGConnectingPoint num="63" id="2182" />
+<TGConnectingPoint num="64" id="2183" />
+<TGConnectingPoint num="65" id="2184" />
+<TGConnectingPoint num="66" id="2185" />
+<TGConnectingPoint num="67" id="2186" />
+<TGConnectingPoint num="68" id="2187" />
+<TGConnectingPoint num="69" id="2188" />
+<TGConnectingPoint num="70" id="2189" />
+<TGConnectingPoint num="71" id="2190" />
+<extraparam>
+</extraparam>
 </SUBCOMPONENT>
 
 
diff --git a/modeling/SysMLSec/stuxnet.xml b/modeling/SysMLSec/stuxnet.xml
index 09376035c1..7cbd9b29ac 100644
--- a/modeling/SysMLSec/stuxnet.xml
+++ b/modeling/SysMLSec/stuxnet.xml
@@ -1,107 +1,107 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
-<TURTLEGMODELING version="0.98-beta4">
+<TURTLEGMODELING version="1.0beta" ANIMATE_INTERACTIVE_SIMULATION="false" ACTIVATE_PENALTIES="true" UPDATE_INFORMATION_DIPLO_SIM="false" ANIMATE_WITH_INFO_DIPLO_SIM="true" OPEN_DIAG_DIPLO_SIM="false" LAST_SELECTED_MAIN_TAB="0" LAST_SELECTED_SUB_TAB="0">
 
 <Modeling type="AttackTree" nameTab="Attack Trees" >
 <AttackTreeDiagramPanel name="General_Stuxnet" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
-<CONNECTOR type="133" id="2" >
+<CONNECTOR type="133" id="2" index="0" uid="2d857734-5d79-4162-ba92-ecb69e46970c" >
 <cdparam x="692" y="443" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="" />
 <TGConnectingPoint num="0" id="1" />
-<P1  x="689" y="443" id="119" />
-<P2  x="848" y="258" id="54" />
+<P1  x="689" y="443" id="155" />
+<P2  x="848" y="258" id="66" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="133" id="4" >
+<CONNECTOR type="133" id="4" index="1" uid="d2f0febc-cbc0-4ffa-875b-a707658c77e1" >
 <cdparam x="353" y="337" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="1" />
 <TGConnectingPoint num="0" id="3" />
-<P1  x="396" y="355" id="170" />
-<P2  x="517" y="355" id="92" />
+<P1  x="396" y="355" id="218" />
+<P2  x="517" y="355" id="116" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="133" id="6" >
+<CONNECTOR type="133" id="6" index="2" uid="12883a5c-3c12-4b16-abca-bd0052bddcf8" >
 <cdparam x="687" y="369" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
 <TGConnectingPoint num="0" id="5" />
-<P1  x="592" y="380" id="94" />
-<P2  x="614" y="423" id="117" />
+<P1  x="592" y="380" id="118" />
+<P2  x="614" y="423" id="153" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="133" id="8" >
+<CONNECTOR type="133" id="8" index="3" uid="935e414e-5642-42fd-9567-cbb218dc77d8" >
 <cdparam x="679" y="296" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="2" />
 <TGConnectingPoint num="0" id="7" />
-<P1  x="630" y="282" id="107" />
-<P2  x="592" y="330" id="91" />
+<P1  x="630" y="282" id="131" />
+<P2  x="592" y="330" id="115" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="133" id="10" >
+<CONNECTOR type="133" id="10" index="4" uid="d25ef096-b1aa-4c48-9bae-a6cd693bf98e" >
 <cdparam x="474" y="346" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
 <TGConnectingPoint num="0" id="9" />
-<P1  x="332" y="276" id="158" />
-<P2  x="346" y="335" id="168" />
+<P1  x="332" y="276" id="206" />
+<P2  x="346" y="335" id="216" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="133" id="12" >
+<CONNECTOR type="133" id="12" index="5" uid="69c7841a-9803-4c8c-ba96-3061801cc703" >
 <cdparam x="409" y="247" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="2" />
 <TGConnectingPoint num="0" id="11" />
-<P1  x="359" y="199" id="184" />
-<P2  x="332" y="226" id="155" />
+<P1  x="359" y="199" id="244" />
+<P2  x="332" y="226" id="203" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="133" id="14" >
+<CONNECTOR type="133" id="14" index="6" uid="68d26038-842c-412e-933a-35c465c947a2" >
 <cdparam x="253" y="320" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="1" />
 <TGConnectingPoint num="0" id="13" />
 <P1  x="158" y="268" id="17" />
-<P2  x="257" y="251" id="156" />
+<P2  x="257" y="251" id="204" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<COMPONENT type="1400" id="52" >
+<COMPONENT type="1400" id="64" index="7" uid="e0d37379-069b-4351-8285-833b25252bb2" >
 <cdparam x="24" y="200" />
 <sizeparam width="189" height="120" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Block1" value="Compromised_Devices" />
-<TGConnectingPoint num="0" id="28" />
-<TGConnectingPoint num="1" id="29" />
-<TGConnectingPoint num="2" id="30" />
-<TGConnectingPoint num="3" id="31" />
-<TGConnectingPoint num="4" id="32" />
-<TGConnectingPoint num="5" id="33" />
-<TGConnectingPoint num="6" id="34" />
-<TGConnectingPoint num="7" id="35" />
-<TGConnectingPoint num="8" id="36" />
-<TGConnectingPoint num="9" id="37" />
-<TGConnectingPoint num="10" id="38" />
-<TGConnectingPoint num="11" id="39" />
-<TGConnectingPoint num="12" id="40" />
-<TGConnectingPoint num="13" id="41" />
-<TGConnectingPoint num="14" id="42" />
-<TGConnectingPoint num="15" id="43" />
-<TGConnectingPoint num="16" id="44" />
-<TGConnectingPoint num="17" id="45" />
-<TGConnectingPoint num="18" id="46" />
-<TGConnectingPoint num="19" id="47" />
-<TGConnectingPoint num="20" id="48" />
-<TGConnectingPoint num="21" id="49" />
-<TGConnectingPoint num="22" id="50" />
-<TGConnectingPoint num="23" id="51" />
+<TGConnectingPoint num="0" id="40" />
+<TGConnectingPoint num="1" id="41" />
+<TGConnectingPoint num="2" id="42" />
+<TGConnectingPoint num="3" id="43" />
+<TGConnectingPoint num="4" id="44" />
+<TGConnectingPoint num="5" id="45" />
+<TGConnectingPoint num="6" id="46" />
+<TGConnectingPoint num="7" id="47" />
+<TGConnectingPoint num="8" id="48" />
+<TGConnectingPoint num="9" id="49" />
+<TGConnectingPoint num="10" id="50" />
+<TGConnectingPoint num="11" id="51" />
+<TGConnectingPoint num="12" id="52" />
+<TGConnectingPoint num="13" id="53" />
+<TGConnectingPoint num="14" id="54" />
+<TGConnectingPoint num="15" id="55" />
+<TGConnectingPoint num="16" id="56" />
+<TGConnectingPoint num="17" id="57" />
+<TGConnectingPoint num="18" id="58" />
+<TGConnectingPoint num="19" id="59" />
+<TGConnectingPoint num="20" id="60" />
+<TGConnectingPoint num="21" id="61" />
+<TGConnectingPoint num="22" id="62" />
+<TGConnectingPoint num="23" id="63" />
 </COMPONENT>
-<SUBCOMPONENT type="1401" id="27" >
-<father id="52" num="0" />
+<SUBCOMPONENT type="1401" id="39" index="12" uid="71198e3b-c87b-4491-bf31-d449352e1e67" >
+<father id="64" num="0" />
 <cdparam x="58" y="248" />
-<sizeparam width="100" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="100" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="0" maxX="89" minY="0" maxY="80" />
@@ -118,271 +118,343 @@
 <TGConnectingPoint num="9" id="24" />
 <TGConnectingPoint num="10" id="25" />
 <TGConnectingPoint num="11" id="26" />
+<TGConnectingPoint num="12" id="27" />
+<TGConnectingPoint num="13" id="28" />
+<TGConnectingPoint num="14" id="29" />
+<TGConnectingPoint num="15" id="30" />
+<TGConnectingPoint num="16" id="31" />
+<TGConnectingPoint num="17" id="32" />
+<TGConnectingPoint num="18" id="33" />
+<TGConnectingPoint num="19" id="34" />
+<TGConnectingPoint num="20" id="35" />
+<TGConnectingPoint num="21" id="36" />
+<TGConnectingPoint num="22" id="37" />
+<TGConnectingPoint num="23" id="38" />
 <extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="false" cost="0" experience="0" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="1401" id="65" >
+<COMPONENT type="1401" id="89" index="8" uid="83a63577-377f-4d71-b404-d20049a57cb6" >
 <cdparam x="848" y="238" />
-<sizeparam width="122" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="122" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="TGComponent" value="Modify_PLCs" />
-<TGConnectingPoint num="0" id="53" />
-<TGConnectingPoint num="1" id="54" />
-<TGConnectingPoint num="2" id="55" />
-<TGConnectingPoint num="3" id="56" />
-<TGConnectingPoint num="4" id="57" />
-<TGConnectingPoint num="5" id="58" />
-<TGConnectingPoint num="6" id="59" />
-<TGConnectingPoint num="7" id="60" />
-<TGConnectingPoint num="8" id="61" />
-<TGConnectingPoint num="9" id="62" />
-<TGConnectingPoint num="10" id="63" />
-<TGConnectingPoint num="11" id="64" />
+<TGConnectingPoint num="0" id="65" />
+<TGConnectingPoint num="1" id="66" />
+<TGConnectingPoint num="2" id="67" />
+<TGConnectingPoint num="3" id="68" />
+<TGConnectingPoint num="4" id="69" />
+<TGConnectingPoint num="5" id="70" />
+<TGConnectingPoint num="6" id="71" />
+<TGConnectingPoint num="7" id="72" />
+<TGConnectingPoint num="8" id="73" />
+<TGConnectingPoint num="9" id="74" />
+<TGConnectingPoint num="10" id="75" />
+<TGConnectingPoint num="11" id="76" />
+<TGConnectingPoint num="12" id="77" />
+<TGConnectingPoint num="13" id="78" />
+<TGConnectingPoint num="14" id="79" />
+<TGConnectingPoint num="15" id="80" />
+<TGConnectingPoint num="16" id="81" />
+<TGConnectingPoint num="17" id="82" />
+<TGConnectingPoint num="18" id="83" />
+<TGConnectingPoint num="19" id="84" />
+<TGConnectingPoint num="20" id="85" />
+<TGConnectingPoint num="21" id="86" />
+<TGConnectingPoint num="22" id="87" />
+<TGConnectingPoint num="23" id="88" />
 <extraparam>
-<info description="blah blah blah" root="true" />
+<info description="blah blah blah" root="true" cost="0" experience="0" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1400" id="90" >
+<COMPONENT type="1400" id="114" index="9" uid="60b1692b-9c02-4299-abd9-4559c93b4cb6" >
 <cdparam x="808" y="163" />
 <sizeparam width="213" height="200" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Block3" value="PLCs" />
-<TGConnectingPoint num="0" id="66" />
-<TGConnectingPoint num="1" id="67" />
-<TGConnectingPoint num="2" id="68" />
-<TGConnectingPoint num="3" id="69" />
-<TGConnectingPoint num="4" id="70" />
-<TGConnectingPoint num="5" id="71" />
-<TGConnectingPoint num="6" id="72" />
-<TGConnectingPoint num="7" id="73" />
-<TGConnectingPoint num="8" id="74" />
-<TGConnectingPoint num="9" id="75" />
-<TGConnectingPoint num="10" id="76" />
-<TGConnectingPoint num="11" id="77" />
-<TGConnectingPoint num="12" id="78" />
-<TGConnectingPoint num="13" id="79" />
-<TGConnectingPoint num="14" id="80" />
-<TGConnectingPoint num="15" id="81" />
-<TGConnectingPoint num="16" id="82" />
-<TGConnectingPoint num="17" id="83" />
-<TGConnectingPoint num="18" id="84" />
-<TGConnectingPoint num="19" id="85" />
-<TGConnectingPoint num="20" id="86" />
-<TGConnectingPoint num="21" id="87" />
-<TGConnectingPoint num="22" id="88" />
-<TGConnectingPoint num="23" id="89" />
+<TGConnectingPoint num="0" id="90" />
+<TGConnectingPoint num="1" id="91" />
+<TGConnectingPoint num="2" id="92" />
+<TGConnectingPoint num="3" id="93" />
+<TGConnectingPoint num="4" id="94" />
+<TGConnectingPoint num="5" id="95" />
+<TGConnectingPoint num="6" id="96" />
+<TGConnectingPoint num="7" id="97" />
+<TGConnectingPoint num="8" id="98" />
+<TGConnectingPoint num="9" id="99" />
+<TGConnectingPoint num="10" id="100" />
+<TGConnectingPoint num="11" id="101" />
+<TGConnectingPoint num="12" id="102" />
+<TGConnectingPoint num="13" id="103" />
+<TGConnectingPoint num="14" id="104" />
+<TGConnectingPoint num="15" id="105" />
+<TGConnectingPoint num="16" id="106" />
+<TGConnectingPoint num="17" id="107" />
+<TGConnectingPoint num="18" id="108" />
+<TGConnectingPoint num="19" id="109" />
+<TGConnectingPoint num="20" id="110" />
+<TGConnectingPoint num="21" id="111" />
+<TGConnectingPoint num="22" id="112" />
+<TGConnectingPoint num="23" id="113" />
 </COMPONENT>
 
-<COMPONENT type="1400" id="154" >
+<COMPONENT type="1400" id="202" index="10" uid="129c92c9-150a-4d15-b7d7-63c88df1039a" >
 <cdparam x="457" y="207" />
 <sizeparam width="333" height="287" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Block2" value="S7_Software" />
-<TGConnectingPoint num="0" id="130" />
-<TGConnectingPoint num="1" id="131" />
-<TGConnectingPoint num="2" id="132" />
-<TGConnectingPoint num="3" id="133" />
-<TGConnectingPoint num="4" id="134" />
-<TGConnectingPoint num="5" id="135" />
-<TGConnectingPoint num="6" id="136" />
-<TGConnectingPoint num="7" id="137" />
-<TGConnectingPoint num="8" id="138" />
-<TGConnectingPoint num="9" id="139" />
-<TGConnectingPoint num="10" id="140" />
-<TGConnectingPoint num="11" id="141" />
-<TGConnectingPoint num="12" id="142" />
-<TGConnectingPoint num="13" id="143" />
-<TGConnectingPoint num="14" id="144" />
-<TGConnectingPoint num="15" id="145" />
-<TGConnectingPoint num="16" id="146" />
-<TGConnectingPoint num="17" id="147" />
-<TGConnectingPoint num="18" id="148" />
-<TGConnectingPoint num="19" id="149" />
-<TGConnectingPoint num="20" id="150" />
-<TGConnectingPoint num="21" id="151" />
-<TGConnectingPoint num="22" id="152" />
-<TGConnectingPoint num="23" id="153" />
+<TGConnectingPoint num="0" id="178" />
+<TGConnectingPoint num="1" id="179" />
+<TGConnectingPoint num="2" id="180" />
+<TGConnectingPoint num="3" id="181" />
+<TGConnectingPoint num="4" id="182" />
+<TGConnectingPoint num="5" id="183" />
+<TGConnectingPoint num="6" id="184" />
+<TGConnectingPoint num="7" id="185" />
+<TGConnectingPoint num="8" id="186" />
+<TGConnectingPoint num="9" id="187" />
+<TGConnectingPoint num="10" id="188" />
+<TGConnectingPoint num="11" id="189" />
+<TGConnectingPoint num="12" id="190" />
+<TGConnectingPoint num="13" id="191" />
+<TGConnectingPoint num="14" id="192" />
+<TGConnectingPoint num="15" id="193" />
+<TGConnectingPoint num="16" id="194" />
+<TGConnectingPoint num="17" id="195" />
+<TGConnectingPoint num="18" id="196" />
+<TGConnectingPoint num="19" id="197" />
+<TGConnectingPoint num="20" id="198" />
+<TGConnectingPoint num="21" id="199" />
+<TGConnectingPoint num="22" id="200" />
+<TGConnectingPoint num="23" id="201" />
 </COMPONENT>
-<SUBCOMPONENT type="1402" id="103" >
-<father id="154" num="0" />
+<SUBCOMPONENT type="1402" id="127" index="13" uid="f56b296a-dfb6-4350-ab26-9bcf828e4ec8" >
+<father id="202" num="0" />
 <cdparam x="517" y="330" />
-<sizeparam width="150" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="150" height="50" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="100" minY="0" maxY="150" />
 <infoparam name="TGComponent" value="&lt;&lt;AND&gt;&gt;" />
-<TGConnectingPoint num="0" id="91" />
-<TGConnectingPoint num="1" id="92" />
-<TGConnectingPoint num="2" id="93" />
-<TGConnectingPoint num="3" id="94" />
-<TGConnectingPoint num="4" id="95" />
-<TGConnectingPoint num="5" id="96" />
-<TGConnectingPoint num="6" id="97" />
-<TGConnectingPoint num="7" id="98" />
-<TGConnectingPoint num="8" id="99" />
-<TGConnectingPoint num="9" id="100" />
-<TGConnectingPoint num="10" id="101" />
-<TGConnectingPoint num="11" id="102" />
+<TGConnectingPoint num="0" id="115" />
+<TGConnectingPoint num="1" id="116" />
+<TGConnectingPoint num="2" id="117" />
+<TGConnectingPoint num="3" id="118" />
+<TGConnectingPoint num="4" id="119" />
+<TGConnectingPoint num="5" id="120" />
+<TGConnectingPoint num="6" id="121" />
+<TGConnectingPoint num="7" id="122" />
+<TGConnectingPoint num="8" id="123" />
+<TGConnectingPoint num="9" id="124" />
+<TGConnectingPoint num="10" id="125" />
+<TGConnectingPoint num="11" id="126" />
 <extraparam>
 <info equation="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="116" >
-<father id="154" num="1" />
+<SUBCOMPONENT type="1401" id="152" index="14" uid="4f4f72af-713c-44f6-8943-f87b9b32d401" >
+<father id="202" num="1" />
 <cdparam x="510" y="242" />
-<sizeparam width="240" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="240" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="0" maxX="93" minY="0" maxY="247" />
 <infoparam name="TGComponent" value="Exploit_Vulnerabilities_Of_S7_Software" />
-<TGConnectingPoint num="0" id="104" />
-<TGConnectingPoint num="1" id="105" />
-<TGConnectingPoint num="2" id="106" />
-<TGConnectingPoint num="3" id="107" />
-<TGConnectingPoint num="4" id="108" />
-<TGConnectingPoint num="5" id="109" />
-<TGConnectingPoint num="6" id="110" />
-<TGConnectingPoint num="7" id="111" />
-<TGConnectingPoint num="8" id="112" />
-<TGConnectingPoint num="9" id="113" />
-<TGConnectingPoint num="10" id="114" />
-<TGConnectingPoint num="11" id="115" />
+<TGConnectingPoint num="0" id="128" />
+<TGConnectingPoint num="1" id="129" />
+<TGConnectingPoint num="2" id="130" />
+<TGConnectingPoint num="3" id="131" />
+<TGConnectingPoint num="4" id="132" />
+<TGConnectingPoint num="5" id="133" />
+<TGConnectingPoint num="6" id="134" />
+<TGConnectingPoint num="7" id="135" />
+<TGConnectingPoint num="8" id="136" />
+<TGConnectingPoint num="9" id="137" />
+<TGConnectingPoint num="10" id="138" />
+<TGConnectingPoint num="11" id="139" />
+<TGConnectingPoint num="12" id="140" />
+<TGConnectingPoint num="13" id="141" />
+<TGConnectingPoint num="14" id="142" />
+<TGConnectingPoint num="15" id="143" />
+<TGConnectingPoint num="16" id="144" />
+<TGConnectingPoint num="17" id="145" />
+<TGConnectingPoint num="18" id="146" />
+<TGConnectingPoint num="19" id="147" />
+<TGConnectingPoint num="20" id="148" />
+<TGConnectingPoint num="21" id="149" />
+<TGConnectingPoint num="22" id="150" />
+<TGConnectingPoint num="23" id="151" />
 <extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="false" cost="0" experience="0" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="129" >
-<father id="154" num="2" />
+<SUBCOMPONENT type="1401" id="177" index="15" uid="41d980af-0ae6-4518-bcfc-582882ecbdb6" >
+<father id="202" num="2" />
 <cdparam x="540" y="423" />
-<sizeparam width="149" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="149" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="0" maxX="184" minY="0" maxY="247" />
 <infoparam name="TGComponent" value="Inject_To_Project_Files" />
-<TGConnectingPoint num="0" id="117" />
-<TGConnectingPoint num="1" id="118" />
-<TGConnectingPoint num="2" id="119" />
-<TGConnectingPoint num="3" id="120" />
-<TGConnectingPoint num="4" id="121" />
-<TGConnectingPoint num="5" id="122" />
-<TGConnectingPoint num="6" id="123" />
-<TGConnectingPoint num="7" id="124" />
-<TGConnectingPoint num="8" id="125" />
-<TGConnectingPoint num="9" id="126" />
-<TGConnectingPoint num="10" id="127" />
-<TGConnectingPoint num="11" id="128" />
+<TGConnectingPoint num="0" id="153" />
+<TGConnectingPoint num="1" id="154" />
+<TGConnectingPoint num="2" id="155" />
+<TGConnectingPoint num="3" id="156" />
+<TGConnectingPoint num="4" id="157" />
+<TGConnectingPoint num="5" id="158" />
+<TGConnectingPoint num="6" id="159" />
+<TGConnectingPoint num="7" id="160" />
+<TGConnectingPoint num="8" id="161" />
+<TGConnectingPoint num="9" id="162" />
+<TGConnectingPoint num="10" id="163" />
+<TGConnectingPoint num="11" id="164" />
+<TGConnectingPoint num="12" id="165" />
+<TGConnectingPoint num="13" id="166" />
+<TGConnectingPoint num="14" id="167" />
+<TGConnectingPoint num="15" id="168" />
+<TGConnectingPoint num="16" id="169" />
+<TGConnectingPoint num="17" id="170" />
+<TGConnectingPoint num="18" id="171" />
+<TGConnectingPoint num="19" id="172" />
+<TGConnectingPoint num="20" id="173" />
+<TGConnectingPoint num="21" id="174" />
+<TGConnectingPoint num="22" id="175" />
+<TGConnectingPoint num="23" id="176" />
 <accessibility />
 <extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="false" cost="0" experience="0" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="1400" id="218" >
+<COMPONENT type="1400" id="290" index="11" uid="44624b0d-5721-4665-99df-4a0437b8b89b" >
 <cdparam x="237" y="129" />
 <sizeparam width="562" height="370" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Block0" value="Windows_32bit" />
-<TGConnectingPoint num="0" id="194" />
-<TGConnectingPoint num="1" id="195" />
-<TGConnectingPoint num="2" id="196" />
-<TGConnectingPoint num="3" id="197" />
-<TGConnectingPoint num="4" id="198" />
-<TGConnectingPoint num="5" id="199" />
-<TGConnectingPoint num="6" id="200" />
-<TGConnectingPoint num="7" id="201" />
-<TGConnectingPoint num="8" id="202" />
-<TGConnectingPoint num="9" id="203" />
-<TGConnectingPoint num="10" id="204" />
-<TGConnectingPoint num="11" id="205" />
-<TGConnectingPoint num="12" id="206" />
-<TGConnectingPoint num="13" id="207" />
-<TGConnectingPoint num="14" id="208" />
-<TGConnectingPoint num="15" id="209" />
-<TGConnectingPoint num="16" id="210" />
-<TGConnectingPoint num="17" id="211" />
-<TGConnectingPoint num="18" id="212" />
-<TGConnectingPoint num="19" id="213" />
-<TGConnectingPoint num="20" id="214" />
-<TGConnectingPoint num="21" id="215" />
-<TGConnectingPoint num="22" id="216" />
-<TGConnectingPoint num="23" id="217" />
+<TGConnectingPoint num="0" id="266" />
+<TGConnectingPoint num="1" id="267" />
+<TGConnectingPoint num="2" id="268" />
+<TGConnectingPoint num="3" id="269" />
+<TGConnectingPoint num="4" id="270" />
+<TGConnectingPoint num="5" id="271" />
+<TGConnectingPoint num="6" id="272" />
+<TGConnectingPoint num="7" id="273" />
+<TGConnectingPoint num="8" id="274" />
+<TGConnectingPoint num="9" id="275" />
+<TGConnectingPoint num="10" id="276" />
+<TGConnectingPoint num="11" id="277" />
+<TGConnectingPoint num="12" id="278" />
+<TGConnectingPoint num="13" id="279" />
+<TGConnectingPoint num="14" id="280" />
+<TGConnectingPoint num="15" id="281" />
+<TGConnectingPoint num="16" id="282" />
+<TGConnectingPoint num="17" id="283" />
+<TGConnectingPoint num="18" id="284" />
+<TGConnectingPoint num="19" id="285" />
+<TGConnectingPoint num="20" id="286" />
+<TGConnectingPoint num="21" id="287" />
+<TGConnectingPoint num="22" id="288" />
+<TGConnectingPoint num="23" id="289" />
 </COMPONENT>
-<SUBCOMPONENT type="1402" id="167" >
-<father id="218" num="0" />
+<SUBCOMPONENT type="1402" id="215" index="16" uid="124821b4-21a0-4454-96a0-2edd8b97b48c" >
+<father id="290" num="0" />
 <cdparam x="257" y="226" />
-<sizeparam width="150" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="150" height="50" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="232" minY="0" maxY="191" />
 <infoparam name="TGComponent" value="&lt;&lt;AND&gt;&gt;" />
-<TGConnectingPoint num="0" id="155" />
-<TGConnectingPoint num="1" id="156" />
-<TGConnectingPoint num="2" id="157" />
-<TGConnectingPoint num="3" id="158" />
-<TGConnectingPoint num="4" id="159" />
-<TGConnectingPoint num="5" id="160" />
-<TGConnectingPoint num="6" id="161" />
-<TGConnectingPoint num="7" id="162" />
-<TGConnectingPoint num="8" id="163" />
-<TGConnectingPoint num="9" id="164" />
-<TGConnectingPoint num="10" id="165" />
-<TGConnectingPoint num="11" id="166" />
+<TGConnectingPoint num="0" id="203" />
+<TGConnectingPoint num="1" id="204" />
+<TGConnectingPoint num="2" id="205" />
+<TGConnectingPoint num="3" id="206" />
+<TGConnectingPoint num="4" id="207" />
+<TGConnectingPoint num="5" id="208" />
+<TGConnectingPoint num="6" id="209" />
+<TGConnectingPoint num="7" id="210" />
+<TGConnectingPoint num="8" id="211" />
+<TGConnectingPoint num="9" id="212" />
+<TGConnectingPoint num="10" id="213" />
+<TGConnectingPoint num="11" id="214" />
 <extraparam>
 <info equation="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="180" >
-<father id="218" num="1" />
+<SUBCOMPONENT type="1401" id="240" index="17" uid="5bfc85de-889a-469a-84cd-13cd1dd7b8c8" >
+<father id="290" num="1" />
 <cdparam x="296" y="335" />
-<sizeparam width="100" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="100" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="0" maxX="462" minY="0" maxY="330" />
 <infoparam name="TGComponent" value="Execute" />
-<TGConnectingPoint num="0" id="168" />
-<TGConnectingPoint num="1" id="169" />
-<TGConnectingPoint num="2" id="170" />
-<TGConnectingPoint num="3" id="171" />
-<TGConnectingPoint num="4" id="172" />
-<TGConnectingPoint num="5" id="173" />
-<TGConnectingPoint num="6" id="174" />
-<TGConnectingPoint num="7" id="175" />
-<TGConnectingPoint num="8" id="176" />
-<TGConnectingPoint num="9" id="177" />
-<TGConnectingPoint num="10" id="178" />
-<TGConnectingPoint num="11" id="179" />
+<TGConnectingPoint num="0" id="216" />
+<TGConnectingPoint num="1" id="217" />
+<TGConnectingPoint num="2" id="218" />
+<TGConnectingPoint num="3" id="219" />
+<TGConnectingPoint num="4" id="220" />
+<TGConnectingPoint num="5" id="221" />
+<TGConnectingPoint num="6" id="222" />
+<TGConnectingPoint num="7" id="223" />
+<TGConnectingPoint num="8" id="224" />
+<TGConnectingPoint num="9" id="225" />
+<TGConnectingPoint num="10" id="226" />
+<TGConnectingPoint num="11" id="227" />
+<TGConnectingPoint num="12" id="228" />
+<TGConnectingPoint num="13" id="229" />
+<TGConnectingPoint num="14" id="230" />
+<TGConnectingPoint num="15" id="231" />
+<TGConnectingPoint num="16" id="232" />
+<TGConnectingPoint num="17" id="233" />
+<TGConnectingPoint num="18" id="234" />
+<TGConnectingPoint num="19" id="235" />
+<TGConnectingPoint num="20" id="236" />
+<TGConnectingPoint num="21" id="237" />
+<TGConnectingPoint num="22" id="238" />
+<TGConnectingPoint num="23" id="239" />
 <extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="false" cost="0" experience="0" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="193" >
-<father id="218" num="2" />
+<SUBCOMPONENT type="1401" id="265" index="18" uid="68124866-6f25-421f-9f5a-47d0c46d3ecc" >
+<father id="290" num="2" />
 <cdparam x="237" y="159" />
-<sizeparam width="244" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="244" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="0" maxX="318" minY="0" maxY="330" />
 <infoparam name="TGComponent" value="Exploit_Vulnerabilities_Windows_WinCC" />
-<TGConnectingPoint num="0" id="181" />
-<TGConnectingPoint num="1" id="182" />
-<TGConnectingPoint num="2" id="183" />
-<TGConnectingPoint num="3" id="184" />
-<TGConnectingPoint num="4" id="185" />
-<TGConnectingPoint num="5" id="186" />
-<TGConnectingPoint num="6" id="187" />
-<TGConnectingPoint num="7" id="188" />
-<TGConnectingPoint num="8" id="189" />
-<TGConnectingPoint num="9" id="190" />
-<TGConnectingPoint num="10" id="191" />
-<TGConnectingPoint num="11" id="192" />
+<TGConnectingPoint num="0" id="241" />
+<TGConnectingPoint num="1" id="242" />
+<TGConnectingPoint num="2" id="243" />
+<TGConnectingPoint num="3" id="244" />
+<TGConnectingPoint num="4" id="245" />
+<TGConnectingPoint num="5" id="246" />
+<TGConnectingPoint num="6" id="247" />
+<TGConnectingPoint num="7" id="248" />
+<TGConnectingPoint num="8" id="249" />
+<TGConnectingPoint num="9" id="250" />
+<TGConnectingPoint num="10" id="251" />
+<TGConnectingPoint num="11" id="252" />
+<TGConnectingPoint num="12" id="253" />
+<TGConnectingPoint num="13" id="254" />
+<TGConnectingPoint num="14" id="255" />
+<TGConnectingPoint num="15" id="256" />
+<TGConnectingPoint num="16" id="257" />
+<TGConnectingPoint num="17" id="258" />
+<TGConnectingPoint num="18" id="259" />
+<TGConnectingPoint num="19" id="260" />
+<TGConnectingPoint num="20" id="261" />
+<TGConnectingPoint num="21" id="262" />
+<TGConnectingPoint num="22" id="263" />
+<TGConnectingPoint num="23" id="264" />
 <extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="false" cost="0" experience="0" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -390,1063 +462,1243 @@
 </AttackTreeDiagramPanel>
 
 <AttackTreeDiagramPanel name="Execute_Stuxnet" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
-<CONNECTOR type="133" id="220" >
+<CONNECTOR type="133" id="292" index="0" uid="b8d009de-7d23-4ada-8fe3-fc46cc19a936" >
 <cdparam x="565" y="160" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
-<TGConnectingPoint num="0" id="219" />
-<P1  x="562" y="166" id="774" />
-<P2  x="565" y="113" id="764" />
+<TGConnectingPoint num="0" id="291" />
+<P1  x="562" y="166" id="1026" />
+<P2  x="565" y="113" id="1004" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="133" id="222" >
+<CONNECTOR type="133" id="294" index="1" uid="502cd20c-55f3-4627-9d04-85831cf8a019" >
 <cdparam x="519" y="464" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
-<TGConnectingPoint num="0" id="221" />
-<P1  x="597" y="461" id="289" />
-<P2  x="562" y="216" id="777" />
+<TGConnectingPoint num="0" id="293" />
+<P1  x="597" y="461" id="373" />
+<P2  x="562" y="216" id="1029" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="133" id="224" >
+<CONNECTOR type="133" id="296" index="2" uid="faa8225c-96ed-41df-a81a-14ccb51e3c11" >
 <cdparam x="728" y="645" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
-<TGConnectingPoint num="0" id="223" />
-<P1  x="728" y="675" id="647" />
-<P2  x="634" y="511" id="300" />
+<TGConnectingPoint num="0" id="295" />
+<P1  x="728" y="675" id="851" />
+<P2  x="634" y="511" id="384" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="133" id="226" >
+<CONNECTOR type="133" id="298" index="3" uid="03594d71-98cf-494e-bd4c-a8a1b54fde73" >
 <cdparam x="566" y="639" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
-<TGConnectingPoint num="0" id="225" />
-<P1  x="573" y="669" id="660" />
-<P2  x="559" y="511" id="299" />
+<TGConnectingPoint num="0" id="297" />
+<P1  x="573" y="669" id="876" />
+<P2  x="559" y="511" id="383" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="133" id="228" >
+<CONNECTOR type="133" id="300" index="4" uid="f4c4094f-3795-4da3-b947-0de7f43732aa" >
 <cdparam x="592" y="435" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
-<TGConnectingPoint num="0" id="227" />
-<P1  x="681" y="432" id="279" />
-<P2  x="634" y="461" id="294" />
+<TGConnectingPoint num="0" id="299" />
+<P1  x="681" y="432" id="351" />
+<P2  x="634" y="461" id="378" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="133" id="230" >
+<CONNECTOR type="133" id="302" index="5" uid="e13a8efc-e1c1-4bbb-8d14-4dc6c740e7b9" >
 <cdparam x="591" y="476" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
-<TGConnectingPoint num="0" id="229" />
-<P1  x="912" y="478" id="575" />
-<P2  x="599" y="216" id="785" />
+<TGConnectingPoint num="0" id="301" />
+<P1  x="912" y="478" id="743" />
+<P2  x="599" y="216" id="1037" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="133" id="232" >
+<CONNECTOR type="133" id="304" index="6" uid="f4e7b720-711e-4d8d-89b7-9a2a38dbeea3" >
 <cdparam x="762" y="664" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
-<TGConnectingPoint num="0" id="231" />
-<P1  x="910" y="714" id="634" />
-<P2  x="875" y="528" id="573" />
+<TGConnectingPoint num="0" id="303" />
+<P1  x="910" y="714" id="826" />
+<P2  x="875" y="528" id="741" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="133" id="234" >
+<CONNECTOR type="133" id="306" index="7" uid="587848af-6d8d-4b0f-a8ed-bfd2043a1aaf" >
 <cdparam x="710" y="463" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
-<TGConnectingPoint num="0" id="233" />
-<P1  x="972" y="465" id="560" />
-<P2  x="950" y="490" id="577" />
+<TGConnectingPoint num="0" id="305" />
+<P1  x="972" y="465" id="716" />
+<P2  x="950" y="490" id="745" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="133" id="236" >
+<CONNECTOR type="133" id="308" index="8" uid="c745d671-fa06-4958-a24d-c5de0cb29fa7" >
 <cdparam x="500" y="403" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
-<TGConnectingPoint num="0" id="235" />
-<P1  x="409" y="426" id="457" />
-<P2  x="524" y="216" id="784" />
+<TGConnectingPoint num="0" id="307" />
+<P1  x="409" y="426" id="589" />
+<P2  x="524" y="216" id="1036" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="133" id="238" >
+<CONNECTOR type="133" id="310" index="9" uid="85d6eb83-7314-4b76-9549-8edbcfb61da1" >
 <cdparam x="433" y="485" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
-<TGConnectingPoint num="0" id="237" />
-<P1  x="266" y="480" id="442" />
-<P2  x="296" y="451" id="465" />
+<TGConnectingPoint num="0" id="309" />
+<P1  x="266" y="480" id="562" />
+<P2  x="296" y="451" id="597" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="133" id="240" >
+<CONNECTOR type="133" id="312" index="10" uid="79bf787e-f804-47f1-bca8-2bce725142f9" >
 <cdparam x="553" y="620" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
-<TGConnectingPoint num="0" id="239" />
-<P1  x="460" y="729" id="621" />
-<P2  x="371" y="451" id="466" />
+<TGConnectingPoint num="0" id="311" />
+<P1  x="460" y="729" id="801" />
+<P2  x="371" y="451" id="598" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="133" id="242" >
+<CONNECTOR type="133" id="314" index="11" uid="b348a65e-c772-4ba6-a081-b21678652e8f" >
 <cdparam x="789" y="378" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
-<TGConnectingPoint num="0" id="241" />
-<P1  x="792" y="119" id="354" />
-<P2  x="637" y="191" id="776" />
+<TGConnectingPoint num="0" id="313" />
+<P1  x="792" y="119" id="450" />
+<P2  x="637" y="191" id="1028" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="133" id="244" >
+<CONNECTOR type="133" id="316" index="12" uid="56868173-2514-40be-81b6-e1690cb11968" >
 <cdparam x="880" y="427" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
-<TGConnectingPoint num="0" id="243" />
-<P1  x="882" y="223" id="366" />
-<P2  x="867" y="144" id="356" />
+<TGConnectingPoint num="0" id="315" />
+<P1  x="882" y="223" id="462" />
+<P2  x="867" y="144" id="452" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="133" id="246" >
+<CONNECTOR type="133" id="318" index="13" uid="280629a1-7e7b-481a-9f7b-a38e2e8a874d" >
 <cdparam x="988" y="334" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
-<TGConnectingPoint num="0" id="245" />
-<P1  x="1000" y="169" id="327" />
-<P2  x="942" y="106" id="360" />
+<TGConnectingPoint num="0" id="317" />
+<P1  x="1000" y="169" id="411" />
+<P2  x="942" y="106" id="456" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="133" id="248" >
+<CONNECTOR type="133" id="320" index="14" uid="58863aeb-0538-4fb0-80a0-8013a8804b9f" >
 <cdparam x="923" y="501" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
-<TGConnectingPoint num="0" id="247" />
-<P1  x="940" y="302" id="341" />
-<P2  x="882" y="263" id="369" />
+<TGConnectingPoint num="0" id="319" />
+<P1  x="940" y="302" id="437" />
+<P2  x="882" y="263" id="465" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="133" id="250" >
+<CONNECTOR type="133" id="322" index="15" uid="ae488cd4-8ddb-4e90-a65a-6fb61c0d5927" >
 <cdparam x="349" y="443" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
-<TGConnectingPoint num="0" id="249" />
-<P1  x="222" y="247" id="265" />
-<P2  x="487" y="191" id="775" />
+<TGConnectingPoint num="0" id="321" />
+<P1  x="222" y="247" id="337" />
+<P2  x="487" y="191" id="1027" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="133" id="252" >
+<CONNECTOR type="133" id="324" index="16" uid="0952f133-918a-4e88-9fd0-3ca14cf78147" >
 <cdparam x="868" y="652" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
-<TGConnectingPoint num="0" id="251" />
-<P1  x="1066" y="631" id="613" />
-<P2  x="1052" y="327" id="351" />
+<TGConnectingPoint num="0" id="323" />
+<P1  x="1066" y="631" id="781" />
+<P2  x="1052" y="327" id="447" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="133" id="254" >
+<CONNECTOR type="133" id="326" index="17" uid="35b24010-695c-4c81-b69b-ce48a00e59bb" >
 <cdparam x="963" y="271" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
-<TGConnectingPoint num="0" id="253" />
-<P1  x="1021" y="258" id="382" />
-<P2  x="1015" y="277" id="340" />
+<TGConnectingPoint num="0" id="325" />
+<P1  x="1021" y="258" id="490" />
+<P2  x="1015" y="277" id="436" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="133" id="256" >
+<CONNECTOR type="133" id="328" index="18" uid="5408c54f-821c-4433-874b-e97a74ac98e5" >
 <cdparam x="210" y="598" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
-<TGConnectingPoint num="0" id="255" />
-<P1  x="151" y="647" id="698" />
-<P2  x="147" y="272" id="266" />
+<TGConnectingPoint num="0" id="327" />
+<P1  x="151" y="647" id="926" />
+<P2  x="147" y="272" id="338" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="133" id="258" >
+<CONNECTOR type="133" id="330" index="19" uid="8cc9ffb4-6a83-4f51-bc1d-f76629538144" >
 <cdparam x="318" y="396" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
-<TGConnectingPoint num="0" id="257" />
-<P1  x="257" y="159" id="509" />
-<P2  x="147" y="222" id="263" />
+<TGConnectingPoint num="0" id="329" />
+<P1  x="257" y="159" id="653" />
+<P2  x="147" y="222" id="335" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="133" id="260" >
+<CONNECTOR type="133" id="332" index="20" uid="13f4977d-94b8-4a80-bc3b-7be052655199" >
 <cdparam x="443" y="350" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
-<TGConnectingPoint num="0" id="259" />
-<P1  x="261" y="93" id="496" />
-<P2  x="257" y="109" id="506" />
+<TGConnectingPoint num="0" id="331" />
+<P1  x="261" y="93" id="628" />
+<P2  x="257" y="109" id="650" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="133" id="262" >
+<CONNECTOR type="133" id="334" index="21" uid="5b3e29ba-ed07-4bc6-a0b3-c41ed6690232" >
 <cdparam x="451" y="438" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
-<TGConnectingPoint num="0" id="261" />
-<P1  x="122" y="137" id="521" />
-<P2  x="182" y="134" id="507" />
+<TGConnectingPoint num="0" id="333" />
+<P1  x="122" y="137" id="665" />
+<P2  x="182" y="134" id="651" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<COMPONENT type="1402" id="275" >
+<COMPONENT type="1402" id="347" index="22" uid="200d54ee-6fa5-4cb7-9656-314e5add666d" >
 <cdparam x="72" y="222" />
-<sizeparam width="150" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="150" height="50" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="TGComponent" value="&lt;&lt;AND&gt;&gt;" />
-<TGConnectingPoint num="0" id="263" />
-<TGConnectingPoint num="1" id="264" />
-<TGConnectingPoint num="2" id="265" />
-<TGConnectingPoint num="3" id="266" />
-<TGConnectingPoint num="4" id="267" />
-<TGConnectingPoint num="5" id="268" />
-<TGConnectingPoint num="6" id="269" />
-<TGConnectingPoint num="7" id="270" />
-<TGConnectingPoint num="8" id="271" />
-<TGConnectingPoint num="9" id="272" />
-<TGConnectingPoint num="10" id="273" />
-<TGConnectingPoint num="11" id="274" />
+<TGConnectingPoint num="0" id="335" />
+<TGConnectingPoint num="1" id="336" />
+<TGConnectingPoint num="2" id="337" />
+<TGConnectingPoint num="3" id="338" />
+<TGConnectingPoint num="4" id="339" />
+<TGConnectingPoint num="5" id="340" />
+<TGConnectingPoint num="6" id="341" />
+<TGConnectingPoint num="7" id="342" />
+<TGConnectingPoint num="8" id="343" />
+<TGConnectingPoint num="9" id="344" />
+<TGConnectingPoint num="10" id="345" />
+<TGConnectingPoint num="11" id="346" />
 <extraparam>
 <info equation="" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1400" id="326" >
+<COMPONENT type="1400" id="410" index="23" uid="1c280170-1e58-42ed-b9a2-1f6e0a588015" >
 <cdparam x="503" y="343" />
 <sizeparam width="250" height="200" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Block9" value="Windows_Server_Service_SMB" />
-<TGConnectingPoint num="0" id="302" />
-<TGConnectingPoint num="1" id="303" />
-<TGConnectingPoint num="2" id="304" />
-<TGConnectingPoint num="3" id="305" />
-<TGConnectingPoint num="4" id="306" />
-<TGConnectingPoint num="5" id="307" />
-<TGConnectingPoint num="6" id="308" />
-<TGConnectingPoint num="7" id="309" />
-<TGConnectingPoint num="8" id="310" />
-<TGConnectingPoint num="9" id="311" />
-<TGConnectingPoint num="10" id="312" />
-<TGConnectingPoint num="11" id="313" />
-<TGConnectingPoint num="12" id="314" />
-<TGConnectingPoint num="13" id="315" />
-<TGConnectingPoint num="14" id="316" />
-<TGConnectingPoint num="15" id="317" />
-<TGConnectingPoint num="16" id="318" />
-<TGConnectingPoint num="17" id="319" />
-<TGConnectingPoint num="18" id="320" />
-<TGConnectingPoint num="19" id="321" />
-<TGConnectingPoint num="20" id="322" />
-<TGConnectingPoint num="21" id="323" />
-<TGConnectingPoint num="22" id="324" />
-<TGConnectingPoint num="23" id="325" />
+<TGConnectingPoint num="0" id="386" />
+<TGConnectingPoint num="1" id="387" />
+<TGConnectingPoint num="2" id="388" />
+<TGConnectingPoint num="3" id="389" />
+<TGConnectingPoint num="4" id="390" />
+<TGConnectingPoint num="5" id="391" />
+<TGConnectingPoint num="6" id="392" />
+<TGConnectingPoint num="7" id="393" />
+<TGConnectingPoint num="8" id="394" />
+<TGConnectingPoint num="9" id="395" />
+<TGConnectingPoint num="10" id="396" />
+<TGConnectingPoint num="11" id="397" />
+<TGConnectingPoint num="12" id="398" />
+<TGConnectingPoint num="13" id="399" />
+<TGConnectingPoint num="14" id="400" />
+<TGConnectingPoint num="15" id="401" />
+<TGConnectingPoint num="16" id="402" />
+<TGConnectingPoint num="17" id="403" />
+<TGConnectingPoint num="18" id="404" />
+<TGConnectingPoint num="19" id="405" />
+<TGConnectingPoint num="20" id="406" />
+<TGConnectingPoint num="21" id="407" />
+<TGConnectingPoint num="22" id="408" />
+<TGConnectingPoint num="23" id="409" />
 </COMPONENT>
-<SUBCOMPONENT type="1401" id="288" >
-<father id="326" num="0" />
+<SUBCOMPONENT type="1401" id="372" index="34" uid="03152b3f-1e78-4df9-b9df-ebbde3ab63c5" >
+<father id="410" num="0" />
 <cdparam x="610" y="392" />
-<sizeparam width="143" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="143" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="0" maxX="107" minY="0" maxY="160" />
 <infoparam name="TGComponent" value="Exploit_Vulnerability" />
-<TGConnectingPoint num="0" id="276" />
-<TGConnectingPoint num="1" id="277" />
-<TGConnectingPoint num="2" id="278" />
-<TGConnectingPoint num="3" id="279" />
-<TGConnectingPoint num="4" id="280" />
-<TGConnectingPoint num="5" id="281" />
-<TGConnectingPoint num="6" id="282" />
-<TGConnectingPoint num="7" id="283" />
-<TGConnectingPoint num="8" id="284" />
-<TGConnectingPoint num="9" id="285" />
-<TGConnectingPoint num="10" id="286" />
-<TGConnectingPoint num="11" id="287" />
+<TGConnectingPoint num="0" id="348" />
+<TGConnectingPoint num="1" id="349" />
+<TGConnectingPoint num="2" id="350" />
+<TGConnectingPoint num="3" id="351" />
+<TGConnectingPoint num="4" id="352" />
+<TGConnectingPoint num="5" id="353" />
+<TGConnectingPoint num="6" id="354" />
+<TGConnectingPoint num="7" id="355" />
+<TGConnectingPoint num="8" id="356" />
+<TGConnectingPoint num="9" id="357" />
+<TGConnectingPoint num="10" id="358" />
+<TGConnectingPoint num="11" id="359" />
+<TGConnectingPoint num="12" id="360" />
+<TGConnectingPoint num="13" id="361" />
+<TGConnectingPoint num="14" id="362" />
+<TGConnectingPoint num="15" id="363" />
+<TGConnectingPoint num="16" id="364" />
+<TGConnectingPoint num="17" id="365" />
+<TGConnectingPoint num="18" id="366" />
+<TGConnectingPoint num="19" id="367" />
+<TGConnectingPoint num="20" id="368" />
+<TGConnectingPoint num="21" id="369" />
+<TGConnectingPoint num="22" id="370" />
+<TGConnectingPoint num="23" id="371" />
 <extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="false" cost="0" experience="0" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1402" id="301" >
-<father id="326" num="1" />
+<SUBCOMPONENT type="1402" id="385" index="35" uid="d84184af-1b65-428c-b0c1-56e9efef72be" >
+<father id="410" num="1" />
 <cdparam x="522" y="461" />
-<sizeparam width="150" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="150" height="50" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="100" minY="0" maxY="150" />
 <infoparam name="TGComponent" value="&lt;&lt;AND&gt;&gt;" />
-<TGConnectingPoint num="0" id="289" />
-<TGConnectingPoint num="1" id="290" />
-<TGConnectingPoint num="2" id="291" />
-<TGConnectingPoint num="3" id="292" />
-<TGConnectingPoint num="4" id="293" />
-<TGConnectingPoint num="5" id="294" />
-<TGConnectingPoint num="6" id="295" />
-<TGConnectingPoint num="7" id="296" />
-<TGConnectingPoint num="8" id="297" />
-<TGConnectingPoint num="9" id="298" />
-<TGConnectingPoint num="10" id="299" />
-<TGConnectingPoint num="11" id="300" />
+<TGConnectingPoint num="0" id="373" />
+<TGConnectingPoint num="1" id="374" />
+<TGConnectingPoint num="2" id="375" />
+<TGConnectingPoint num="3" id="376" />
+<TGConnectingPoint num="4" id="377" />
+<TGConnectingPoint num="5" id="378" />
+<TGConnectingPoint num="6" id="379" />
+<TGConnectingPoint num="7" id="380" />
+<TGConnectingPoint num="8" id="381" />
+<TGConnectingPoint num="9" id="382" />
+<TGConnectingPoint num="10" id="383" />
+<TGConnectingPoint num="11" id="384" />
 <extraparam>
 <info equation="" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="1401" id="339" >
+<COMPONENT type="1401" id="435" index="24" uid="371c5510-3375-4638-9daf-48b1299f8235" >
 <cdparam x="889" y="169" />
-<sizeparam width="223" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="223" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="TGComponent" value="Excute_A_Craft_Store_Procedure" />
-<TGConnectingPoint num="0" id="327" />
-<TGConnectingPoint num="1" id="328" />
-<TGConnectingPoint num="2" id="329" />
-<TGConnectingPoint num="3" id="330" />
-<TGConnectingPoint num="4" id="331" />
-<TGConnectingPoint num="5" id="332" />
-<TGConnectingPoint num="6" id="333" />
-<TGConnectingPoint num="7" id="334" />
-<TGConnectingPoint num="8" id="335" />
-<TGConnectingPoint num="9" id="336" />
-<TGConnectingPoint num="10" id="337" />
-<TGConnectingPoint num="11" id="338" />
+<TGConnectingPoint num="0" id="411" />
+<TGConnectingPoint num="1" id="412" />
+<TGConnectingPoint num="2" id="413" />
+<TGConnectingPoint num="3" id="414" />
+<TGConnectingPoint num="4" id="415" />
+<TGConnectingPoint num="5" id="416" />
+<TGConnectingPoint num="6" id="417" />
+<TGConnectingPoint num="7" id="418" />
+<TGConnectingPoint num="8" id="419" />
+<TGConnectingPoint num="9" id="420" />
+<TGConnectingPoint num="10" id="421" />
+<TGConnectingPoint num="11" id="422" />
+<TGConnectingPoint num="12" id="423" />
+<TGConnectingPoint num="13" id="424" />
+<TGConnectingPoint num="14" id="425" />
+<TGConnectingPoint num="15" id="426" />
+<TGConnectingPoint num="16" id="427" />
+<TGConnectingPoint num="17" id="428" />
+<TGConnectingPoint num="18" id="429" />
+<TGConnectingPoint num="19" id="430" />
+<TGConnectingPoint num="20" id="431" />
+<TGConnectingPoint num="21" id="432" />
+<TGConnectingPoint num="22" id="433" />
+<TGConnectingPoint num="23" id="434" />
 <extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="false" cost="0" experience="0" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1400" id="416" >
+<COMPONENT type="1400" id="536" index="25" uid="0551c91c-ca66-48b1-9ab7-5eb98324d73a" >
 <cdparam x="782" y="54" />
 <sizeparam width="311" height="287" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Block8" value="WinCC" />
-<TGConnectingPoint num="0" id="392" />
-<TGConnectingPoint num="1" id="393" />
-<TGConnectingPoint num="2" id="394" />
-<TGConnectingPoint num="3" id="395" />
-<TGConnectingPoint num="4" id="396" />
-<TGConnectingPoint num="5" id="397" />
-<TGConnectingPoint num="6" id="398" />
-<TGConnectingPoint num="7" id="399" />
-<TGConnectingPoint num="8" id="400" />
-<TGConnectingPoint num="9" id="401" />
-<TGConnectingPoint num="10" id="402" />
-<TGConnectingPoint num="11" id="403" />
-<TGConnectingPoint num="12" id="404" />
-<TGConnectingPoint num="13" id="405" />
-<TGConnectingPoint num="14" id="406" />
-<TGConnectingPoint num="15" id="407" />
-<TGConnectingPoint num="16" id="408" />
-<TGConnectingPoint num="17" id="409" />
-<TGConnectingPoint num="18" id="410" />
-<TGConnectingPoint num="19" id="411" />
-<TGConnectingPoint num="20" id="412" />
-<TGConnectingPoint num="21" id="413" />
-<TGConnectingPoint num="22" id="414" />
-<TGConnectingPoint num="23" id="415" />
+<TGConnectingPoint num="0" id="512" />
+<TGConnectingPoint num="1" id="513" />
+<TGConnectingPoint num="2" id="514" />
+<TGConnectingPoint num="3" id="515" />
+<TGConnectingPoint num="4" id="516" />
+<TGConnectingPoint num="5" id="517" />
+<TGConnectingPoint num="6" id="518" />
+<TGConnectingPoint num="7" id="519" />
+<TGConnectingPoint num="8" id="520" />
+<TGConnectingPoint num="9" id="521" />
+<TGConnectingPoint num="10" id="522" />
+<TGConnectingPoint num="11" id="523" />
+<TGConnectingPoint num="12" id="524" />
+<TGConnectingPoint num="13" id="525" />
+<TGConnectingPoint num="14" id="526" />
+<TGConnectingPoint num="15" id="527" />
+<TGConnectingPoint num="16" id="528" />
+<TGConnectingPoint num="17" id="529" />
+<TGConnectingPoint num="18" id="530" />
+<TGConnectingPoint num="19" id="531" />
+<TGConnectingPoint num="20" id="532" />
+<TGConnectingPoint num="21" id="533" />
+<TGConnectingPoint num="22" id="534" />
+<TGConnectingPoint num="23" id="535" />
 </COMPONENT>
-<SUBCOMPONENT type="1402" id="352" >
-<father id="416" num="0" />
+<SUBCOMPONENT type="1402" id="448" index="36" uid="654cee01-7a81-447e-a2ea-f232ea47d32d" >
+<father id="536" num="0" />
 <cdparam x="940" y="277" />
-<sizeparam width="150" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="150" height="50" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="161" minY="0" maxY="258" />
 <infoparam name="TGComponent" value="&lt;&lt;AND&gt;&gt;" />
-<TGConnectingPoint num="0" id="340" />
-<TGConnectingPoint num="1" id="341" />
-<TGConnectingPoint num="2" id="342" />
-<TGConnectingPoint num="3" id="343" />
-<TGConnectingPoint num="4" id="344" />
-<TGConnectingPoint num="5" id="345" />
-<TGConnectingPoint num="6" id="346" />
-<TGConnectingPoint num="7" id="347" />
-<TGConnectingPoint num="8" id="348" />
-<TGConnectingPoint num="9" id="349" />
-<TGConnectingPoint num="10" id="350" />
-<TGConnectingPoint num="11" id="351" />
+<TGConnectingPoint num="0" id="436" />
+<TGConnectingPoint num="1" id="437" />
+<TGConnectingPoint num="2" id="438" />
+<TGConnectingPoint num="3" id="439" />
+<TGConnectingPoint num="4" id="440" />
+<TGConnectingPoint num="5" id="441" />
+<TGConnectingPoint num="6" id="442" />
+<TGConnectingPoint num="7" id="443" />
+<TGConnectingPoint num="8" id="444" />
+<TGConnectingPoint num="9" id="445" />
+<TGConnectingPoint num="10" id="446" />
+<TGConnectingPoint num="11" id="447" />
 <extraparam>
 <info equation="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1402" id="365" >
-<father id="416" num="1" />
+<SUBCOMPONENT type="1402" id="461" index="37" uid="04ea4334-b7c3-4bd0-b3c2-299466669094" >
+<father id="536" num="1" />
 <cdparam x="792" y="94" />
-<sizeparam width="150" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="150" height="50" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="161" minY="0" maxY="258" />
 <infoparam name="TGComponent" value="&lt;&lt;AND&gt;&gt;" />
-<TGConnectingPoint num="0" id="353" />
-<TGConnectingPoint num="1" id="354" />
-<TGConnectingPoint num="2" id="355" />
-<TGConnectingPoint num="3" id="356" />
-<TGConnectingPoint num="4" id="357" />
-<TGConnectingPoint num="5" id="358" />
-<TGConnectingPoint num="6" id="359" />
-<TGConnectingPoint num="7" id="360" />
-<TGConnectingPoint num="8" id="361" />
-<TGConnectingPoint num="9" id="362" />
-<TGConnectingPoint num="10" id="363" />
-<TGConnectingPoint num="11" id="364" />
+<TGConnectingPoint num="0" id="449" />
+<TGConnectingPoint num="1" id="450" />
+<TGConnectingPoint num="2" id="451" />
+<TGConnectingPoint num="3" id="452" />
+<TGConnectingPoint num="4" id="453" />
+<TGConnectingPoint num="5" id="454" />
+<TGConnectingPoint num="6" id="455" />
+<TGConnectingPoint num="7" id="456" />
+<TGConnectingPoint num="8" id="457" />
+<TGConnectingPoint num="9" id="458" />
+<TGConnectingPoint num="10" id="459" />
+<TGConnectingPoint num="11" id="460" />
 <extraparam>
 <info equation="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="378" >
-<father id="416" num="2" />
+<SUBCOMPONENT type="1401" id="486" index="38" uid="1bdd6302-9fc0-4f9a-b557-9265453aa0a7" >
+<father id="536" num="2" />
 <cdparam x="786" y="223" />
-<sizeparam width="192" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="192" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="0" maxX="119" minY="0" maxY="247" />
 <infoparam name="TGComponent" value="Store_Stuxnet_In_Database" />
-<TGConnectingPoint num="0" id="366" />
-<TGConnectingPoint num="1" id="367" />
-<TGConnectingPoint num="2" id="368" />
-<TGConnectingPoint num="3" id="369" />
-<TGConnectingPoint num="4" id="370" />
-<TGConnectingPoint num="5" id="371" />
-<TGConnectingPoint num="6" id="372" />
-<TGConnectingPoint num="7" id="373" />
-<TGConnectingPoint num="8" id="374" />
-<TGConnectingPoint num="9" id="375" />
-<TGConnectingPoint num="10" id="376" />
-<TGConnectingPoint num="11" id="377" />
+<TGConnectingPoint num="0" id="462" />
+<TGConnectingPoint num="1" id="463" />
+<TGConnectingPoint num="2" id="464" />
+<TGConnectingPoint num="3" id="465" />
+<TGConnectingPoint num="4" id="466" />
+<TGConnectingPoint num="5" id="467" />
+<TGConnectingPoint num="6" id="468" />
+<TGConnectingPoint num="7" id="469" />
+<TGConnectingPoint num="8" id="470" />
+<TGConnectingPoint num="9" id="471" />
+<TGConnectingPoint num="10" id="472" />
+<TGConnectingPoint num="11" id="473" />
+<TGConnectingPoint num="12" id="474" />
+<TGConnectingPoint num="13" id="475" />
+<TGConnectingPoint num="14" id="476" />
+<TGConnectingPoint num="15" id="477" />
+<TGConnectingPoint num="16" id="478" />
+<TGConnectingPoint num="17" id="479" />
+<TGConnectingPoint num="18" id="480" />
+<TGConnectingPoint num="19" id="481" />
+<TGConnectingPoint num="20" id="482" />
+<TGConnectingPoint num="21" id="483" />
+<TGConnectingPoint num="22" id="484" />
+<TGConnectingPoint num="23" id="485" />
 <extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="false" cost="0" experience="0" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="391" >
-<father id="416" num="3" />
+<SUBCOMPONENT type="1401" id="511" index="39" uid="8f89d32a-df60-46ea-ba38-bff3eb5a2cde" >
+<father id="536" num="3" />
 <cdparam x="950" y="218" />
-<sizeparam width="143" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="143" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="0" maxX="168" minY="0" maxY="247" />
 <infoparam name="TGComponent" value="Exploit_Vulnerability" />
-<TGConnectingPoint num="0" id="379" />
-<TGConnectingPoint num="1" id="380" />
-<TGConnectingPoint num="2" id="381" />
-<TGConnectingPoint num="3" id="382" />
-<TGConnectingPoint num="4" id="383" />
-<TGConnectingPoint num="5" id="384" />
-<TGConnectingPoint num="6" id="385" />
-<TGConnectingPoint num="7" id="386" />
-<TGConnectingPoint num="8" id="387" />
-<TGConnectingPoint num="9" id="388" />
-<TGConnectingPoint num="10" id="389" />
-<TGConnectingPoint num="11" id="390" />
+<TGConnectingPoint num="0" id="487" />
+<TGConnectingPoint num="1" id="488" />
+<TGConnectingPoint num="2" id="489" />
+<TGConnectingPoint num="3" id="490" />
+<TGConnectingPoint num="4" id="491" />
+<TGConnectingPoint num="5" id="492" />
+<TGConnectingPoint num="6" id="493" />
+<TGConnectingPoint num="7" id="494" />
+<TGConnectingPoint num="8" id="495" />
+<TGConnectingPoint num="9" id="496" />
+<TGConnectingPoint num="10" id="497" />
+<TGConnectingPoint num="11" id="498" />
+<TGConnectingPoint num="12" id="499" />
+<TGConnectingPoint num="13" id="500" />
+<TGConnectingPoint num="14" id="501" />
+<TGConnectingPoint num="15" id="502" />
+<TGConnectingPoint num="16" id="503" />
+<TGConnectingPoint num="17" id="504" />
+<TGConnectingPoint num="18" id="505" />
+<TGConnectingPoint num="19" id="506" />
+<TGConnectingPoint num="20" id="507" />
+<TGConnectingPoint num="21" id="508" />
+<TGConnectingPoint num="22" id="509" />
+<TGConnectingPoint num="23" id="510" />
 <extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="false" cost="0" experience="0" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="1400" id="441" >
+<COMPONENT type="1400" id="561" index="26" uid="4442d482-4469-454c-b35f-5306f105b621" >
 <cdparam x="780" y="20" />
 <sizeparam width="321" height="329" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Block7" value="S7_Software" />
-<TGConnectingPoint num="0" id="417" />
-<TGConnectingPoint num="1" id="418" />
-<TGConnectingPoint num="2" id="419" />
-<TGConnectingPoint num="3" id="420" />
-<TGConnectingPoint num="4" id="421" />
-<TGConnectingPoint num="5" id="422" />
-<TGConnectingPoint num="6" id="423" />
-<TGConnectingPoint num="7" id="424" />
-<TGConnectingPoint num="8" id="425" />
-<TGConnectingPoint num="9" id="426" />
-<TGConnectingPoint num="10" id="427" />
-<TGConnectingPoint num="11" id="428" />
-<TGConnectingPoint num="12" id="429" />
-<TGConnectingPoint num="13" id="430" />
-<TGConnectingPoint num="14" id="431" />
-<TGConnectingPoint num="15" id="432" />
-<TGConnectingPoint num="16" id="433" />
-<TGConnectingPoint num="17" id="434" />
-<TGConnectingPoint num="18" id="435" />
-<TGConnectingPoint num="19" id="436" />
-<TGConnectingPoint num="20" id="437" />
-<TGConnectingPoint num="21" id="438" />
-<TGConnectingPoint num="22" id="439" />
-<TGConnectingPoint num="23" id="440" />
+<TGConnectingPoint num="0" id="537" />
+<TGConnectingPoint num="1" id="538" />
+<TGConnectingPoint num="2" id="539" />
+<TGConnectingPoint num="3" id="540" />
+<TGConnectingPoint num="4" id="541" />
+<TGConnectingPoint num="5" id="542" />
+<TGConnectingPoint num="6" id="543" />
+<TGConnectingPoint num="7" id="544" />
+<TGConnectingPoint num="8" id="545" />
+<TGConnectingPoint num="9" id="546" />
+<TGConnectingPoint num="10" id="547" />
+<TGConnectingPoint num="11" id="548" />
+<TGConnectingPoint num="12" id="549" />
+<TGConnectingPoint num="13" id="550" />
+<TGConnectingPoint num="14" id="551" />
+<TGConnectingPoint num="15" id="552" />
+<TGConnectingPoint num="16" id="553" />
+<TGConnectingPoint num="17" id="554" />
+<TGConnectingPoint num="18" id="555" />
+<TGConnectingPoint num="19" id="556" />
+<TGConnectingPoint num="20" id="557" />
+<TGConnectingPoint num="21" id="558" />
+<TGConnectingPoint num="22" id="559" />
+<TGConnectingPoint num="23" id="560" />
 </COMPONENT>
 
-<COMPONENT type="1400" id="492" >
+<COMPONENT type="1400" id="624" index="27" uid="c4f0c0e8-c0d8-4f9e-9588-e2d2fcd7f28b" >
 <cdparam x="186" y="350" />
 <sizeparam width="297" height="189" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Block6" value="Network_Shares" />
-<TGConnectingPoint num="0" id="468" />
-<TGConnectingPoint num="1" id="469" />
-<TGConnectingPoint num="2" id="470" />
-<TGConnectingPoint num="3" id="471" />
-<TGConnectingPoint num="4" id="472" />
-<TGConnectingPoint num="5" id="473" />
-<TGConnectingPoint num="6" id="474" />
-<TGConnectingPoint num="7" id="475" />
-<TGConnectingPoint num="8" id="476" />
-<TGConnectingPoint num="9" id="477" />
-<TGConnectingPoint num="10" id="478" />
-<TGConnectingPoint num="11" id="479" />
-<TGConnectingPoint num="12" id="480" />
-<TGConnectingPoint num="13" id="481" />
-<TGConnectingPoint num="14" id="482" />
-<TGConnectingPoint num="15" id="483" />
-<TGConnectingPoint num="16" id="484" />
-<TGConnectingPoint num="17" id="485" />
-<TGConnectingPoint num="18" id="486" />
-<TGConnectingPoint num="19" id="487" />
-<TGConnectingPoint num="20" id="488" />
-<TGConnectingPoint num="21" id="489" />
-<TGConnectingPoint num="22" id="490" />
-<TGConnectingPoint num="23" id="491" />
+<TGConnectingPoint num="0" id="600" />
+<TGConnectingPoint num="1" id="601" />
+<TGConnectingPoint num="2" id="602" />
+<TGConnectingPoint num="3" id="603" />
+<TGConnectingPoint num="4" id="604" />
+<TGConnectingPoint num="5" id="605" />
+<TGConnectingPoint num="6" id="606" />
+<TGConnectingPoint num="7" id="607" />
+<TGConnectingPoint num="8" id="608" />
+<TGConnectingPoint num="9" id="609" />
+<TGConnectingPoint num="10" id="610" />
+<TGConnectingPoint num="11" id="611" />
+<TGConnectingPoint num="12" id="612" />
+<TGConnectingPoint num="13" id="613" />
+<TGConnectingPoint num="14" id="614" />
+<TGConnectingPoint num="15" id="615" />
+<TGConnectingPoint num="16" id="616" />
+<TGConnectingPoint num="17" id="617" />
+<TGConnectingPoint num="18" id="618" />
+<TGConnectingPoint num="19" id="619" />
+<TGConnectingPoint num="20" id="620" />
+<TGConnectingPoint num="21" id="621" />
+<TGConnectingPoint num="22" id="622" />
+<TGConnectingPoint num="23" id="623" />
 </COMPONENT>
-<SUBCOMPONENT type="1401" id="454" >
-<father id="492" num="0" />
+<SUBCOMPONENT type="1401" id="586" index="40" uid="18476bbc-8ceb-4915-8a7b-3b9e24647b31" >
+<father id="624" num="0" />
 <cdparam x="188" y="480" />
-<sizeparam width="157" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="157" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="0" maxX="140" minY="0" maxY="149" />
 <infoparam name="TGComponent" value="Schedule_Remote_Job" />
-<TGConnectingPoint num="0" id="442" />
-<TGConnectingPoint num="1" id="443" />
-<TGConnectingPoint num="2" id="444" />
-<TGConnectingPoint num="3" id="445" />
-<TGConnectingPoint num="4" id="446" />
-<TGConnectingPoint num="5" id="447" />
-<TGConnectingPoint num="6" id="448" />
-<TGConnectingPoint num="7" id="449" />
-<TGConnectingPoint num="8" id="450" />
-<TGConnectingPoint num="9" id="451" />
-<TGConnectingPoint num="10" id="452" />
-<TGConnectingPoint num="11" id="453" />
+<TGConnectingPoint num="0" id="562" />
+<TGConnectingPoint num="1" id="563" />
+<TGConnectingPoint num="2" id="564" />
+<TGConnectingPoint num="3" id="565" />
+<TGConnectingPoint num="4" id="566" />
+<TGConnectingPoint num="5" id="567" />
+<TGConnectingPoint num="6" id="568" />
+<TGConnectingPoint num="7" id="569" />
+<TGConnectingPoint num="8" id="570" />
+<TGConnectingPoint num="9" id="571" />
+<TGConnectingPoint num="10" id="572" />
+<TGConnectingPoint num="11" id="573" />
+<TGConnectingPoint num="12" id="574" />
+<TGConnectingPoint num="13" id="575" />
+<TGConnectingPoint num="14" id="576" />
+<TGConnectingPoint num="15" id="577" />
+<TGConnectingPoint num="16" id="578" />
+<TGConnectingPoint num="17" id="579" />
+<TGConnectingPoint num="18" id="580" />
+<TGConnectingPoint num="19" id="581" />
+<TGConnectingPoint num="20" id="582" />
+<TGConnectingPoint num="21" id="583" />
+<TGConnectingPoint num="22" id="584" />
+<TGConnectingPoint num="23" id="585" />
 <extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="false" cost="0" experience="0" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1402" id="467" >
-<father id="492" num="1" />
+<SUBCOMPONENT type="1402" id="599" index="41" uid="2e3f6316-08ea-4742-98b2-46b450ac0888" >
+<father id="624" num="1" />
 <cdparam x="259" y="401" />
-<sizeparam width="150" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="150" height="50" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="248" minY="0" maxY="139" />
 <infoparam name="TGComponent" value="&lt;&lt;AND&gt;&gt;" />
-<TGConnectingPoint num="0" id="455" />
-<TGConnectingPoint num="1" id="456" />
-<TGConnectingPoint num="2" id="457" />
-<TGConnectingPoint num="3" id="458" />
-<TGConnectingPoint num="4" id="459" />
-<TGConnectingPoint num="5" id="460" />
-<TGConnectingPoint num="6" id="461" />
-<TGConnectingPoint num="7" id="462" />
-<TGConnectingPoint num="8" id="463" />
-<TGConnectingPoint num="9" id="464" />
-<TGConnectingPoint num="10" id="465" />
-<TGConnectingPoint num="11" id="466" />
+<TGConnectingPoint num="0" id="587" />
+<TGConnectingPoint num="1" id="588" />
+<TGConnectingPoint num="2" id="589" />
+<TGConnectingPoint num="3" id="590" />
+<TGConnectingPoint num="4" id="591" />
+<TGConnectingPoint num="5" id="592" />
+<TGConnectingPoint num="6" id="593" />
+<TGConnectingPoint num="7" id="594" />
+<TGConnectingPoint num="8" id="595" />
+<TGConnectingPoint num="9" id="596" />
+<TGConnectingPoint num="10" id="597" />
+<TGConnectingPoint num="11" id="598" />
 <extraparam>
 <info equation="" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="1400" id="556" >
+<COMPONENT type="1400" id="712" index="28" uid="584ffa36-de21-46f0-bdc8-dd87399a81be" >
 <cdparam x="10" y="19" />
 <sizeparam width="337" height="280" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Block5" value="Folder_Managers" />
-<TGConnectingPoint num="0" id="532" />
-<TGConnectingPoint num="1" id="533" />
-<TGConnectingPoint num="2" id="534" />
-<TGConnectingPoint num="3" id="535" />
-<TGConnectingPoint num="4" id="536" />
-<TGConnectingPoint num="5" id="537" />
-<TGConnectingPoint num="6" id="538" />
-<TGConnectingPoint num="7" id="539" />
-<TGConnectingPoint num="8" id="540" />
-<TGConnectingPoint num="9" id="541" />
-<TGConnectingPoint num="10" id="542" />
-<TGConnectingPoint num="11" id="543" />
-<TGConnectingPoint num="12" id="544" />
-<TGConnectingPoint num="13" id="545" />
-<TGConnectingPoint num="14" id="546" />
-<TGConnectingPoint num="15" id="547" />
-<TGConnectingPoint num="16" id="548" />
-<TGConnectingPoint num="17" id="549" />
-<TGConnectingPoint num="18" id="550" />
-<TGConnectingPoint num="19" id="551" />
-<TGConnectingPoint num="20" id="552" />
-<TGConnectingPoint num="21" id="553" />
-<TGConnectingPoint num="22" id="554" />
-<TGConnectingPoint num="23" id="555" />
+<TGConnectingPoint num="0" id="688" />
+<TGConnectingPoint num="1" id="689" />
+<TGConnectingPoint num="2" id="690" />
+<TGConnectingPoint num="3" id="691" />
+<TGConnectingPoint num="4" id="692" />
+<TGConnectingPoint num="5" id="693" />
+<TGConnectingPoint num="6" id="694" />
+<TGConnectingPoint num="7" id="695" />
+<TGConnectingPoint num="8" id="696" />
+<TGConnectingPoint num="9" id="697" />
+<TGConnectingPoint num="10" id="698" />
+<TGConnectingPoint num="11" id="699" />
+<TGConnectingPoint num="12" id="700" />
+<TGConnectingPoint num="13" id="701" />
+<TGConnectingPoint num="14" id="702" />
+<TGConnectingPoint num="15" id="703" />
+<TGConnectingPoint num="16" id="704" />
+<TGConnectingPoint num="17" id="705" />
+<TGConnectingPoint num="18" id="706" />
+<TGConnectingPoint num="19" id="707" />
+<TGConnectingPoint num="20" id="708" />
+<TGConnectingPoint num="21" id="709" />
+<TGConnectingPoint num="22" id="710" />
+<TGConnectingPoint num="23" id="711" />
 </COMPONENT>
-<SUBCOMPONENT type="1401" id="505" >
-<father id="556" num="0" />
+<SUBCOMPONENT type="1401" id="649" index="42" uid="f457069d-a10f-4e99-838f-646180e7890b" >
+<father id="712" num="0" />
 <cdparam x="176" y="53" />
-<sizeparam width="171" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="171" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="0" maxX="166" minY="0" maxY="240" />
 <infoparam name="TGComponent" value="Exploit_LNK_Vulnerability" />
-<TGConnectingPoint num="0" id="493" />
-<TGConnectingPoint num="1" id="494" />
-<TGConnectingPoint num="2" id="495" />
-<TGConnectingPoint num="3" id="496" />
-<TGConnectingPoint num="4" id="497" />
-<TGConnectingPoint num="5" id="498" />
-<TGConnectingPoint num="6" id="499" />
-<TGConnectingPoint num="7" id="500" />
-<TGConnectingPoint num="8" id="501" />
-<TGConnectingPoint num="9" id="502" />
-<TGConnectingPoint num="10" id="503" />
-<TGConnectingPoint num="11" id="504" />
+<TGConnectingPoint num="0" id="625" />
+<TGConnectingPoint num="1" id="626" />
+<TGConnectingPoint num="2" id="627" />
+<TGConnectingPoint num="3" id="628" />
+<TGConnectingPoint num="4" id="629" />
+<TGConnectingPoint num="5" id="630" />
+<TGConnectingPoint num="6" id="631" />
+<TGConnectingPoint num="7" id="632" />
+<TGConnectingPoint num="8" id="633" />
+<TGConnectingPoint num="9" id="634" />
+<TGConnectingPoint num="10" id="635" />
+<TGConnectingPoint num="11" id="636" />
+<TGConnectingPoint num="12" id="637" />
+<TGConnectingPoint num="13" id="638" />
+<TGConnectingPoint num="14" id="639" />
+<TGConnectingPoint num="15" id="640" />
+<TGConnectingPoint num="16" id="641" />
+<TGConnectingPoint num="17" id="642" />
+<TGConnectingPoint num="18" id="643" />
+<TGConnectingPoint num="19" id="644" />
+<TGConnectingPoint num="20" id="645" />
+<TGConnectingPoint num="21" id="646" />
+<TGConnectingPoint num="22" id="647" />
+<TGConnectingPoint num="23" id="648" />
 <extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="false" cost="0" experience="0" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1402" id="518" >
-<father id="556" num="1" />
+<SUBCOMPONENT type="1402" id="662" index="43" uid="2486ab3f-6400-4355-b885-bba6c4f22a2e" >
+<father id="712" num="1" />
 <cdparam x="182" y="109" />
-<sizeparam width="150" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="150" height="50" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="332" minY="0" maxY="151" />
 <infoparam name="TGComponent" value="&lt;&lt;OR&gt;&gt;" />
-<TGConnectingPoint num="0" id="506" />
-<TGConnectingPoint num="1" id="507" />
-<TGConnectingPoint num="2" id="508" />
-<TGConnectingPoint num="3" id="509" />
-<TGConnectingPoint num="4" id="510" />
-<TGConnectingPoint num="5" id="511" />
-<TGConnectingPoint num="6" id="512" />
-<TGConnectingPoint num="7" id="513" />
-<TGConnectingPoint num="8" id="514" />
-<TGConnectingPoint num="9" id="515" />
-<TGConnectingPoint num="10" id="516" />
-<TGConnectingPoint num="11" id="517" />
+<TGConnectingPoint num="0" id="650" />
+<TGConnectingPoint num="1" id="651" />
+<TGConnectingPoint num="2" id="652" />
+<TGConnectingPoint num="3" id="653" />
+<TGConnectingPoint num="4" id="654" />
+<TGConnectingPoint num="5" id="655" />
+<TGConnectingPoint num="6" id="656" />
+<TGConnectingPoint num="7" id="657" />
+<TGConnectingPoint num="8" id="658" />
+<TGConnectingPoint num="9" id="659" />
+<TGConnectingPoint num="10" id="660" />
+<TGConnectingPoint num="11" id="661" />
 <extraparam>
 <info equation="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="531" >
-<father id="556" num="2" />
+<SUBCOMPONENT type="1401" id="687" index="44" uid="b110ca65-c2dd-4d4b-aeb2-844cbabf7252" >
+<father id="712" num="2" />
 <cdparam x="22" y="117" />
-<sizeparam width="100" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="100" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="0" maxX="237" minY="0" maxY="240" />
 <infoparam name="TGComponent" value="Autoruninf" />
-<TGConnectingPoint num="0" id="519" />
-<TGConnectingPoint num="1" id="520" />
-<TGConnectingPoint num="2" id="521" />
-<TGConnectingPoint num="3" id="522" />
-<TGConnectingPoint num="4" id="523" />
-<TGConnectingPoint num="5" id="524" />
-<TGConnectingPoint num="6" id="525" />
-<TGConnectingPoint num="7" id="526" />
-<TGConnectingPoint num="8" id="527" />
-<TGConnectingPoint num="9" id="528" />
-<TGConnectingPoint num="10" id="529" />
-<TGConnectingPoint num="11" id="530" />
+<TGConnectingPoint num="0" id="663" />
+<TGConnectingPoint num="1" id="664" />
+<TGConnectingPoint num="2" id="665" />
+<TGConnectingPoint num="3" id="666" />
+<TGConnectingPoint num="4" id="667" />
+<TGConnectingPoint num="5" id="668" />
+<TGConnectingPoint num="6" id="669" />
+<TGConnectingPoint num="7" id="670" />
+<TGConnectingPoint num="8" id="671" />
+<TGConnectingPoint num="9" id="672" />
+<TGConnectingPoint num="10" id="673" />
+<TGConnectingPoint num="11" id="674" />
+<TGConnectingPoint num="12" id="675" />
+<TGConnectingPoint num="13" id="676" />
+<TGConnectingPoint num="14" id="677" />
+<TGConnectingPoint num="15" id="678" />
+<TGConnectingPoint num="16" id="679" />
+<TGConnectingPoint num="17" id="680" />
+<TGConnectingPoint num="18" id="681" />
+<TGConnectingPoint num="19" id="682" />
+<TGConnectingPoint num="20" id="683" />
+<TGConnectingPoint num="21" id="684" />
+<TGConnectingPoint num="22" id="685" />
+<TGConnectingPoint num="23" id="686" />
 <extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="false" cost="0" experience="0" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="1400" id="607" >
+<COMPONENT type="1400" id="775" index="29" uid="1c95fae7-c260-43ce-a7ad-676c9b3cbdb7" >
 <cdparam x="794" y="385" />
 <sizeparam width="250" height="151" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Block4" value="Print_Spooler_Service" />
-<TGConnectingPoint num="0" id="583" />
-<TGConnectingPoint num="1" id="584" />
-<TGConnectingPoint num="2" id="585" />
-<TGConnectingPoint num="3" id="586" />
-<TGConnectingPoint num="4" id="587" />
-<TGConnectingPoint num="5" id="588" />
-<TGConnectingPoint num="6" id="589" />
-<TGConnectingPoint num="7" id="590" />
-<TGConnectingPoint num="8" id="591" />
-<TGConnectingPoint num="9" id="592" />
-<TGConnectingPoint num="10" id="593" />
-<TGConnectingPoint num="11" id="594" />
-<TGConnectingPoint num="12" id="595" />
-<TGConnectingPoint num="13" id="596" />
-<TGConnectingPoint num="14" id="597" />
-<TGConnectingPoint num="15" id="598" />
-<TGConnectingPoint num="16" id="599" />
-<TGConnectingPoint num="17" id="600" />
-<TGConnectingPoint num="18" id="601" />
-<TGConnectingPoint num="19" id="602" />
-<TGConnectingPoint num="20" id="603" />
-<TGConnectingPoint num="21" id="604" />
-<TGConnectingPoint num="22" id="605" />
-<TGConnectingPoint num="23" id="606" />
+<TGConnectingPoint num="0" id="751" />
+<TGConnectingPoint num="1" id="752" />
+<TGConnectingPoint num="2" id="753" />
+<TGConnectingPoint num="3" id="754" />
+<TGConnectingPoint num="4" id="755" />
+<TGConnectingPoint num="5" id="756" />
+<TGConnectingPoint num="6" id="757" />
+<TGConnectingPoint num="7" id="758" />
+<TGConnectingPoint num="8" id="759" />
+<TGConnectingPoint num="9" id="760" />
+<TGConnectingPoint num="10" id="761" />
+<TGConnectingPoint num="11" id="762" />
+<TGConnectingPoint num="12" id="763" />
+<TGConnectingPoint num="13" id="764" />
+<TGConnectingPoint num="14" id="765" />
+<TGConnectingPoint num="15" id="766" />
+<TGConnectingPoint num="16" id="767" />
+<TGConnectingPoint num="17" id="768" />
+<TGConnectingPoint num="18" id="769" />
+<TGConnectingPoint num="19" id="770" />
+<TGConnectingPoint num="20" id="771" />
+<TGConnectingPoint num="21" id="772" />
+<TGConnectingPoint num="22" id="773" />
+<TGConnectingPoint num="23" id="774" />
 </COMPONENT>
-<SUBCOMPONENT type="1401" id="569" >
-<father id="607" num="0" />
+<SUBCOMPONENT type="1401" id="737" index="45" uid="1194ee7f-1573-42cd-912d-a8f018a03fdf" >
+<father id="775" num="0" />
 <cdparam x="901" y="425" />
-<sizeparam width="143" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="143" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="0" maxX="107" minY="0" maxY="111" />
 <infoparam name="TGComponent" value="Exploit_Vulnerability" />
-<TGConnectingPoint num="0" id="557" />
-<TGConnectingPoint num="1" id="558" />
-<TGConnectingPoint num="2" id="559" />
-<TGConnectingPoint num="3" id="560" />
-<TGConnectingPoint num="4" id="561" />
-<TGConnectingPoint num="5" id="562" />
-<TGConnectingPoint num="6" id="563" />
-<TGConnectingPoint num="7" id="564" />
-<TGConnectingPoint num="8" id="565" />
-<TGConnectingPoint num="9" id="566" />
-<TGConnectingPoint num="10" id="567" />
-<TGConnectingPoint num="11" id="568" />
+<TGConnectingPoint num="0" id="713" />
+<TGConnectingPoint num="1" id="714" />
+<TGConnectingPoint num="2" id="715" />
+<TGConnectingPoint num="3" id="716" />
+<TGConnectingPoint num="4" id="717" />
+<TGConnectingPoint num="5" id="718" />
+<TGConnectingPoint num="6" id="719" />
+<TGConnectingPoint num="7" id="720" />
+<TGConnectingPoint num="8" id="721" />
+<TGConnectingPoint num="9" id="722" />
+<TGConnectingPoint num="10" id="723" />
+<TGConnectingPoint num="11" id="724" />
+<TGConnectingPoint num="12" id="725" />
+<TGConnectingPoint num="13" id="726" />
+<TGConnectingPoint num="14" id="727" />
+<TGConnectingPoint num="15" id="728" />
+<TGConnectingPoint num="16" id="729" />
+<TGConnectingPoint num="17" id="730" />
+<TGConnectingPoint num="18" id="731" />
+<TGConnectingPoint num="19" id="732" />
+<TGConnectingPoint num="20" id="733" />
+<TGConnectingPoint num="21" id="734" />
+<TGConnectingPoint num="22" id="735" />
+<TGConnectingPoint num="23" id="736" />
 <extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="false" cost="0" experience="0" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1402" id="582" >
-<father id="607" num="1" />
+<SUBCOMPONENT type="1402" id="750" index="46" uid="6f992f69-85b6-48a0-8e44-17c11bfb251e" >
+<father id="775" num="1" />
 <cdparam x="800" y="478" />
-<sizeparam width="150" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="150" height="50" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="100" minY="0" maxY="101" />
 <infoparam name="TGComponent" value="&lt;&lt;AND&gt;&gt;" />
-<TGConnectingPoint num="0" id="570" />
-<TGConnectingPoint num="1" id="571" />
-<TGConnectingPoint num="2" id="572" />
-<TGConnectingPoint num="3" id="573" />
-<TGConnectingPoint num="4" id="574" />
-<TGConnectingPoint num="5" id="575" />
-<TGConnectingPoint num="6" id="576" />
-<TGConnectingPoint num="7" id="577" />
-<TGConnectingPoint num="8" id="578" />
-<TGConnectingPoint num="9" id="579" />
-<TGConnectingPoint num="10" id="580" />
-<TGConnectingPoint num="11" id="581" />
+<TGConnectingPoint num="0" id="738" />
+<TGConnectingPoint num="1" id="739" />
+<TGConnectingPoint num="2" id="740" />
+<TGConnectingPoint num="3" id="741" />
+<TGConnectingPoint num="4" id="742" />
+<TGConnectingPoint num="5" id="743" />
+<TGConnectingPoint num="6" id="744" />
+<TGConnectingPoint num="7" id="745" />
+<TGConnectingPoint num="8" id="746" />
+<TGConnectingPoint num="9" id="747" />
+<TGConnectingPoint num="10" id="748" />
+<TGConnectingPoint num="11" id="749" />
 <extraparam>
 <info equation="" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="1400" id="697" >
+<COMPONENT type="1400" id="925" index="30" uid="3ddb4bbb-2ed2-405f-9b72-b77e7015a12a" >
 <cdparam x="356" y="617" />
 <sizeparam width="750" height="156" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Block3" value="Compromised_Computer" />
-<TGConnectingPoint num="0" id="673" />
-<TGConnectingPoint num="1" id="674" />
-<TGConnectingPoint num="2" id="675" />
-<TGConnectingPoint num="3" id="676" />
-<TGConnectingPoint num="4" id="677" />
-<TGConnectingPoint num="5" id="678" />
-<TGConnectingPoint num="6" id="679" />
-<TGConnectingPoint num="7" id="680" />
-<TGConnectingPoint num="8" id="681" />
-<TGConnectingPoint num="9" id="682" />
-<TGConnectingPoint num="10" id="683" />
-<TGConnectingPoint num="11" id="684" />
-<TGConnectingPoint num="12" id="685" />
-<TGConnectingPoint num="13" id="686" />
-<TGConnectingPoint num="14" id="687" />
-<TGConnectingPoint num="15" id="688" />
-<TGConnectingPoint num="16" id="689" />
-<TGConnectingPoint num="17" id="690" />
-<TGConnectingPoint num="18" id="691" />
-<TGConnectingPoint num="19" id="692" />
-<TGConnectingPoint num="20" id="693" />
-<TGConnectingPoint num="21" id="694" />
-<TGConnectingPoint num="22" id="695" />
-<TGConnectingPoint num="23" id="696" />
+<TGConnectingPoint num="0" id="901" />
+<TGConnectingPoint num="1" id="902" />
+<TGConnectingPoint num="2" id="903" />
+<TGConnectingPoint num="3" id="904" />
+<TGConnectingPoint num="4" id="905" />
+<TGConnectingPoint num="5" id="906" />
+<TGConnectingPoint num="6" id="907" />
+<TGConnectingPoint num="7" id="908" />
+<TGConnectingPoint num="8" id="909" />
+<TGConnectingPoint num="9" id="910" />
+<TGConnectingPoint num="10" id="911" />
+<TGConnectingPoint num="11" id="912" />
+<TGConnectingPoint num="12" id="913" />
+<TGConnectingPoint num="13" id="914" />
+<TGConnectingPoint num="14" id="915" />
+<TGConnectingPoint num="15" id="916" />
+<TGConnectingPoint num="16" id="917" />
+<TGConnectingPoint num="17" id="918" />
+<TGConnectingPoint num="18" id="919" />
+<TGConnectingPoint num="19" id="920" />
+<TGConnectingPoint num="20" id="921" />
+<TGConnectingPoint num="21" id="922" />
+<TGConnectingPoint num="22" id="923" />
+<TGConnectingPoint num="23" id="924" />
 </COMPONENT>
-<SUBCOMPONENT type="1401" id="620" >
-<father id="697" num="0" />
+<SUBCOMPONENT type="1401" id="800" index="47" uid="410fcc18-7ee3-4c2e-9f67-ed17e159e1f4" >
+<father id="925" num="0" />
 <cdparam x="949" y="631" />
-<sizeparam width="157" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="157" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="0" maxX="593" minY="0" maxY="116" />
 <infoparam name="TGComponent" value="Send_Malicious_Query" />
-<TGConnectingPoint num="0" id="608" />
-<TGConnectingPoint num="1" id="609" />
-<TGConnectingPoint num="2" id="610" />
-<TGConnectingPoint num="3" id="611" />
-<TGConnectingPoint num="4" id="612" />
-<TGConnectingPoint num="5" id="613" />
-<TGConnectingPoint num="6" id="614" />
-<TGConnectingPoint num="7" id="615" />
-<TGConnectingPoint num="8" id="616" />
-<TGConnectingPoint num="9" id="617" />
-<TGConnectingPoint num="10" id="618" />
-<TGConnectingPoint num="11" id="619" />
+<TGConnectingPoint num="0" id="776" />
+<TGConnectingPoint num="1" id="777" />
+<TGConnectingPoint num="2" id="778" />
+<TGConnectingPoint num="3" id="779" />
+<TGConnectingPoint num="4" id="780" />
+<TGConnectingPoint num="5" id="781" />
+<TGConnectingPoint num="6" id="782" />
+<TGConnectingPoint num="7" id="783" />
+<TGConnectingPoint num="8" id="784" />
+<TGConnectingPoint num="9" id="785" />
+<TGConnectingPoint num="10" id="786" />
+<TGConnectingPoint num="11" id="787" />
+<TGConnectingPoint num="12" id="788" />
+<TGConnectingPoint num="13" id="789" />
+<TGConnectingPoint num="14" id="790" />
+<TGConnectingPoint num="15" id="791" />
+<TGConnectingPoint num="16" id="792" />
+<TGConnectingPoint num="17" id="793" />
+<TGConnectingPoint num="18" id="794" />
+<TGConnectingPoint num="19" id="795" />
+<TGConnectingPoint num="20" id="796" />
+<TGConnectingPoint num="21" id="797" />
+<TGConnectingPoint num="22" id="798" />
+<TGConnectingPoint num="23" id="799" />
 <extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="false" cost="0" experience="0" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="633" >
-<father id="697" num="1" />
+<SUBCOMPONENT type="1401" id="825" index="48" uid="e367270b-de70-458c-a7d6-deadd7db728c" >
+<father id="925" num="1" />
 <cdparam x="356" y="729" />
-<sizeparam width="208" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="208" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="0" maxX="542" minY="0" maxY="116" />
 <infoparam name="TGComponent" value="Copy_Stuxnet_To_Shared_Disk" />
-<TGConnectingPoint num="0" id="621" />
-<TGConnectingPoint num="1" id="622" />
-<TGConnectingPoint num="2" id="623" />
-<TGConnectingPoint num="3" id="624" />
-<TGConnectingPoint num="4" id="625" />
-<TGConnectingPoint num="5" id="626" />
-<TGConnectingPoint num="6" id="627" />
-<TGConnectingPoint num="7" id="628" />
-<TGConnectingPoint num="8" id="629" />
-<TGConnectingPoint num="9" id="630" />
-<TGConnectingPoint num="10" id="631" />
-<TGConnectingPoint num="11" id="632" />
+<TGConnectingPoint num="0" id="801" />
+<TGConnectingPoint num="1" id="802" />
+<TGConnectingPoint num="2" id="803" />
+<TGConnectingPoint num="3" id="804" />
+<TGConnectingPoint num="4" id="805" />
+<TGConnectingPoint num="5" id="806" />
+<TGConnectingPoint num="6" id="807" />
+<TGConnectingPoint num="7" id="808" />
+<TGConnectingPoint num="8" id="809" />
+<TGConnectingPoint num="9" id="810" />
+<TGConnectingPoint num="10" id="811" />
+<TGConnectingPoint num="11" id="812" />
+<TGConnectingPoint num="12" id="813" />
+<TGConnectingPoint num="13" id="814" />
+<TGConnectingPoint num="14" id="815" />
+<TGConnectingPoint num="15" id="816" />
+<TGConnectingPoint num="16" id="817" />
+<TGConnectingPoint num="17" id="818" />
+<TGConnectingPoint num="18" id="819" />
+<TGConnectingPoint num="19" id="820" />
+<TGConnectingPoint num="20" id="821" />
+<TGConnectingPoint num="21" id="822" />
+<TGConnectingPoint num="22" id="823" />
+<TGConnectingPoint num="23" id="824" />
 <extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="false" cost="0" experience="0" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="646" >
-<father id="697" num="2" />
+<SUBCOMPONENT type="1401" id="850" index="49" uid="bf6b7c81-ca15-4612-be77-d7d8ea66d566" >
+<father id="925" num="2" />
 <cdparam x="815" y="714" />
-<sizeparam width="190" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="190" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="0" maxX="560" minY="0" maxY="116" />
 <infoparam name="TGComponent" value="Copy_File_In_System_Folder" />
-<TGConnectingPoint num="0" id="634" />
-<TGConnectingPoint num="1" id="635" />
-<TGConnectingPoint num="2" id="636" />
-<TGConnectingPoint num="3" id="637" />
-<TGConnectingPoint num="4" id="638" />
-<TGConnectingPoint num="5" id="639" />
-<TGConnectingPoint num="6" id="640" />
-<TGConnectingPoint num="7" id="641" />
-<TGConnectingPoint num="8" id="642" />
-<TGConnectingPoint num="9" id="643" />
-<TGConnectingPoint num="10" id="644" />
-<TGConnectingPoint num="11" id="645" />
+<TGConnectingPoint num="0" id="826" />
+<TGConnectingPoint num="1" id="827" />
+<TGConnectingPoint num="2" id="828" />
+<TGConnectingPoint num="3" id="829" />
+<TGConnectingPoint num="4" id="830" />
+<TGConnectingPoint num="5" id="831" />
+<TGConnectingPoint num="6" id="832" />
+<TGConnectingPoint num="7" id="833" />
+<TGConnectingPoint num="8" id="834" />
+<TGConnectingPoint num="9" id="835" />
+<TGConnectingPoint num="10" id="836" />
+<TGConnectingPoint num="11" id="837" />
+<TGConnectingPoint num="12" id="838" />
+<TGConnectingPoint num="13" id="839" />
+<TGConnectingPoint num="14" id="840" />
+<TGConnectingPoint num="15" id="841" />
+<TGConnectingPoint num="16" id="842" />
+<TGConnectingPoint num="17" id="843" />
+<TGConnectingPoint num="18" id="844" />
+<TGConnectingPoint num="19" id="845" />
+<TGConnectingPoint num="20" id="846" />
+<TGConnectingPoint num="21" id="847" />
+<TGConnectingPoint num="22" id="848" />
+<TGConnectingPoint num="23" id="849" />
 <extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="false" cost="0" experience="0" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="659" >
-<father id="697" num="3" />
+<SUBCOMPONENT type="1401" id="875" index="50" uid="6d9974ad-161e-43a3-834f-f73e5d721194" >
+<father id="925" num="3" />
 <cdparam x="676" y="675" />
-<sizeparam width="104" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="104" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="0" maxX="646" minY="0" maxY="116" />
 <infoparam name="TGComponent" value="Copy_Stuxnet" />
-<TGConnectingPoint num="0" id="647" />
-<TGConnectingPoint num="1" id="648" />
-<TGConnectingPoint num="2" id="649" />
-<TGConnectingPoint num="3" id="650" />
-<TGConnectingPoint num="4" id="651" />
-<TGConnectingPoint num="5" id="652" />
-<TGConnectingPoint num="6" id="653" />
-<TGConnectingPoint num="7" id="654" />
-<TGConnectingPoint num="8" id="655" />
-<TGConnectingPoint num="9" id="656" />
-<TGConnectingPoint num="10" id="657" />
-<TGConnectingPoint num="11" id="658" />
+<TGConnectingPoint num="0" id="851" />
+<TGConnectingPoint num="1" id="852" />
+<TGConnectingPoint num="2" id="853" />
+<TGConnectingPoint num="3" id="854" />
+<TGConnectingPoint num="4" id="855" />
+<TGConnectingPoint num="5" id="856" />
+<TGConnectingPoint num="6" id="857" />
+<TGConnectingPoint num="7" id="858" />
+<TGConnectingPoint num="8" id="859" />
+<TGConnectingPoint num="9" id="860" />
+<TGConnectingPoint num="10" id="861" />
+<TGConnectingPoint num="11" id="862" />
+<TGConnectingPoint num="12" id="863" />
+<TGConnectingPoint num="13" id="864" />
+<TGConnectingPoint num="14" id="865" />
+<TGConnectingPoint num="15" id="866" />
+<TGConnectingPoint num="16" id="867" />
+<TGConnectingPoint num="17" id="868" />
+<TGConnectingPoint num="18" id="869" />
+<TGConnectingPoint num="19" id="870" />
+<TGConnectingPoint num="20" id="871" />
+<TGConnectingPoint num="21" id="872" />
+<TGConnectingPoint num="22" id="873" />
+<TGConnectingPoint num="23" id="874" />
 <extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="false" cost="0" experience="0" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="672" >
-<father id="697" num="4" />
+<SUBCOMPONENT type="1401" id="900" index="51" uid="07cc3316-31ad-4299-8603-940a770a36dd" >
+<father id="925" num="4" />
 <cdparam x="473" y="669" />
-<sizeparam width="201" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="201" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="0" maxX="549" minY="0" maxY="116" />
 <infoparam name="TGComponent" value="Send_Malformed_Path_String" />
-<TGConnectingPoint num="0" id="660" />
-<TGConnectingPoint num="1" id="661" />
-<TGConnectingPoint num="2" id="662" />
-<TGConnectingPoint num="3" id="663" />
-<TGConnectingPoint num="4" id="664" />
-<TGConnectingPoint num="5" id="665" />
-<TGConnectingPoint num="6" id="666" />
-<TGConnectingPoint num="7" id="667" />
-<TGConnectingPoint num="8" id="668" />
-<TGConnectingPoint num="9" id="669" />
-<TGConnectingPoint num="10" id="670" />
-<TGConnectingPoint num="11" id="671" />
+<TGConnectingPoint num="0" id="876" />
+<TGConnectingPoint num="1" id="877" />
+<TGConnectingPoint num="2" id="878" />
+<TGConnectingPoint num="3" id="879" />
+<TGConnectingPoint num="4" id="880" />
+<TGConnectingPoint num="5" id="881" />
+<TGConnectingPoint num="6" id="882" />
+<TGConnectingPoint num="7" id="883" />
+<TGConnectingPoint num="8" id="884" />
+<TGConnectingPoint num="9" id="885" />
+<TGConnectingPoint num="10" id="886" />
+<TGConnectingPoint num="11" id="887" />
+<TGConnectingPoint num="12" id="888" />
+<TGConnectingPoint num="13" id="889" />
+<TGConnectingPoint num="14" id="890" />
+<TGConnectingPoint num="15" id="891" />
+<TGConnectingPoint num="16" id="892" />
+<TGConnectingPoint num="17" id="893" />
+<TGConnectingPoint num="18" id="894" />
+<TGConnectingPoint num="19" id="895" />
+<TGConnectingPoint num="20" id="896" />
+<TGConnectingPoint num="21" id="897" />
+<TGConnectingPoint num="22" id="898" />
+<TGConnectingPoint num="23" id="899" />
 <extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="false" cost="0" experience="0" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="1400" id="735" >
+<COMPONENT type="1400" id="975" index="31" uid="0d9317f4-872c-41ba-b740-b5e1aa765af3" >
 <cdparam x="95" y="592" />
 <sizeparam width="250" height="119" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Block2" value="Infected_USB" />
-<TGConnectingPoint num="0" id="711" />
-<TGConnectingPoint num="1" id="712" />
-<TGConnectingPoint num="2" id="713" />
-<TGConnectingPoint num="3" id="714" />
-<TGConnectingPoint num="4" id="715" />
-<TGConnectingPoint num="5" id="716" />
-<TGConnectingPoint num="6" id="717" />
-<TGConnectingPoint num="7" id="718" />
-<TGConnectingPoint num="8" id="719" />
-<TGConnectingPoint num="9" id="720" />
-<TGConnectingPoint num="10" id="721" />
-<TGConnectingPoint num="11" id="722" />
-<TGConnectingPoint num="12" id="723" />
-<TGConnectingPoint num="13" id="724" />
-<TGConnectingPoint num="14" id="725" />
-<TGConnectingPoint num="15" id="726" />
-<TGConnectingPoint num="16" id="727" />
-<TGConnectingPoint num="17" id="728" />
-<TGConnectingPoint num="18" id="729" />
-<TGConnectingPoint num="19" id="730" />
-<TGConnectingPoint num="20" id="731" />
-<TGConnectingPoint num="21" id="732" />
-<TGConnectingPoint num="22" id="733" />
-<TGConnectingPoint num="23" id="734" />
+<TGConnectingPoint num="0" id="951" />
+<TGConnectingPoint num="1" id="952" />
+<TGConnectingPoint num="2" id="953" />
+<TGConnectingPoint num="3" id="954" />
+<TGConnectingPoint num="4" id="955" />
+<TGConnectingPoint num="5" id="956" />
+<TGConnectingPoint num="6" id="957" />
+<TGConnectingPoint num="7" id="958" />
+<TGConnectingPoint num="8" id="959" />
+<TGConnectingPoint num="9" id="960" />
+<TGConnectingPoint num="10" id="961" />
+<TGConnectingPoint num="11" id="962" />
+<TGConnectingPoint num="12" id="963" />
+<TGConnectingPoint num="13" id="964" />
+<TGConnectingPoint num="14" id="965" />
+<TGConnectingPoint num="15" id="966" />
+<TGConnectingPoint num="16" id="967" />
+<TGConnectingPoint num="17" id="968" />
+<TGConnectingPoint num="18" id="969" />
+<TGConnectingPoint num="19" id="970" />
+<TGConnectingPoint num="20" id="971" />
+<TGConnectingPoint num="21" id="972" />
+<TGConnectingPoint num="22" id="973" />
+<TGConnectingPoint num="23" id="974" />
 </COMPONENT>
-<SUBCOMPONENT type="1401" id="710" >
-<father id="735" num="0" />
+<SUBCOMPONENT type="1401" id="950" index="52" uid="362e48aa-e191-4513-934a-d7060ad4e5b5" >
+<father id="975" num="0" />
 <cdparam x="101" y="647" />
-<sizeparam width="100" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="100" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="0" maxX="150" minY="0" maxY="79" />
 <infoparam name="TGComponent" value="Insert_USB" />
-<TGConnectingPoint num="0" id="698" />
-<TGConnectingPoint num="1" id="699" />
-<TGConnectingPoint num="2" id="700" />
-<TGConnectingPoint num="3" id="701" />
-<TGConnectingPoint num="4" id="702" />
-<TGConnectingPoint num="5" id="703" />
-<TGConnectingPoint num="6" id="704" />
-<TGConnectingPoint num="7" id="705" />
-<TGConnectingPoint num="8" id="706" />
-<TGConnectingPoint num="9" id="707" />
-<TGConnectingPoint num="10" id="708" />
-<TGConnectingPoint num="11" id="709" />
+<TGConnectingPoint num="0" id="926" />
+<TGConnectingPoint num="1" id="927" />
+<TGConnectingPoint num="2" id="928" />
+<TGConnectingPoint num="3" id="929" />
+<TGConnectingPoint num="4" id="930" />
+<TGConnectingPoint num="5" id="931" />
+<TGConnectingPoint num="6" id="932" />
+<TGConnectingPoint num="7" id="933" />
+<TGConnectingPoint num="8" id="934" />
+<TGConnectingPoint num="9" id="935" />
+<TGConnectingPoint num="10" id="936" />
+<TGConnectingPoint num="11" id="937" />
+<TGConnectingPoint num="12" id="938" />
+<TGConnectingPoint num="13" id="939" />
+<TGConnectingPoint num="14" id="940" />
+<TGConnectingPoint num="15" id="941" />
+<TGConnectingPoint num="16" id="942" />
+<TGConnectingPoint num="17" id="943" />
+<TGConnectingPoint num="18" id="944" />
+<TGConnectingPoint num="19" id="945" />
+<TGConnectingPoint num="20" id="946" />
+<TGConnectingPoint num="21" id="947" />
+<TGConnectingPoint num="22" id="948" />
+<TGConnectingPoint num="23" id="949" />
 <extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="false" cost="0" experience="0" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="1400" id="760" >
+<COMPONENT type="1400" id="1000" index="32" uid="16db95aa-87fc-49ba-95da-a64540d3bad4" >
 <cdparam x="13" y="566" />
 <sizeparam width="1107" height="239" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Block0" value="Compromised_Devices" />
-<TGConnectingPoint num="0" id="736" />
-<TGConnectingPoint num="1" id="737" />
-<TGConnectingPoint num="2" id="738" />
-<TGConnectingPoint num="3" id="739" />
-<TGConnectingPoint num="4" id="740" />
-<TGConnectingPoint num="5" id="741" />
-<TGConnectingPoint num="6" id="742" />
-<TGConnectingPoint num="7" id="743" />
-<TGConnectingPoint num="8" id="744" />
-<TGConnectingPoint num="9" id="745" />
-<TGConnectingPoint num="10" id="746" />
-<TGConnectingPoint num="11" id="747" />
-<TGConnectingPoint num="12" id="748" />
-<TGConnectingPoint num="13" id="749" />
-<TGConnectingPoint num="14" id="750" />
-<TGConnectingPoint num="15" id="751" />
-<TGConnectingPoint num="16" id="752" />
-<TGConnectingPoint num="17" id="753" />
-<TGConnectingPoint num="18" id="754" />
-<TGConnectingPoint num="19" id="755" />
-<TGConnectingPoint num="20" id="756" />
-<TGConnectingPoint num="21" id="757" />
-<TGConnectingPoint num="22" id="758" />
-<TGConnectingPoint num="23" id="759" />
+<TGConnectingPoint num="0" id="976" />
+<TGConnectingPoint num="1" id="977" />
+<TGConnectingPoint num="2" id="978" />
+<TGConnectingPoint num="3" id="979" />
+<TGConnectingPoint num="4" id="980" />
+<TGConnectingPoint num="5" id="981" />
+<TGConnectingPoint num="6" id="982" />
+<TGConnectingPoint num="7" id="983" />
+<TGConnectingPoint num="8" id="984" />
+<TGConnectingPoint num="9" id="985" />
+<TGConnectingPoint num="10" id="986" />
+<TGConnectingPoint num="11" id="987" />
+<TGConnectingPoint num="12" id="988" />
+<TGConnectingPoint num="13" id="989" />
+<TGConnectingPoint num="14" id="990" />
+<TGConnectingPoint num="15" id="991" />
+<TGConnectingPoint num="16" id="992" />
+<TGConnectingPoint num="17" id="993" />
+<TGConnectingPoint num="18" id="994" />
+<TGConnectingPoint num="19" id="995" />
+<TGConnectingPoint num="20" id="996" />
+<TGConnectingPoint num="21" id="997" />
+<TGConnectingPoint num="22" id="998" />
+<TGConnectingPoint num="23" id="999" />
 </COMPONENT>
 
-<COMPONENT type="1400" id="811" >
+<COMPONENT type="1400" id="1063" index="33" uid="f99f4b98-03a3-48b3-bb1e-93f22ab6d17c" >
 <cdparam x="10" y="10" />
 <sizeparam width="1111" height="539" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Block1" value="Windows_32bit" />
-<TGConnectingPoint num="0" id="787" />
-<TGConnectingPoint num="1" id="788" />
-<TGConnectingPoint num="2" id="789" />
-<TGConnectingPoint num="3" id="790" />
-<TGConnectingPoint num="4" id="791" />
-<TGConnectingPoint num="5" id="792" />
-<TGConnectingPoint num="6" id="793" />
-<TGConnectingPoint num="7" id="794" />
-<TGConnectingPoint num="8" id="795" />
-<TGConnectingPoint num="9" id="796" />
-<TGConnectingPoint num="10" id="797" />
-<TGConnectingPoint num="11" id="798" />
-<TGConnectingPoint num="12" id="799" />
-<TGConnectingPoint num="13" id="800" />
-<TGConnectingPoint num="14" id="801" />
-<TGConnectingPoint num="15" id="802" />
-<TGConnectingPoint num="16" id="803" />
-<TGConnectingPoint num="17" id="804" />
-<TGConnectingPoint num="18" id="805" />
-<TGConnectingPoint num="19" id="806" />
-<TGConnectingPoint num="20" id="807" />
-<TGConnectingPoint num="21" id="808" />
-<TGConnectingPoint num="22" id="809" />
-<TGConnectingPoint num="23" id="810" />
+<TGConnectingPoint num="0" id="1039" />
+<TGConnectingPoint num="1" id="1040" />
+<TGConnectingPoint num="2" id="1041" />
+<TGConnectingPoint num="3" id="1042" />
+<TGConnectingPoint num="4" id="1043" />
+<TGConnectingPoint num="5" id="1044" />
+<TGConnectingPoint num="6" id="1045" />
+<TGConnectingPoint num="7" id="1046" />
+<TGConnectingPoint num="8" id="1047" />
+<TGConnectingPoint num="9" id="1048" />
+<TGConnectingPoint num="10" id="1049" />
+<TGConnectingPoint num="11" id="1050" />
+<TGConnectingPoint num="12" id="1051" />
+<TGConnectingPoint num="13" id="1052" />
+<TGConnectingPoint num="14" id="1053" />
+<TGConnectingPoint num="15" id="1054" />
+<TGConnectingPoint num="16" id="1055" />
+<TGConnectingPoint num="17" id="1056" />
+<TGConnectingPoint num="18" id="1057" />
+<TGConnectingPoint num="19" id="1058" />
+<TGConnectingPoint num="20" id="1059" />
+<TGConnectingPoint num="21" id="1060" />
+<TGConnectingPoint num="22" id="1061" />
+<TGConnectingPoint num="23" id="1062" />
 </COMPONENT>
-<SUBCOMPONENT type="1401" id="773" >
-<father id="811" num="0" />
+<SUBCOMPONENT type="1401" id="1025" index="53" uid="3be8bcd7-66f6-47a5-9dc8-640193c37302" >
+<father id="1063" num="0" />
 <cdparam x="500" y="73" />
-<sizeparam width="130" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="130" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="0" maxX="981" minY="0" maxY="499" />
 <infoparam name="TGComponent" value="Excute_Stuxnet" />
-<TGConnectingPoint num="0" id="761" />
-<TGConnectingPoint num="1" id="762" />
-<TGConnectingPoint num="2" id="763" />
-<TGConnectingPoint num="3" id="764" />
-<TGConnectingPoint num="4" id="765" />
-<TGConnectingPoint num="5" id="766" />
-<TGConnectingPoint num="6" id="767" />
-<TGConnectingPoint num="7" id="768" />
-<TGConnectingPoint num="8" id="769" />
-<TGConnectingPoint num="9" id="770" />
-<TGConnectingPoint num="10" id="771" />
-<TGConnectingPoint num="11" id="772" />
+<TGConnectingPoint num="0" id="1001" />
+<TGConnectingPoint num="1" id="1002" />
+<TGConnectingPoint num="2" id="1003" />
+<TGConnectingPoint num="3" id="1004" />
+<TGConnectingPoint num="4" id="1005" />
+<TGConnectingPoint num="5" id="1006" />
+<TGConnectingPoint num="6" id="1007" />
+<TGConnectingPoint num="7" id="1008" />
+<TGConnectingPoint num="8" id="1009" />
+<TGConnectingPoint num="9" id="1010" />
+<TGConnectingPoint num="10" id="1011" />
+<TGConnectingPoint num="11" id="1012" />
+<TGConnectingPoint num="12" id="1013" />
+<TGConnectingPoint num="13" id="1014" />
+<TGConnectingPoint num="14" id="1015" />
+<TGConnectingPoint num="15" id="1016" />
+<TGConnectingPoint num="16" id="1017" />
+<TGConnectingPoint num="17" id="1018" />
+<TGConnectingPoint num="18" id="1019" />
+<TGConnectingPoint num="19" id="1020" />
+<TGConnectingPoint num="20" id="1021" />
+<TGConnectingPoint num="21" id="1022" />
+<TGConnectingPoint num="22" id="1023" />
+<TGConnectingPoint num="23" id="1024" />
 <extraparam>
-<info description="blah blah blah" root="true" />
+<info description="blah blah blah" root="true" cost="0" experience="0" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1402" id="786" >
-<father id="811" num="1" />
+<SUBCOMPONENT type="1402" id="1038" index="54" uid="93ff4159-2092-4930-9493-d36bd16d8a8f" >
+<father id="1063" num="1" />
 <cdparam x="487" y="166" />
-<sizeparam width="150" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="150" height="50" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="961" minY="0" maxY="489" />
 <infoparam name="TGComponent" value="&lt;&lt;OR&gt;&gt;" />
-<TGConnectingPoint num="0" id="774" />
-<TGConnectingPoint num="1" id="775" />
-<TGConnectingPoint num="2" id="776" />
-<TGConnectingPoint num="3" id="777" />
-<TGConnectingPoint num="4" id="778" />
-<TGConnectingPoint num="5" id="779" />
-<TGConnectingPoint num="6" id="780" />
-<TGConnectingPoint num="7" id="781" />
-<TGConnectingPoint num="8" id="782" />
-<TGConnectingPoint num="9" id="783" />
-<TGConnectingPoint num="10" id="784" />
-<TGConnectingPoint num="11" id="785" />
+<TGConnectingPoint num="0" id="1026" />
+<TGConnectingPoint num="1" id="1027" />
+<TGConnectingPoint num="2" id="1028" />
+<TGConnectingPoint num="3" id="1029" />
+<TGConnectingPoint num="4" id="1030" />
+<TGConnectingPoint num="5" id="1031" />
+<TGConnectingPoint num="6" id="1032" />
+<TGConnectingPoint num="7" id="1033" />
+<TGConnectingPoint num="8" id="1034" />
+<TGConnectingPoint num="9" id="1035" />
+<TGConnectingPoint num="10" id="1036" />
+<TGConnectingPoint num="11" id="1037" />
 <extraparam>
 <info equation="" />
 </extraparam>
@@ -1456,88 +1708,88 @@
 </AttackTreeDiagramPanel>
 
 <AttackTreeDiagramPanel name="Inject_To_Project_Files" minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
-<CONNECTOR type="133" id="813" >
+<CONNECTOR type="133" id="1065" index="0" uid="3944953c-bab6-45d8-9dae-457ff156b8eb" >
 <cdparam x="769" y="430" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="" />
-<TGConnectingPoint num="0" id="812" />
-<P1  x="769" y="430" id="886" />
-<P2  x="743" y="474" id="900" />
+<TGConnectingPoint num="0" id="1064" />
+<P1  x="769" y="430" id="1150" />
+<P2  x="743" y="474" id="1176" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="133" id="815" >
+<CONNECTOR type="133" id="1067" index="1" uid="165258d2-9263-4813-a413-e1cae7f2f74b" >
 <cdparam x="769" y="430" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector" value="" />
-<TGConnectingPoint num="0" id="814" />
-<P1  x="769" y="430" id="886" />
-<P2  x="719" y="399" id="913" />
+<TGConnectingPoint num="0" id="1066" />
+<P1  x="769" y="430" id="1150" />
+<P2  x="719" y="399" id="1201" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="133" id="817" >
+<CONNECTOR type="133" id="1069" index="2" uid="2ca06f6b-1723-48da-a83b-ff651967bb93" >
 <cdparam x="439" y="245" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
-<TGConnectingPoint num="0" id="816" />
-<P1  x="462" y="243" id="978" />
-<P2  x="659" y="230" id="848" />
+<TGConnectingPoint num="0" id="1068" />
+<P1  x="462" y="243" id="1302" />
+<P2  x="659" y="230" id="1100" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="133" id="819" >
+<CONNECTOR type="133" id="1071" index="3" uid="bace84a5-e829-4230-9cfe-d07291feefc3" >
 <cdparam x="351" y="313" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
-<TGConnectingPoint num="0" id="818" />
-<P1  x="351" y="313" id="963" />
-<P2  x="363" y="263" id="979" />
+<TGConnectingPoint num="0" id="1070" />
+<P1  x="351" y="313" id="1287" />
+<P2  x="363" y="263" id="1303" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="133" id="821" >
+<CONNECTOR type="133" id="1073" index="4" uid="c9174701-76f8-455d-a4e7-ae5417a030b0" >
 <cdparam x="272" y="392" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
-<TGConnectingPoint num="0" id="820" />
-<P1  x="275" y="392" id="950" />
-<P2  x="313" y="363" id="973" />
+<TGConnectingPoint num="0" id="1072" />
+<P1  x="275" y="392" id="1262" />
+<P2  x="313" y="363" id="1297" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="133" id="823" >
+<CONNECTOR type="133" id="1075" index="5" uid="eabaf81b-fda8-41ba-825a-a46aa6a349b4" >
 <cdparam x="463" y="339" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
-<TGConnectingPoint num="0" id="822" />
-<P1  x="463" y="339" id="938" />
-<P2  x="426" y="338" id="965" />
+<TGConnectingPoint num="0" id="1074" />
+<P1  x="463" y="339" id="1238" />
+<P2  x="426" y="338" id="1289" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="133" id="825" >
+<CONNECTOR type="133" id="1077" index="6" uid="48f5d07f-2909-48f5-b784-61b6b4d8c9cc" >
 <cdparam x="519" y="385" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
-<TGConnectingPoint num="0" id="824" />
-<P1  x="436" y="422" id="928" />
-<P2  x="530" y="359" id="940" />
+<TGConnectingPoint num="0" id="1076" />
+<P1  x="436" y="422" id="1228" />
+<P2  x="530" y="359" id="1240" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="133" id="827" >
+<CONNECTOR type="133" id="1079" index="7" uid="ac72ae0e-2ea8-4954-a9c9-0a83666009b5" >
 <cdparam x="669" y="451" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
-<TGConnectingPoint num="0" id="826" />
-<P1  x="578" y="474" id="899" />
-<P2  x="549" y="459" id="933" />
+<TGConnectingPoint num="0" id="1078" />
+<P1  x="578" y="474" id="1175" />
+<P2  x="549" y="459" id="1233" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="133" id="829" >
+<CONNECTOR type="133" id="1081" index="8" uid="bafc374d-65d0-4b7d-9164-e3090287761d" >
 <cdparam x="676" y="370" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
-<TGConnectingPoint num="0" id="828" />
-<P1  x="581" y="399" id="912" />
-<P2  x="549" y="434" id="931" />
+<TGConnectingPoint num="0" id="1080" />
+<P1  x="581" y="399" id="1200" />
+<P2  x="549" y="434" id="1231" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<COMPONENT type="301" id="846" >
+<COMPONENT type="301" id="1098" index="9" uid="aef17f20-4283-4722-a219-c1621c898c00" >
 <cdparam x="73" y="134" />
 <sizeparam width="278" height="50" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
@@ -1545,303 +1797,387 @@
 <infoparam name="UML Note" value="inject dll to well known process including 
 S7tgtopx.exe
 " />
-<TGConnectingPoint num="0" id="830" />
-<TGConnectingPoint num="1" id="831" />
-<TGConnectingPoint num="2" id="832" />
-<TGConnectingPoint num="3" id="833" />
-<TGConnectingPoint num="4" id="834" />
-<TGConnectingPoint num="5" id="835" />
-<TGConnectingPoint num="6" id="836" />
-<TGConnectingPoint num="7" id="837" />
-<TGConnectingPoint num="8" id="838" />
-<TGConnectingPoint num="9" id="839" />
-<TGConnectingPoint num="10" id="840" />
-<TGConnectingPoint num="11" id="841" />
-<TGConnectingPoint num="12" id="842" />
-<TGConnectingPoint num="13" id="843" />
-<TGConnectingPoint num="14" id="844" />
-<TGConnectingPoint num="15" id="845" />
+<TGConnectingPoint num="0" id="1082" />
+<TGConnectingPoint num="1" id="1083" />
+<TGConnectingPoint num="2" id="1084" />
+<TGConnectingPoint num="3" id="1085" />
+<TGConnectingPoint num="4" id="1086" />
+<TGConnectingPoint num="5" id="1087" />
+<TGConnectingPoint num="6" id="1088" />
+<TGConnectingPoint num="7" id="1089" />
+<TGConnectingPoint num="8" id="1090" />
+<TGConnectingPoint num="9" id="1091" />
+<TGConnectingPoint num="10" id="1092" />
+<TGConnectingPoint num="11" id="1093" />
+<TGConnectingPoint num="12" id="1094" />
+<TGConnectingPoint num="13" id="1095" />
+<TGConnectingPoint num="14" id="1096" />
+<TGConnectingPoint num="15" id="1097" />
 <extraparam>
 <Line value="inject dll to well known process including " />
 <Line value="S7tgtopx.exe" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1400" id="884" >
+<COMPONENT type="1400" id="1148" index="10" uid="59c48c41-ffea-4eb2-827c-9c0a448dadff" >
 <cdparam x="611" y="135" />
 <sizeparam width="250" height="200" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Block1" value="S7_Sofware" />
-<TGConnectingPoint num="0" id="860" />
-<TGConnectingPoint num="1" id="861" />
-<TGConnectingPoint num="2" id="862" />
-<TGConnectingPoint num="3" id="863" />
-<TGConnectingPoint num="4" id="864" />
-<TGConnectingPoint num="5" id="865" />
-<TGConnectingPoint num="6" id="866" />
-<TGConnectingPoint num="7" id="867" />
-<TGConnectingPoint num="8" id="868" />
-<TGConnectingPoint num="9" id="869" />
-<TGConnectingPoint num="10" id="870" />
-<TGConnectingPoint num="11" id="871" />
-<TGConnectingPoint num="12" id="872" />
-<TGConnectingPoint num="13" id="873" />
-<TGConnectingPoint num="14" id="874" />
-<TGConnectingPoint num="15" id="875" />
-<TGConnectingPoint num="16" id="876" />
-<TGConnectingPoint num="17" id="877" />
-<TGConnectingPoint num="18" id="878" />
-<TGConnectingPoint num="19" id="879" />
-<TGConnectingPoint num="20" id="880" />
-<TGConnectingPoint num="21" id="881" />
-<TGConnectingPoint num="22" id="882" />
-<TGConnectingPoint num="23" id="883" />
+<TGConnectingPoint num="0" id="1124" />
+<TGConnectingPoint num="1" id="1125" />
+<TGConnectingPoint num="2" id="1126" />
+<TGConnectingPoint num="3" id="1127" />
+<TGConnectingPoint num="4" id="1128" />
+<TGConnectingPoint num="5" id="1129" />
+<TGConnectingPoint num="6" id="1130" />
+<TGConnectingPoint num="7" id="1131" />
+<TGConnectingPoint num="8" id="1132" />
+<TGConnectingPoint num="9" id="1133" />
+<TGConnectingPoint num="10" id="1134" />
+<TGConnectingPoint num="11" id="1135" />
+<TGConnectingPoint num="12" id="1136" />
+<TGConnectingPoint num="13" id="1137" />
+<TGConnectingPoint num="14" id="1138" />
+<TGConnectingPoint num="15" id="1139" />
+<TGConnectingPoint num="16" id="1140" />
+<TGConnectingPoint num="17" id="1141" />
+<TGConnectingPoint num="18" id="1142" />
+<TGConnectingPoint num="19" id="1143" />
+<TGConnectingPoint num="20" id="1144" />
+<TGConnectingPoint num="21" id="1145" />
+<TGConnectingPoint num="22" id="1146" />
+<TGConnectingPoint num="23" id="1147" />
 </COMPONENT>
-<SUBCOMPONENT type="1401" id="859" >
-<father id="884" num="0" />
+<SUBCOMPONENT type="1401" id="1123" index="13" uid="ce7355e8-4541-4e3e-9380-808df8f8e1aa" >
+<father id="1148" num="0" />
 <cdparam x="659" y="210" />
-<sizeparam width="159" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="159" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="0" maxX="91" minY="0" maxY="160" />
 <infoparam name="TGComponent" value="Inject_To_Project_Files" />
-<TGConnectingPoint num="0" id="847" />
-<TGConnectingPoint num="1" id="848" />
-<TGConnectingPoint num="2" id="849" />
-<TGConnectingPoint num="3" id="850" />
-<TGConnectingPoint num="4" id="851" />
-<TGConnectingPoint num="5" id="852" />
-<TGConnectingPoint num="6" id="853" />
-<TGConnectingPoint num="7" id="854" />
-<TGConnectingPoint num="8" id="855" />
-<TGConnectingPoint num="9" id="856" />
-<TGConnectingPoint num="10" id="857" />
-<TGConnectingPoint num="11" id="858" />
+<TGConnectingPoint num="0" id="1099" />
+<TGConnectingPoint num="1" id="1100" />
+<TGConnectingPoint num="2" id="1101" />
+<TGConnectingPoint num="3" id="1102" />
+<TGConnectingPoint num="4" id="1103" />
+<TGConnectingPoint num="5" id="1104" />
+<TGConnectingPoint num="6" id="1105" />
+<TGConnectingPoint num="7" id="1106" />
+<TGConnectingPoint num="8" id="1107" />
+<TGConnectingPoint num="9" id="1108" />
+<TGConnectingPoint num="10" id="1109" />
+<TGConnectingPoint num="11" id="1110" />
+<TGConnectingPoint num="12" id="1111" />
+<TGConnectingPoint num="13" id="1112" />
+<TGConnectingPoint num="14" id="1113" />
+<TGConnectingPoint num="15" id="1114" />
+<TGConnectingPoint num="16" id="1115" />
+<TGConnectingPoint num="17" id="1116" />
+<TGConnectingPoint num="18" id="1117" />
+<TGConnectingPoint num="19" id="1118" />
+<TGConnectingPoint num="20" id="1119" />
+<TGConnectingPoint num="21" id="1120" />
+<TGConnectingPoint num="22" id="1121" />
+<TGConnectingPoint num="23" id="1122" />
 <extraparam>
-<info description="blah blah blah" root="true" />
+<info description="blah blah blah" root="true" cost="0" experience="0" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="1401" id="897" >
+<COMPONENT type="1401" id="1173" index="11" uid="6befc4c0-3f37-49aa-8f29-ae11a9d11183" >
 <cdparam x="769" y="410" />
-<sizeparam width="124" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="124" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="TGComponent" value="Execute_Stuxnet" />
-<TGConnectingPoint num="0" id="885" />
-<TGConnectingPoint num="1" id="886" />
-<TGConnectingPoint num="2" id="887" />
-<TGConnectingPoint num="3" id="888" />
-<TGConnectingPoint num="4" id="889" />
-<TGConnectingPoint num="5" id="890" />
-<TGConnectingPoint num="6" id="891" />
-<TGConnectingPoint num="7" id="892" />
-<TGConnectingPoint num="8" id="893" />
-<TGConnectingPoint num="9" id="894" />
-<TGConnectingPoint num="10" id="895" />
-<TGConnectingPoint num="11" id="896" />
+<TGConnectingPoint num="0" id="1149" />
+<TGConnectingPoint num="1" id="1150" />
+<TGConnectingPoint num="2" id="1151" />
+<TGConnectingPoint num="3" id="1152" />
+<TGConnectingPoint num="4" id="1153" />
+<TGConnectingPoint num="5" id="1154" />
+<TGConnectingPoint num="6" id="1155" />
+<TGConnectingPoint num="7" id="1156" />
+<TGConnectingPoint num="8" id="1157" />
+<TGConnectingPoint num="9" id="1158" />
+<TGConnectingPoint num="10" id="1159" />
+<TGConnectingPoint num="11" id="1160" />
+<TGConnectingPoint num="12" id="1161" />
+<TGConnectingPoint num="13" id="1162" />
+<TGConnectingPoint num="14" id="1163" />
+<TGConnectingPoint num="15" id="1164" />
+<TGConnectingPoint num="16" id="1165" />
+<TGConnectingPoint num="17" id="1166" />
+<TGConnectingPoint num="18" id="1167" />
+<TGConnectingPoint num="19" id="1168" />
+<TGConnectingPoint num="20" id="1169" />
+<TGConnectingPoint num="21" id="1170" />
+<TGConnectingPoint num="22" id="1171" />
+<TGConnectingPoint num="23" id="1172" />
 <extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="false" cost="0" experience="0" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1400" id="1013" >
+<COMPONENT type="1400" id="1349" index="12" uid="3aaf1054-35d3-4943-85a9-78cb536fabcf" >
 <cdparam x="214" y="98" />
 <sizeparam width="681" height="436" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Block0" value="Windows_32bit" />
-<TGConnectingPoint num="0" id="989" />
-<TGConnectingPoint num="1" id="990" />
-<TGConnectingPoint num="2" id="991" />
-<TGConnectingPoint num="3" id="992" />
-<TGConnectingPoint num="4" id="993" />
-<TGConnectingPoint num="5" id="994" />
-<TGConnectingPoint num="6" id="995" />
-<TGConnectingPoint num="7" id="996" />
-<TGConnectingPoint num="8" id="997" />
-<TGConnectingPoint num="9" id="998" />
-<TGConnectingPoint num="10" id="999" />
-<TGConnectingPoint num="11" id="1000" />
-<TGConnectingPoint num="12" id="1001" />
-<TGConnectingPoint num="13" id="1002" />
-<TGConnectingPoint num="14" id="1003" />
-<TGConnectingPoint num="15" id="1004" />
-<TGConnectingPoint num="16" id="1005" />
-<TGConnectingPoint num="17" id="1006" />
-<TGConnectingPoint num="18" id="1007" />
-<TGConnectingPoint num="19" id="1008" />
-<TGConnectingPoint num="20" id="1009" />
-<TGConnectingPoint num="21" id="1010" />
-<TGConnectingPoint num="22" id="1011" />
-<TGConnectingPoint num="23" id="1012" />
+<TGConnectingPoint num="0" id="1325" />
+<TGConnectingPoint num="1" id="1326" />
+<TGConnectingPoint num="2" id="1327" />
+<TGConnectingPoint num="3" id="1328" />
+<TGConnectingPoint num="4" id="1329" />
+<TGConnectingPoint num="5" id="1330" />
+<TGConnectingPoint num="6" id="1331" />
+<TGConnectingPoint num="7" id="1332" />
+<TGConnectingPoint num="8" id="1333" />
+<TGConnectingPoint num="9" id="1334" />
+<TGConnectingPoint num="10" id="1335" />
+<TGConnectingPoint num="11" id="1336" />
+<TGConnectingPoint num="12" id="1337" />
+<TGConnectingPoint num="13" id="1338" />
+<TGConnectingPoint num="14" id="1339" />
+<TGConnectingPoint num="15" id="1340" />
+<TGConnectingPoint num="16" id="1341" />
+<TGConnectingPoint num="17" id="1342" />
+<TGConnectingPoint num="18" id="1343" />
+<TGConnectingPoint num="19" id="1344" />
+<TGConnectingPoint num="20" id="1345" />
+<TGConnectingPoint num="21" id="1346" />
+<TGConnectingPoint num="22" id="1347" />
+<TGConnectingPoint num="23" id="1348" />
 </COMPONENT>
-<SUBCOMPONENT type="1401" id="910" >
-<father id="1013" num="0" />
+<SUBCOMPONENT type="1401" id="1198" index="14" uid="42a0a5e1-8dea-479f-b9ed-950d9dd95959" >
+<father id="1349" num="0" />
 <cdparam x="578" y="454" />
-<sizeparam width="165" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="165" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="0" maxX="516" minY="0" maxY="396" />
 <infoparam name="TGComponent" value="Exploit_Task_Scheduler" />
-<TGConnectingPoint num="0" id="898" />
-<TGConnectingPoint num="1" id="899" />
-<TGConnectingPoint num="2" id="900" />
-<TGConnectingPoint num="3" id="901" />
-<TGConnectingPoint num="4" id="902" />
-<TGConnectingPoint num="5" id="903" />
-<TGConnectingPoint num="6" id="904" />
-<TGConnectingPoint num="7" id="905" />
-<TGConnectingPoint num="8" id="906" />
-<TGConnectingPoint num="9" id="907" />
-<TGConnectingPoint num="10" id="908" />
-<TGConnectingPoint num="11" id="909" />
+<TGConnectingPoint num="0" id="1174" />
+<TGConnectingPoint num="1" id="1175" />
+<TGConnectingPoint num="2" id="1176" />
+<TGConnectingPoint num="3" id="1177" />
+<TGConnectingPoint num="4" id="1178" />
+<TGConnectingPoint num="5" id="1179" />
+<TGConnectingPoint num="6" id="1180" />
+<TGConnectingPoint num="7" id="1181" />
+<TGConnectingPoint num="8" id="1182" />
+<TGConnectingPoint num="9" id="1183" />
+<TGConnectingPoint num="10" id="1184" />
+<TGConnectingPoint num="11" id="1185" />
+<TGConnectingPoint num="12" id="1186" />
+<TGConnectingPoint num="13" id="1187" />
+<TGConnectingPoint num="14" id="1188" />
+<TGConnectingPoint num="15" id="1189" />
+<TGConnectingPoint num="16" id="1190" />
+<TGConnectingPoint num="17" id="1191" />
+<TGConnectingPoint num="18" id="1192" />
+<TGConnectingPoint num="19" id="1193" />
+<TGConnectingPoint num="20" id="1194" />
+<TGConnectingPoint num="21" id="1195" />
+<TGConnectingPoint num="22" id="1196" />
+<TGConnectingPoint num="23" id="1197" />
 <extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="false" cost="0" experience="0" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="923" >
-<father id="1013" num="1" />
+<SUBCOMPONENT type="1401" id="1223" index="15" uid="56956c9c-c279-467f-b612-9422903a56bb" >
+<father id="1349" num="1" />
 <cdparam x="581" y="379" />
-<sizeparam width="138" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="138" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="0" maxX="543" minY="0" maxY="396" />
 <infoparam name="TGComponent" value="Exploit_Win32k_sys" />
-<TGConnectingPoint num="0" id="911" />
-<TGConnectingPoint num="1" id="912" />
-<TGConnectingPoint num="2" id="913" />
-<TGConnectingPoint num="3" id="914" />
-<TGConnectingPoint num="4" id="915" />
-<TGConnectingPoint num="5" id="916" />
-<TGConnectingPoint num="6" id="917" />
-<TGConnectingPoint num="7" id="918" />
-<TGConnectingPoint num="8" id="919" />
-<TGConnectingPoint num="9" id="920" />
-<TGConnectingPoint num="10" id="921" />
-<TGConnectingPoint num="11" id="922" />
+<TGConnectingPoint num="0" id="1199" />
+<TGConnectingPoint num="1" id="1200" />
+<TGConnectingPoint num="2" id="1201" />
+<TGConnectingPoint num="3" id="1202" />
+<TGConnectingPoint num="4" id="1203" />
+<TGConnectingPoint num="5" id="1204" />
+<TGConnectingPoint num="6" id="1205" />
+<TGConnectingPoint num="7" id="1206" />
+<TGConnectingPoint num="8" id="1207" />
+<TGConnectingPoint num="9" id="1208" />
+<TGConnectingPoint num="10" id="1209" />
+<TGConnectingPoint num="11" id="1210" />
+<TGConnectingPoint num="12" id="1211" />
+<TGConnectingPoint num="13" id="1212" />
+<TGConnectingPoint num="14" id="1213" />
+<TGConnectingPoint num="15" id="1214" />
+<TGConnectingPoint num="16" id="1215" />
+<TGConnectingPoint num="17" id="1216" />
+<TGConnectingPoint num="18" id="1217" />
+<TGConnectingPoint num="19" id="1218" />
+<TGConnectingPoint num="20" id="1219" />
+<TGConnectingPoint num="21" id="1220" />
+<TGConnectingPoint num="22" id="1221" />
+<TGConnectingPoint num="23" id="1222" />
 <extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="false" cost="0" experience="0" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1402" id="936" >
-<father id="1013" num="2" />
+<SUBCOMPONENT type="1402" id="1236" index="16" uid="128eb468-a85d-453d-b9f0-2fff4be7224a" >
+<father id="1349" num="2" />
 <cdparam x="399" y="422" />
-<sizeparam width="150" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="150" height="50" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="513" minY="0" maxY="345" />
 <infoparam name="TGComponent" value="&lt;&lt;OR&gt;&gt;" />
-<TGConnectingPoint num="0" id="924" />
-<TGConnectingPoint num="1" id="925" />
-<TGConnectingPoint num="2" id="926" />
-<TGConnectingPoint num="3" id="927" />
-<TGConnectingPoint num="4" id="928" />
-<TGConnectingPoint num="5" id="929" />
-<TGConnectingPoint num="6" id="930" />
-<TGConnectingPoint num="7" id="931" />
-<TGConnectingPoint num="8" id="932" />
-<TGConnectingPoint num="9" id="933" />
-<TGConnectingPoint num="10" id="934" />
-<TGConnectingPoint num="11" id="935" />
+<TGConnectingPoint num="0" id="1224" />
+<TGConnectingPoint num="1" id="1225" />
+<TGConnectingPoint num="2" id="1226" />
+<TGConnectingPoint num="3" id="1227" />
+<TGConnectingPoint num="4" id="1228" />
+<TGConnectingPoint num="5" id="1229" />
+<TGConnectingPoint num="6" id="1230" />
+<TGConnectingPoint num="7" id="1231" />
+<TGConnectingPoint num="8" id="1232" />
+<TGConnectingPoint num="9" id="1233" />
+<TGConnectingPoint num="10" id="1234" />
+<TGConnectingPoint num="11" id="1235" />
 <extraparam>
 <info equation="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="949" >
-<father id="1013" num="3" />
+<SUBCOMPONENT type="1401" id="1261" index="17" uid="fecd01c8-d395-4e10-b03b-899fe6ed4386" >
+<father id="1349" num="3" />
 <cdparam x="463" y="319" />
-<sizeparam width="135" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="135" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="0" maxX="546" minY="0" maxY="396" />
 <infoparam name="TGComponent" value="Get_Root_Privilege" />
-<TGConnectingPoint num="0" id="937" />
-<TGConnectingPoint num="1" id="938" />
-<TGConnectingPoint num="2" id="939" />
-<TGConnectingPoint num="3" id="940" />
-<TGConnectingPoint num="4" id="941" />
-<TGConnectingPoint num="5" id="942" />
-<TGConnectingPoint num="6" id="943" />
-<TGConnectingPoint num="7" id="944" />
-<TGConnectingPoint num="8" id="945" />
-<TGConnectingPoint num="9" id="946" />
-<TGConnectingPoint num="10" id="947" />
-<TGConnectingPoint num="11" id="948" />
+<TGConnectingPoint num="0" id="1237" />
+<TGConnectingPoint num="1" id="1238" />
+<TGConnectingPoint num="2" id="1239" />
+<TGConnectingPoint num="3" id="1240" />
+<TGConnectingPoint num="4" id="1241" />
+<TGConnectingPoint num="5" id="1242" />
+<TGConnectingPoint num="6" id="1243" />
+<TGConnectingPoint num="7" id="1244" />
+<TGConnectingPoint num="8" id="1245" />
+<TGConnectingPoint num="9" id="1246" />
+<TGConnectingPoint num="10" id="1247" />
+<TGConnectingPoint num="11" id="1248" />
+<TGConnectingPoint num="12" id="1249" />
+<TGConnectingPoint num="13" id="1250" />
+<TGConnectingPoint num="14" id="1251" />
+<TGConnectingPoint num="15" id="1252" />
+<TGConnectingPoint num="16" id="1253" />
+<TGConnectingPoint num="17" id="1254" />
+<TGConnectingPoint num="18" id="1255" />
+<TGConnectingPoint num="19" id="1256" />
+<TGConnectingPoint num="20" id="1257" />
+<TGConnectingPoint num="21" id="1258" />
+<TGConnectingPoint num="22" id="1259" />
+<TGConnectingPoint num="23" id="1260" />
 <extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="false" cost="0" experience="0" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="962" >
-<father id="1013" num="4" />
+<SUBCOMPONENT type="1401" id="1286" index="18" uid="fa66cdde-0e63-41cf-a455-792660592083" >
+<father id="1349" num="4" />
 <cdparam x="214" y="392" />
-<sizeparam width="123" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="123" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="0" maxX="558" minY="0" maxY="396" />
 <infoparam name="TGComponent" value="Bypass_Antivirus" />
-<TGConnectingPoint num="0" id="950" />
-<TGConnectingPoint num="1" id="951" />
-<TGConnectingPoint num="2" id="952" />
-<TGConnectingPoint num="3" id="953" />
-<TGConnectingPoint num="4" id="954" />
-<TGConnectingPoint num="5" id="955" />
-<TGConnectingPoint num="6" id="956" />
-<TGConnectingPoint num="7" id="957" />
-<TGConnectingPoint num="8" id="958" />
-<TGConnectingPoint num="9" id="959" />
-<TGConnectingPoint num="10" id="960" />
-<TGConnectingPoint num="11" id="961" />
+<TGConnectingPoint num="0" id="1262" />
+<TGConnectingPoint num="1" id="1263" />
+<TGConnectingPoint num="2" id="1264" />
+<TGConnectingPoint num="3" id="1265" />
+<TGConnectingPoint num="4" id="1266" />
+<TGConnectingPoint num="5" id="1267" />
+<TGConnectingPoint num="6" id="1268" />
+<TGConnectingPoint num="7" id="1269" />
+<TGConnectingPoint num="8" id="1270" />
+<TGConnectingPoint num="9" id="1271" />
+<TGConnectingPoint num="10" id="1272" />
+<TGConnectingPoint num="11" id="1273" />
+<TGConnectingPoint num="12" id="1274" />
+<TGConnectingPoint num="13" id="1275" />
+<TGConnectingPoint num="14" id="1276" />
+<TGConnectingPoint num="15" id="1277" />
+<TGConnectingPoint num="16" id="1278" />
+<TGConnectingPoint num="17" id="1279" />
+<TGConnectingPoint num="18" id="1280" />
+<TGConnectingPoint num="19" id="1281" />
+<TGConnectingPoint num="20" id="1282" />
+<TGConnectingPoint num="21" id="1283" />
+<TGConnectingPoint num="22" id="1284" />
+<TGConnectingPoint num="23" id="1285" />
 <extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="false" cost="0" experience="0" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1402" id="975" >
-<father id="1013" num="5" />
+<SUBCOMPONENT type="1402" id="1299" index="19" uid="d8bb1b1f-347b-4041-8ae9-a482ff9cd47c" >
+<father id="1349" num="5" />
 <cdparam x="276" y="313" />
-<sizeparam width="150" height="50" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="150" height="50" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="0" maxX="513" minY="0" maxY="345" />
 <infoparam name="TGComponent" value="&lt;&lt;AND&gt;&gt;" />
-<TGConnectingPoint num="0" id="963" />
-<TGConnectingPoint num="1" id="964" />
-<TGConnectingPoint num="2" id="965" />
-<TGConnectingPoint num="3" id="966" />
-<TGConnectingPoint num="4" id="967" />
-<TGConnectingPoint num="5" id="968" />
-<TGConnectingPoint num="6" id="969" />
-<TGConnectingPoint num="7" id="970" />
-<TGConnectingPoint num="8" id="971" />
-<TGConnectingPoint num="9" id="972" />
-<TGConnectingPoint num="10" id="973" />
-<TGConnectingPoint num="11" id="974" />
+<TGConnectingPoint num="0" id="1287" />
+<TGConnectingPoint num="1" id="1288" />
+<TGConnectingPoint num="2" id="1289" />
+<TGConnectingPoint num="3" id="1290" />
+<TGConnectingPoint num="4" id="1291" />
+<TGConnectingPoint num="5" id="1292" />
+<TGConnectingPoint num="6" id="1293" />
+<TGConnectingPoint num="7" id="1294" />
+<TGConnectingPoint num="8" id="1295" />
+<TGConnectingPoint num="9" id="1296" />
+<TGConnectingPoint num="10" id="1297" />
+<TGConnectingPoint num="11" id="1298" />
 <extraparam>
 <info equation="" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="988" >
-<father id="1013" num="6" />
+<SUBCOMPONENT type="1401" id="1324" index="20" uid="ff99760a-4244-48fc-b3a0-88b3db62dc58" >
+<father id="1349" num="6" />
 <cdparam x="265" y="223" />
-<sizeparam width="197" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="197" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="0" maxX="484" minY="0" maxY="396" />
 <infoparam name="TGComponent" value="Inject_To_Particular_Process" />
-<TGConnectingPoint num="0" id="976" />
-<TGConnectingPoint num="1" id="977" />
-<TGConnectingPoint num="2" id="978" />
-<TGConnectingPoint num="3" id="979" />
-<TGConnectingPoint num="4" id="980" />
-<TGConnectingPoint num="5" id="981" />
-<TGConnectingPoint num="6" id="982" />
-<TGConnectingPoint num="7" id="983" />
-<TGConnectingPoint num="8" id="984" />
-<TGConnectingPoint num="9" id="985" />
-<TGConnectingPoint num="10" id="986" />
-<TGConnectingPoint num="11" id="987" />
+<TGConnectingPoint num="0" id="1300" />
+<TGConnectingPoint num="1" id="1301" />
+<TGConnectingPoint num="2" id="1302" />
+<TGConnectingPoint num="3" id="1303" />
+<TGConnectingPoint num="4" id="1304" />
+<TGConnectingPoint num="5" id="1305" />
+<TGConnectingPoint num="6" id="1306" />
+<TGConnectingPoint num="7" id="1307" />
+<TGConnectingPoint num="8" id="1308" />
+<TGConnectingPoint num="9" id="1309" />
+<TGConnectingPoint num="10" id="1310" />
+<TGConnectingPoint num="11" id="1311" />
+<TGConnectingPoint num="12" id="1312" />
+<TGConnectingPoint num="13" id="1313" />
+<TGConnectingPoint num="14" id="1314" />
+<TGConnectingPoint num="15" id="1315" />
+<TGConnectingPoint num="16" id="1316" />
+<TGConnectingPoint num="17" id="1317" />
+<TGConnectingPoint num="18" id="1318" />
+<TGConnectingPoint num="19" id="1319" />
+<TGConnectingPoint num="20" id="1320" />
+<TGConnectingPoint num="21" id="1321" />
+<TGConnectingPoint num="22" id="1322" />
+<TGConnectingPoint num="23" id="1323" />
 <extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="false" cost="0" experience="0" />
 </extraparam>
 </SUBCOMPONENT>
 
@@ -1849,218 +2185,266 @@ S7tgtopx.exe
 </AttackTreeDiagramPanel>
 
 <AttackTreeDiagramPanel name="Modify_PLCs " minX="10" maxX="1400" minY="10" maxY="900" zoom="1.0" >
-<CONNECTOR type="133" id="1015" >
+<CONNECTOR type="133" id="1351" index="0" uid="146c870a-c69f-4660-8108-73e973a899e8" >
 <cdparam x="581" y="178" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
-<TGConnectingPoint num="0" id="1014" />
-<P1  x="572" y="178" id="1103" />
-<P2  x="680" y="178" id="1038" />
+<TGConnectingPoint num="0" id="1350" />
+<P1  x="572" y="178" id="1475" />
+<P2  x="680" y="178" id="1374" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="133" id="1017" >
+<CONNECTOR type="133" id="1353" index="1" uid="43dea1e5-d6b4-499e-8fa7-2fb1496a7a90" >
 <cdparam x="293" y="275" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
-<TGConnectingPoint num="0" id="1016" />
-<P1  x="400" y="244" id="1088" />
-<P2  x="465" y="198" id="1104" />
+<TGConnectingPoint num="0" id="1352" />
+<P1  x="400" y="244" id="1448" />
+<P2  x="465" y="198" id="1476" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<CONNECTOR type="133" id="1019" >
+<CONNECTOR type="133" id="1355" index="2" uid="20c1f6ac-4f85-4fc3-be87-011f054ef250" >
 <cdparam x="179" y="403" />
 <sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <infoparam name="connector from TGComponent to TGComponent" value="" />
-<TGConnectingPoint num="0" id="1018" />
-<P1  x="208" y="365" id="1075" />
-<P2  x="400" y="284" id="1091" />
+<TGConnectingPoint num="0" id="1354" />
+<P1  x="208" y="365" id="1423" />
+<P2  x="400" y="284" id="1451" />
 <AutomaticDrawing  data="true" />
 </CONNECTOR>
-<COMPONENT type="301" id="1036" >
+<COMPONENT type="301" id="1372" index="3" uid="0ad9ae56-3e12-4ce4-bafa-6b7d46846d77" >
 <cdparam x="135" y="463" />
 <sizeparam width="267" height="35" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="UML Note" value="stuxnet executes by opening projectfile
 " />
-<TGConnectingPoint num="0" id="1020" />
-<TGConnectingPoint num="1" id="1021" />
-<TGConnectingPoint num="2" id="1022" />
-<TGConnectingPoint num="3" id="1023" />
-<TGConnectingPoint num="4" id="1024" />
-<TGConnectingPoint num="5" id="1025" />
-<TGConnectingPoint num="6" id="1026" />
-<TGConnectingPoint num="7" id="1027" />
-<TGConnectingPoint num="8" id="1028" />
-<TGConnectingPoint num="9" id="1029" />
-<TGConnectingPoint num="10" id="1030" />
-<TGConnectingPoint num="11" id="1031" />
-<TGConnectingPoint num="12" id="1032" />
-<TGConnectingPoint num="13" id="1033" />
-<TGConnectingPoint num="14" id="1034" />
-<TGConnectingPoint num="15" id="1035" />
+<TGConnectingPoint num="0" id="1356" />
+<TGConnectingPoint num="1" id="1357" />
+<TGConnectingPoint num="2" id="1358" />
+<TGConnectingPoint num="3" id="1359" />
+<TGConnectingPoint num="4" id="1360" />
+<TGConnectingPoint num="5" id="1361" />
+<TGConnectingPoint num="6" id="1362" />
+<TGConnectingPoint num="7" id="1363" />
+<TGConnectingPoint num="8" id="1364" />
+<TGConnectingPoint num="9" id="1365" />
+<TGConnectingPoint num="10" id="1366" />
+<TGConnectingPoint num="11" id="1367" />
+<TGConnectingPoint num="12" id="1368" />
+<TGConnectingPoint num="13" id="1369" />
+<TGConnectingPoint num="14" id="1370" />
+<TGConnectingPoint num="15" id="1371" />
 <extraparam>
 <Line value="stuxnet executes by opening projectfile" />
 </extraparam>
 </COMPONENT>
 
-<COMPONENT type="1400" id="1074" >
+<COMPONENT type="1400" id="1422" index="4" uid="2e76e21f-04fe-406d-8044-a23e61bdad59" >
 <cdparam x="613" y="95" />
 <sizeparam width="250" height="200" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Block1" value="PLCs" />
-<TGConnectingPoint num="0" id="1050" />
-<TGConnectingPoint num="1" id="1051" />
-<TGConnectingPoint num="2" id="1052" />
-<TGConnectingPoint num="3" id="1053" />
-<TGConnectingPoint num="4" id="1054" />
-<TGConnectingPoint num="5" id="1055" />
-<TGConnectingPoint num="6" id="1056" />
-<TGConnectingPoint num="7" id="1057" />
-<TGConnectingPoint num="8" id="1058" />
-<TGConnectingPoint num="9" id="1059" />
-<TGConnectingPoint num="10" id="1060" />
-<TGConnectingPoint num="11" id="1061" />
-<TGConnectingPoint num="12" id="1062" />
-<TGConnectingPoint num="13" id="1063" />
-<TGConnectingPoint num="14" id="1064" />
-<TGConnectingPoint num="15" id="1065" />
-<TGConnectingPoint num="16" id="1066" />
-<TGConnectingPoint num="17" id="1067" />
-<TGConnectingPoint num="18" id="1068" />
-<TGConnectingPoint num="19" id="1069" />
-<TGConnectingPoint num="20" id="1070" />
-<TGConnectingPoint num="21" id="1071" />
-<TGConnectingPoint num="22" id="1072" />
-<TGConnectingPoint num="23" id="1073" />
+<TGConnectingPoint num="0" id="1398" />
+<TGConnectingPoint num="1" id="1399" />
+<TGConnectingPoint num="2" id="1400" />
+<TGConnectingPoint num="3" id="1401" />
+<TGConnectingPoint num="4" id="1402" />
+<TGConnectingPoint num="5" id="1403" />
+<TGConnectingPoint num="6" id="1404" />
+<TGConnectingPoint num="7" id="1405" />
+<TGConnectingPoint num="8" id="1406" />
+<TGConnectingPoint num="9" id="1407" />
+<TGConnectingPoint num="10" id="1408" />
+<TGConnectingPoint num="11" id="1409" />
+<TGConnectingPoint num="12" id="1410" />
+<TGConnectingPoint num="13" id="1411" />
+<TGConnectingPoint num="14" id="1412" />
+<TGConnectingPoint num="15" id="1413" />
+<TGConnectingPoint num="16" id="1414" />
+<TGConnectingPoint num="17" id="1415" />
+<TGConnectingPoint num="18" id="1416" />
+<TGConnectingPoint num="19" id="1417" />
+<TGConnectingPoint num="20" id="1418" />
+<TGConnectingPoint num="21" id="1419" />
+<TGConnectingPoint num="22" id="1420" />
+<TGConnectingPoint num="23" id="1421" />
 </COMPONENT>
-<SUBCOMPONENT type="1401" id="1049" >
-<father id="1074" num="0" />
+<SUBCOMPONENT type="1401" id="1397" index="6" uid="d8070bf3-294f-45c8-a443-d79dfb57c8cf" >
+<father id="1422" num="0" />
 <cdparam x="680" y="158" />
-<sizeparam width="100" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="100" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="0" maxX="150" minY="0" maxY="160" />
 <infoparam name="TGComponent" value="Modify_PLCs" />
-<TGConnectingPoint num="0" id="1037" />
-<TGConnectingPoint num="1" id="1038" />
-<TGConnectingPoint num="2" id="1039" />
-<TGConnectingPoint num="3" id="1040" />
-<TGConnectingPoint num="4" id="1041" />
-<TGConnectingPoint num="5" id="1042" />
-<TGConnectingPoint num="6" id="1043" />
-<TGConnectingPoint num="7" id="1044" />
-<TGConnectingPoint num="8" id="1045" />
-<TGConnectingPoint num="9" id="1046" />
-<TGConnectingPoint num="10" id="1047" />
-<TGConnectingPoint num="11" id="1048" />
+<TGConnectingPoint num="0" id="1373" />
+<TGConnectingPoint num="1" id="1374" />
+<TGConnectingPoint num="2" id="1375" />
+<TGConnectingPoint num="3" id="1376" />
+<TGConnectingPoint num="4" id="1377" />
+<TGConnectingPoint num="5" id="1378" />
+<TGConnectingPoint num="6" id="1379" />
+<TGConnectingPoint num="7" id="1380" />
+<TGConnectingPoint num="8" id="1381" />
+<TGConnectingPoint num="9" id="1382" />
+<TGConnectingPoint num="10" id="1383" />
+<TGConnectingPoint num="11" id="1384" />
+<TGConnectingPoint num="12" id="1385" />
+<TGConnectingPoint num="13" id="1386" />
+<TGConnectingPoint num="14" id="1387" />
+<TGConnectingPoint num="15" id="1388" />
+<TGConnectingPoint num="16" id="1389" />
+<TGConnectingPoint num="17" id="1390" />
+<TGConnectingPoint num="18" id="1391" />
+<TGConnectingPoint num="19" id="1392" />
+<TGConnectingPoint num="20" id="1393" />
+<TGConnectingPoint num="21" id="1394" />
+<TGConnectingPoint num="22" id="1395" />
+<TGConnectingPoint num="23" id="1396" />
 <extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="false" cost="0" experience="0" />
 </extraparam>
 </SUBCOMPONENT>
 
-<COMPONENT type="1400" id="1138" >
+<COMPONENT type="1400" id="1522" index="5" uid="7c5b097b-f449-4380-b4f8-aba8c66af014" >
 <cdparam x="116" y="22" />
 <sizeparam width="478" height="418" minWidth="5" minHeight="2" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
 <infoparam name="Block0" value="S7_Software" />
-<TGConnectingPoint num="0" id="1114" />
-<TGConnectingPoint num="1" id="1115" />
-<TGConnectingPoint num="2" id="1116" />
-<TGConnectingPoint num="3" id="1117" />
-<TGConnectingPoint num="4" id="1118" />
-<TGConnectingPoint num="5" id="1119" />
-<TGConnectingPoint num="6" id="1120" />
-<TGConnectingPoint num="7" id="1121" />
-<TGConnectingPoint num="8" id="1122" />
-<TGConnectingPoint num="9" id="1123" />
-<TGConnectingPoint num="10" id="1124" />
-<TGConnectingPoint num="11" id="1125" />
-<TGConnectingPoint num="12" id="1126" />
-<TGConnectingPoint num="13" id="1127" />
-<TGConnectingPoint num="14" id="1128" />
-<TGConnectingPoint num="15" id="1129" />
-<TGConnectingPoint num="16" id="1130" />
-<TGConnectingPoint num="17" id="1131" />
-<TGConnectingPoint num="18" id="1132" />
-<TGConnectingPoint num="19" id="1133" />
-<TGConnectingPoint num="20" id="1134" />
-<TGConnectingPoint num="21" id="1135" />
-<TGConnectingPoint num="22" id="1136" />
-<TGConnectingPoint num="23" id="1137" />
+<TGConnectingPoint num="0" id="1498" />
+<TGConnectingPoint num="1" id="1499" />
+<TGConnectingPoint num="2" id="1500" />
+<TGConnectingPoint num="3" id="1501" />
+<TGConnectingPoint num="4" id="1502" />
+<TGConnectingPoint num="5" id="1503" />
+<TGConnectingPoint num="6" id="1504" />
+<TGConnectingPoint num="7" id="1505" />
+<TGConnectingPoint num="8" id="1506" />
+<TGConnectingPoint num="9" id="1507" />
+<TGConnectingPoint num="10" id="1508" />
+<TGConnectingPoint num="11" id="1509" />
+<TGConnectingPoint num="12" id="1510" />
+<TGConnectingPoint num="13" id="1511" />
+<TGConnectingPoint num="14" id="1512" />
+<TGConnectingPoint num="15" id="1513" />
+<TGConnectingPoint num="16" id="1514" />
+<TGConnectingPoint num="17" id="1515" />
+<TGConnectingPoint num="18" id="1516" />
+<TGConnectingPoint num="19" id="1517" />
+<TGConnectingPoint num="20" id="1518" />
+<TGConnectingPoint num="21" id="1519" />
+<TGConnectingPoint num="22" id="1520" />
+<TGConnectingPoint num="23" id="1521" />
 </COMPONENT>
-<SUBCOMPONENT type="1401" id="1087" >
-<father id="1138" num="0" />
+<SUBCOMPONENT type="1401" id="1447" index="7" uid="9df1456f-3c30-4eab-85a1-4c428135a719" >
+<father id="1522" num="0" />
 <cdparam x="129" y="365" />
-<sizeparam width="159" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="159" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="0" maxX="319" minY="0" maxY="378" />
 <infoparam name="TGComponent" value="Inject_To_Project_Files" />
-<TGConnectingPoint num="0" id="1075" />
-<TGConnectingPoint num="1" id="1076" />
-<TGConnectingPoint num="2" id="1077" />
-<TGConnectingPoint num="3" id="1078" />
-<TGConnectingPoint num="4" id="1079" />
-<TGConnectingPoint num="5" id="1080" />
-<TGConnectingPoint num="6" id="1081" />
-<TGConnectingPoint num="7" id="1082" />
-<TGConnectingPoint num="8" id="1083" />
-<TGConnectingPoint num="9" id="1084" />
-<TGConnectingPoint num="10" id="1085" />
-<TGConnectingPoint num="11" id="1086" />
+<TGConnectingPoint num="0" id="1423" />
+<TGConnectingPoint num="1" id="1424" />
+<TGConnectingPoint num="2" id="1425" />
+<TGConnectingPoint num="3" id="1426" />
+<TGConnectingPoint num="4" id="1427" />
+<TGConnectingPoint num="5" id="1428" />
+<TGConnectingPoint num="6" id="1429" />
+<TGConnectingPoint num="7" id="1430" />
+<TGConnectingPoint num="8" id="1431" />
+<TGConnectingPoint num="9" id="1432" />
+<TGConnectingPoint num="10" id="1433" />
+<TGConnectingPoint num="11" id="1434" />
+<TGConnectingPoint num="12" id="1435" />
+<TGConnectingPoint num="13" id="1436" />
+<TGConnectingPoint num="14" id="1437" />
+<TGConnectingPoint num="15" id="1438" />
+<TGConnectingPoint num="16" id="1439" />
+<TGConnectingPoint num="17" id="1440" />
+<TGConnectingPoint num="18" id="1441" />
+<TGConnectingPoint num="19" id="1442" />
+<TGConnectingPoint num="20" id="1443" />
+<TGConnectingPoint num="21" id="1444" />
+<TGConnectingPoint num="22" id="1445" />
+<TGConnectingPoint num="23" id="1446" />
 <extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="false" cost="0" experience="0" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="1100" >
-<father id="1138" num="1" />
+<SUBCOMPONENT type="1401" id="1472" index="8" uid="652debc7-17da-4b95-bf20-aa7eae11acbf" >
+<father id="1522" num="1" />
 <cdparam x="285" y="244" />
-<sizeparam width="230" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="230" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="0" maxX="248" minY="0" maxY="378" />
 <infoparam name="TGComponent" value="Overwrite_DLL_for_Communication" />
-<TGConnectingPoint num="0" id="1088" />
-<TGConnectingPoint num="1" id="1089" />
-<TGConnectingPoint num="2" id="1090" />
-<TGConnectingPoint num="3" id="1091" />
-<TGConnectingPoint num="4" id="1092" />
-<TGConnectingPoint num="5" id="1093" />
-<TGConnectingPoint num="6" id="1094" />
-<TGConnectingPoint num="7" id="1095" />
-<TGConnectingPoint num="8" id="1096" />
-<TGConnectingPoint num="9" id="1097" />
-<TGConnectingPoint num="10" id="1098" />
-<TGConnectingPoint num="11" id="1099" />
+<TGConnectingPoint num="0" id="1448" />
+<TGConnectingPoint num="1" id="1449" />
+<TGConnectingPoint num="2" id="1450" />
+<TGConnectingPoint num="3" id="1451" />
+<TGConnectingPoint num="4" id="1452" />
+<TGConnectingPoint num="5" id="1453" />
+<TGConnectingPoint num="6" id="1454" />
+<TGConnectingPoint num="7" id="1455" />
+<TGConnectingPoint num="8" id="1456" />
+<TGConnectingPoint num="9" id="1457" />
+<TGConnectingPoint num="10" id="1458" />
+<TGConnectingPoint num="11" id="1459" />
+<TGConnectingPoint num="12" id="1460" />
+<TGConnectingPoint num="13" id="1461" />
+<TGConnectingPoint num="14" id="1462" />
+<TGConnectingPoint num="15" id="1463" />
+<TGConnectingPoint num="16" id="1464" />
+<TGConnectingPoint num="17" id="1465" />
+<TGConnectingPoint num="18" id="1466" />
+<TGConnectingPoint num="19" id="1467" />
+<TGConnectingPoint num="20" id="1468" />
+<TGConnectingPoint num="21" id="1469" />
+<TGConnectingPoint num="22" id="1470" />
+<TGConnectingPoint num="23" id="1471" />
 <extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="false" cost="0" experience="0" />
 </extraparam>
 </SUBCOMPONENT>
-<SUBCOMPONENT type="1401" id="1113" >
-<father id="1138" num="2" />
+<SUBCOMPONENT type="1401" id="1497" index="9" uid="3a399946-dcc2-4889-8d22-d94cc8e538ff" >
+<father id="1522" num="2" />
 <cdparam x="359" y="158" />
-<sizeparam width="213" height="40" minWidth="100" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="213" height="40" minWidth="100" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
 <hidden value="false" />
 <enabled value="true" />
 <cdrectangleparam minX="0" maxX="265" minY="0" maxY="378" />
 <infoparam name="TGComponent" value="Read_Or_Modify_Code_Of_Block" />
-<TGConnectingPoint num="0" id="1101" />
-<TGConnectingPoint num="1" id="1102" />
-<TGConnectingPoint num="2" id="1103" />
-<TGConnectingPoint num="3" id="1104" />
-<TGConnectingPoint num="4" id="1105" />
-<TGConnectingPoint num="5" id="1106" />
-<TGConnectingPoint num="6" id="1107" />
-<TGConnectingPoint num="7" id="1108" />
-<TGConnectingPoint num="8" id="1109" />
-<TGConnectingPoint num="9" id="1110" />
-<TGConnectingPoint num="10" id="1111" />
-<TGConnectingPoint num="11" id="1112" />
+<TGConnectingPoint num="0" id="1473" />
+<TGConnectingPoint num="1" id="1474" />
+<TGConnectingPoint num="2" id="1475" />
+<TGConnectingPoint num="3" id="1476" />
+<TGConnectingPoint num="4" id="1477" />
+<TGConnectingPoint num="5" id="1478" />
+<TGConnectingPoint num="6" id="1479" />
+<TGConnectingPoint num="7" id="1480" />
+<TGConnectingPoint num="8" id="1481" />
+<TGConnectingPoint num="9" id="1482" />
+<TGConnectingPoint num="10" id="1483" />
+<TGConnectingPoint num="11" id="1484" />
+<TGConnectingPoint num="12" id="1485" />
+<TGConnectingPoint num="13" id="1486" />
+<TGConnectingPoint num="14" id="1487" />
+<TGConnectingPoint num="15" id="1488" />
+<TGConnectingPoint num="16" id="1489" />
+<TGConnectingPoint num="17" id="1490" />
+<TGConnectingPoint num="18" id="1491" />
+<TGConnectingPoint num="19" id="1492" />
+<TGConnectingPoint num="20" id="1493" />
+<TGConnectingPoint num="21" id="1494" />
+<TGConnectingPoint num="22" id="1495" />
+<TGConnectingPoint num="23" id="1496" />
 <extraparam>
-<info description="blah blah blah" root="false" />
+<info description="blah blah blah" root="false" cost="0" experience="0" />
 </extraparam>
 </SUBCOMPONENT>
 
diff --git a/src/main/java/compiler/tmlgrammar/TMLExprParser0.2.jjt b/src/main/java/compiler/tmlgrammar/TMLExprParser0.2.jjt
index 5cddb574f8..10a883e1bb 100755
--- a/src/main/java/compiler/tmlgrammar/TMLExprParser0.2.jjt
+++ b/src/main/java/compiler/tmlgrammar/TMLExprParser0.2.jjt
@@ -141,8 +141,6 @@ TOKEN : /* OPERATORS */
 TOKEN : /* FUNCTIONS */
 {
 < NOT: "not" >
-| < MIN: "min" >
-| < MAX: "max" > 
 | < DIV: "div" >
 | < MOD: "mod" >
 }
-- 
GitLab