Index: drydemoxmlstates.scxml
===================================================================
diff -u -rb4e5f0d4181127e7941f8ae437e1f61c5c746091 -r6e0ddbfa4863bb12a64dfde5baeada941acadaf8
--- drydemoxmlstates.scxml	(.../drydemoxmlstates.scxml)	(revision b4e5f0d4181127e7941f8ae437e1f61c5c746091)
+++ drydemoxmlstates.scxml	(.../drydemoxmlstates.scxml)	(revision 6e0ddbfa4863bb12a64dfde5baeada941acadaf8)
@@ -6,10 +6,10 @@
         <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"/>
             <transition type="internal" event="Transition_2_Tx_Parms" target="Tx_Params">
-                <qt:editorinfo movePoint="-15.01;81.58"/>
+                <qt:editorinfo movePoint="-8.55;63.50"/>
             </transition>
             <transition type="external" event="Transition_2_Disinfect" target="Disinfect">
-                <qt:editorinfo startTargetFactors="89.33;58.51" movePoint="23.05;67.28"/>
+                <qt:editorinfo movePoint="23.05;67.28" startTargetFactors="89.33;58.51"/>
             </transition>
             <transition type="external" event="Transition_2_Water_Sample" target="Water_Sample">
                 <qt:editorinfo movePoint="-55.60;54.41"/>
@@ -27,23 +27,29 @@
             <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_End_Tx" target="End_Tx">
-                <qt:editorinfo startTargetFactors="88.35;52.65" movePoint="-15.64;9.12"/>
+                <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>
         </state>
         <state id="Disinfect">
-            <qt:editorinfo scenegeometry="624.41;522.21;456.18;472.21;122.13;100" geometry="581.77;543.87;-168.23;-50;122.13;100"/>
+            <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"/>
         </state>
         <transition type="internal" event="Transition_back_2_idle" target="Idle">
-            <qt:editorinfo startTargetFactors="41.65;17.56" movePoint="-32.94;-85.31"/>
+            <qt:editorinfo movePoint="-32.94;-85.31" startTargetFactors="41.65;17.56"/>
         </transition>
         <state id="Water_Sample">
-            <qt:editorinfo scenegeometry="526.72;599.28;89.23;470.25;154.86;109.18" geometry="484.08;620.94;-437.49;-129.03;154.86;109.18"/>
+            <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"/>
         </state>
         <state id="Tx_Params">
-            <qt:editorinfo scenegeometry="362.42;523.42;302.14;473.42;120.56;100" geometry="319.78;545.08;-60.28;-50;120.56;100"/>
+            <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"/>
+            <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"/>
+            </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"/>
@@ -90,6 +96,9 @@
             <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>