Index: drydemoxmlstates.scxml
===================================================================
diff -u -r6e0ddbfa4863bb12a64dfde5baeada941acadaf8 -rac917f2cc891cabeae3edbd353b72d00c3637fcd
--- drydemoxmlstates.scxml	(.../drydemoxmlstates.scxml)	(revision 6e0ddbfa4863bb12a64dfde5baeada941acadaf8)
+++ drydemoxmlstates.scxml	(.../drydemoxmlstates.scxml)	(revision ac917f2cc891cabeae3edbd353b72d00c3637fcd)
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scxml xmlns="http://www.w3.org/2005/07/scxml" version="1.0" binding="early" xmlns:qt="http://www.qt.io/2015/02/scxml-ext" name="drydemoXMLstates" qt:editorversion="9.0.1" initial="States">
-    <qt:editorinfo initialGeometry="462.66;-164.85;-20;-35.86;40;55.86"/>
+    <qt:editorinfo initialGeometry="454.92;-189.38;-20;-35.86;40;55.86"/>
     <state id="States">
-        <qt:editorinfo scenegeometry="42.64;-21.66;-173.11;-138.07;1271.55;905.29" geometry="42.64;-21.66;-215.75;-116.41;1271.55;905.29"/>
+        <qt:editorinfo geometry="49.12;-25.53;-220.08;-128.86;1228.42;906.32" scenegeometry="49.12;-25.53;-170.96;-154.39;1228.42;906.32"/>
         <state id="Idle">
-            <qt:editorinfo scenegeometry="409.36;229.16;349.36;179.16;120;100" geometry="366.72;250.82;-60;-50;120;100"/>
+            <qt:editorinfo geometry="391.25;258.57;-156.77;-50;216.77;100" scenegeometry="440.37;233.04;283.60;183.04;216.77;100"/>
             <transition type="internal" event="Transition_2_Tx_Parms" target="Tx_Params">
                 <qt:editorinfo movePoint="-8.55;63.50"/>
             </transition>
@@ -25,62 +25,109 @@
             </transition>
             <transition type="external" event="Transition_2_BP_HR" target="BP_HR"/>
             <transition type="external" event="Transition_2_Ultrafiltraion" target="Ultrafiltraion"/>
-            <transition type="external" event="Transition_2_Patient_Connection" target="Connection"/>
+            <transition type="external" event="Transition_2_Patient_Connection" target="Connection">
+                <qt:editorinfo movePoint="41.32;5.16"/>
+            </transition>
             <transition type="external" event="Transition_2_End_Tx" target="End_Tx">
                 <qt:editorinfo movePoint="-15.64;9.12" startTargetFactors="88.35;52.65"/>
             </transition>
             <transition type="external" event="Transition_2_Start_Tx" target="Start_Tx">
                 <qt:editorinfo movePoint="86.77;-16.65" endTargetFactors="6.21;66.33"/>
             </transition>
+            <transition type="internal" event="TimeoutEvent" target="Idle">
+                <qt:editorinfo endTargetFactors="28.13;51.70"/>
+            </transition>
         </state>
         <state id="Disinfect">
-            <qt:editorinfo scenegeometry="691.55;526.08;523.32;476.08;122.13;100" geometry="648.91;547.74;-168.23;-50;122.13;100"/>
+            <qt:editorinfo geometry="654.07;572.27;-168.23;-50;188.23;100" scenegeometry="703.19;546.74;534.96;496.74;188.23;100"/>
+            <transition type="internal" event="TimeoutEvent" target="Disinfect">
+                <qt:editorinfo endTargetFactors="27.02;50.63"/>
+            </transition>
         </state>
         <transition type="internal" event="Transition_back_2_idle" target="Idle">
-            <qt:editorinfo movePoint="-32.94;-85.31" startTargetFactors="41.65;17.56"/>
+            <qt:editorinfo movePoint="-20.03;-33.67" startTargetFactors="42.14;22.02"/>
         </transition>
         <state id="Water_Sample">
-            <qt:editorinfo scenegeometry="520.27;628.98;82.78;499.95;154.86;109.18" geometry="477.63;650.64;-437.49;-129.03;154.86;109.18"/>
+            <qt:editorinfo geometry="187.10;710.04;-171.20;-66.32;191.20;102.32" scenegeometry="236.22;684.51;65.02;618.19;191.20;102.32"/>
+            <transition type="internal" event="TimeoutEvent" target="Water_Sample">
+                <qt:editorinfo endTargetFactors="20.47;54.67"/>
+            </transition>
+            <transition type="external" event="T_2_Consumables" target="Consumables"/>
         </state>
         <state id="Tx_Params">
-            <qt:editorinfo scenegeometry="441.18;549.25;284.41;499.25;217.05;116" geometry="398.54;570.91;-156.77;-50;217.05;116"/>
+            <qt:editorinfo geometry="428.24;598.03;-156.77;-50;185.22;116" scenegeometry="477.36;572.50;320.59;522.50;185.22;116"/>
             <transition type="internal" event="TimeoutEvent" target="Tx_Params">
                 <qt:editorinfo endTargetFactors="21.94;51.81"/>
             </transition>
             <transition type="internal" event="T_2_Water_Sample" target="Water_Sample">
-                <qt:editorinfo endTargetFactors="15.48;62.94"/>
+                <qt:editorinfo movePoint="55.11;4.46" endTargetFactors="94.17;46.97"/>
             </transition>
         </state>
         <state id="Consumables">
-            <qt:editorinfo scenegeometry="4.90;492.09;-55.10;442.09;120;100" geometry="-37.74;513.75;-60;-50;120;100"/>
+            <qt:editorinfo geometry="7.58;548.39;-156.77;-50;216.77;100" scenegeometry="56.70;522.86;-100.07;472.86;216.77;100"/>
+            <transition type="internal" event="TimeoutEvent" target="Consumables">
+                <qt:editorinfo endTargetFactors="22.86;48.96"/>
+            </transition>
+            <transition type="external" event="T_2_Disposables" target="Disposables"/>
         </state>
         <state id="Disposables">
-            <qt:editorinfo scenegeometry="2.38;362.04;-57.62;312.04;120;100" geometry="-40.26;383.70;-60;-50;120;100"/>
+            <qt:editorinfo geometry="-32.52;403.07;-156.77;-50;216.77;100" scenegeometry="16.60;377.54;-140.17;327.54;216.77;100"/>
+            <transition type="internal" event="TimeoutEvent" target="Disposables">
+                <qt:editorinfo endTargetFactors="17.87;48.46"/>
+            </transition>
+            <transition type="external" event="T_2_System_Prime" target="System_Prime">
+                <qt:editorinfo movePoint="7.75;5.16"/>
+            </transition>
         </state>
         <state id="System_Prime">
-            <qt:editorinfo scenegeometry="1.19;241.76;-58.81;191.76;120;100" geometry="-41.45;263.42;-60;-50;120;100"/>
+            <qt:editorinfo geometry="-41.45;263.42;-156.77;-50;216.77;100" scenegeometry="7.67;237.89;-149.10;187.89;216.77;100"/>
+            <transition type="internal" event="TimeoutEvent" target="System_Prime">
+                <qt:editorinfo endTargetFactors="18.74;49.74"/>
+            </transition>
+            <transition type="external" event="T_2_BP_HR" target="BP_HR"/>
         </state>
         <state id="BP_HR">
-            <qt:editorinfo scenegeometry="-0.67;121.96;-60.67;71.96;120;100" geometry="-43.31;143.62;-60;-50;120;100"/>
+            <qt:editorinfo geometry="-43.31;143.62;-156.77;-50;216.77;100" scenegeometry="5.81;118.09;-150.96;68.09;216.77;100"/>
+            <transition type="internal" event="TimeoutEvent" target="BP_HR">
+                <qt:editorinfo endTargetFactors="23.91;48.38"/>
+            </transition>
+            <transition type="external" event="T_2_Ultrafiltration" target="Ultrafiltraion">
+                <qt:editorinfo movePoint="0;19.37"/>
+            </transition>
         </state>
         <state id="Ultrafiltraion">
-            <qt:editorinfo scenegeometry="111.68;18.40;51.68;-31.60;120;100" geometry="69.04;40.06;-60;-50;120;100"/>
+            <qt:editorinfo geometry="145.22;15.52;-156.77;-50;216.77;100" scenegeometry="194.34;-10.01;37.57;-60.01;216.77;100"/>
+            <transition type="internal" event="TimeoutEvent">
+                <qt:editorinfo endTargetFactors="23.90;46.38"/>
+            </transition>
+            <transition type="external" event="T_2_Connection" target="Connection">
+                <qt:editorinfo movePoint="1.29;9.04"/>
+            </transition>
         </state>
         <state id="Connection">
-            <qt:editorinfo scenegeometry="521.38;37.83;461.38;-12.17;120;100" geometry="478.74;59.49;-60;-50;120;100"/>
+            <qt:editorinfo geometry="554.92;24.63;-156.77;-50;216.77;100" scenegeometry="604.04;-0.90;447.27;-50.90;216.77;100"/>
+            <transition type="internal" event="TimeoutEvent" target="Connection">
+                <qt:editorinfo endTargetFactors="27.42;49.67"/>
+            </transition>
+            <transition type="external" event="T_2_Start_Tx" target="Start_Tx">
+                <qt:editorinfo movePoint="2.58;9.03" endTargetFactors="22.57;59.99"/>
+            </transition>
         </state>
         <state id="Start_Tx">
-            <qt:editorinfo scenegeometry="955.98;48.63;776.79;-43.75;199.19;128.38" geometry="913.34;70.29;-179.19;-92.38;199.19;128.38"/>
+            <qt:editorinfo geometry="913.34;70.29;-179.19;-92.38;199.19;128.38" scenegeometry="962.46;44.76;783.27;-47.62;199.19;128.38"/>
             <transition type="internal" event="TimeoutEvent" target="Start_Tx"/>
             <transition type="external" event="Start_Tx_2_Blood_Prime" target="Blood_Prime">
                 <qt:editorinfo movePoint="-1.29;0"/>
             </transition>
         </state>
         <state id="End_Tx">
-            <qt:editorinfo scenegeometry="874.40;531.95;814.40;481.95;120;100" geometry="831.76;553.61;-60;-50;120;100"/>
+            <qt:editorinfo geometry="862.75;552.32;-156.77;-50;216.77;100" scenegeometry="911.87;526.79;755.10;476.79;216.77;100"/>
+            <transition type="internal" event="TimeoutEvent" target="End_Tx">
+                <qt:editorinfo endTargetFactors="18.50;52.25"/>
+            </transition>
         </state>
         <state id="Blood_Prime">
-            <qt:editorinfo scenegeometry="925.81;179.47;769.04;129.47;214.49;141.60" geometry="883.17;201.13;-156.77;-50;214.49;141.60"/>
+            <qt:editorinfo geometry="883.17;201.13;-156.77;-50;214.49;141.60" scenegeometry="932.29;175.60;775.52;125.60;214.49;141.60"/>
             <transition type="internal" event="TimeoutEvent" target="Blood_Prime">
                 <qt:editorinfo endTargetFactors="12.48;45.82"/>
             </transition>
@@ -89,16 +136,13 @@
             </transition>
         </state>
         <state id="Treatment">
-            <qt:editorinfo scenegeometry="920.65;356.38;763.88;306.38;216.77;116.76" geometry="878.01;378.04;-156.77;-50;216.77;116.76"/>
+            <qt:editorinfo geometry="878.01;378.04;-156.77;-50;216.77;116.76" scenegeometry="927.13;352.51;770.36;302.51;216.77;116.76"/>
             <transition type="internal" event="TimeoutEvent" target="Treatment">
                 <qt:editorinfo endTargetFactors="22.47;52.22"/>
             </transition>
             <transition type="external" event="Treatment_2_End_Treatment" target="End_Tx">
                 <qt:editorinfo movePoint="-2.58;-1.29"/>
             </transition>
-            <transition type="internal" event="ID_99_Payload" target="Idle">
-                <qt:editorinfo endTargetFactors="90.98;45.37"/>
-            </transition>
         </state>
     </state>
 </scxml>