Index: firmware/App/Controllers/PistonPumpControl.c
===================================================================
diff -u -rb730ab3a8e576e5b35e4c2ff7828064bdd48d9a0 -r35d43df882155ef8b9174eb16c7021f06050433b
--- firmware/App/Controllers/PistonPumpControl.c	(.../PistonPumpControl.c)	(revision b730ab3a8e576e5b35e4c2ff7828064bdd48d9a0)
+++ firmware/App/Controllers/PistonPumpControl.c	(.../PistonPumpControl.c)	(revision 35d43df882155ef8b9174eb16c7021f06050433b)
@@ -184,21 +184,21 @@
     switch ( pumpId )
     {
         case PISTONPUMPS_ACID:
-            // Valves assocaited to Acid concentrate Pumps
+            // TODO : Valves assocaited to Acid concentrate Pumps
             setValveState( VHO, inletValveState );
             setValveState( VTD, outletValveState );
             break;
 
         case PISTONPUMPS_BICARB:
-            // Valves assocaited to Bicarb concentrate Pumps
-            setValveState( UFO1, inletValveState );
-            setValveState( UFO2, outletValveState );
+            // TODO: Valves assocaited to Bicarb concentrate Pumps
+            setValveState( VHB, inletValveState );
+            setValveState( VRP, outletValveState );
             break;
 
         case PISTONPUMPS_UF:
-            // Valves assocaited to Ultrafilteration
-            setValveState( UF1, inletValveState );
-            setValveState( UF2, outletValveState );
+            // TODO: Valves assocaited to Ultrafilteration
+            setValveState( VDR, inletValveState );
+            setValveState( VDB2, outletValveState );
             break;
 
         default:
@@ -277,13 +277,8 @@
 {
     PISTON_PUMP_EXEC_STATE_T state = PISTON_PUMP_OFF_STATE;
 
-    // Close Inlet and Outlet valve
-    //pistonPumpInletOutletValveControl( pumpId, VALVE_STATE_CLOSED, VALVE_STATE_CLOSED );
-
-    //Stop the pump
-    //requestConcentratePumpOff( (CONCENTRATE_PUMPS_T)pumpId, FALSE );
-
-    // Initiate piston pump control
+    // Initiate piston pump control when cycle count is more than 1.
+    // Will redefine the off state later if required
     if ( pistonPumpCycleCount[ pumpId ] > 0 )
     {
         state = PISTON_PUMP_FILL_START_STATE;