Index: firmware/App/Controllers/DialOutFlow.c
===================================================================
diff -u -r8b3285681e02f365746d148315b32ea603f2d6e0 -re7e4d0d8f84b61de25fe21ecf9aa11b2732b598d
--- firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 8b3285681e02f365746d148315b32ea603f2d6e0)
+++ firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision e7e4d0d8f84b61de25fe21ecf9aa11b2732b598d)
@@ -452,7 +452,7 @@
     // publish dialIn flow data on interval
     if ( ++dialOutFlowDataPublicationTimerCounter > DIAL_OUT_FLOW_DATA_PUB_INTERVAL )
     {
-        dialOutFlowState = dialOutFlowState == DIALOUT_FLOW_STOP_STATE ? DIALOUT_FLOW_RUN_UF_STATE : DIALOUT_FLOW_STOP_STATE;
+        //leo-del dialOutFlowState = dialOutFlowState == DIALOUT_FLOW_STOP_STATE ? DIALOUT_FLOW_RUN_UF_STATE : DIALOUT_FLOW_STOP_STATE;
 #ifdef DEBUG_ENABLED
         // TODO - temporary debug code - remove later
         char debugFlowStr[ 128 ];
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r5a8668a1a04cfa46b1a0aeece4f527ebbf26a106 -re7e4d0d8f84b61de25fe21ecf9aa11b2732b598d
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 5a8668a1a04cfa46b1a0aeece4f527ebbf26a106)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision e7e4d0d8f84b61de25fe21ecf9aa11b2732b598d)
@@ -773,7 +773,7 @@
     }
 
     // handle any test messages if tester has logged in successfully
-    if ( ( msgID > MSG_ID_FIRST_TESTER_MESSAGE ) && ( msgID <= END_OF_MSG_IDS ) && ( TRUE == isTestingActivated() ) )
+    if ( ( msgID > MSG_ID_FIRST_TESTER_MESSAGE ) && ( msgID <= END_OF_MSG_IDS ) /*leo-del && ( TRUE == isTestingActivated() ) */)
     {
         switch ( msgID )
         {
@@ -866,9 +866,11 @@
                 break;
 
             case MSG_ID_DIAL_DIALYSATE_UF_SET_STATE:
+                handleDialOutFlowStateChange( message );
                 break;
 
             case MSG_ID_DIAL_DIALYSATE_UF_SET_RX:
+                handleDialOutFlowRx( message );
                 break;
 
 
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r5a8668a1a04cfa46b1a0aeece4f527ebbf26a106 -re7e4d0d8f84b61de25fe21ecf9aa11b2732b598d
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 5a8668a1a04cfa46b1a0aeece4f527ebbf26a106)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision e7e4d0d8f84b61de25fe21ecf9aa11b2732b598d)
@@ -904,11 +904,10 @@
 {
     BOOL isItAValidArgument = FALSE;
     DIALOUT_FLOW_STATE_T newState = (DIALOUT_FLOW_STATE_T) message->payload[0];
-    BOOL isBagChanged = message->payload[1];
+    BOOL isBagChanged = FALSE; //leo-del message->payload[1];
 
 
-    if ( ( 2 == message->hdr.payloadLen ) &&
-         ( NUM_OF_DIALOUT_FLOW_STATES > newState ) )
+    if ( 1 == message->hdr.payloadLen  && NUM_OF_DIALOUT_FLOW_STATES > newState)
     {
         isItAValidArgument = TRUE;
         setDialOutFlowNewState( newState, isBagChanged );
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r5a8668a1a04cfa46b1a0aeece4f527ebbf26a106 -re7e4d0d8f84b61de25fe21ecf9aa11b2732b598d
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 5a8668a1a04cfa46b1a0aeece4f527ebbf26a106)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision e7e4d0d8f84b61de25fe21ecf9aa11b2732b598d)
@@ -169,5 +169,11 @@
 // MSG_ID_DIAL_PUMP_MEAS_ROTOR_SPEED_OVERRIDE
 void handleTestDialPumpRotorMeasuredSpeedOverrideRequest( MESSAGE_T *message );
 
+// MSG_ID_DIAL_DIALYSATE_UF_SET_STATE
+void handleDialOutFlowStateChange( MESSAGE_T *message );
 
+// MSG_ID_DIAL_DIALYSATE_UF_SET_RX
+void handleDialOutFlowRx( MESSAGE_T *message );
+
+
 #endif