Index: firmware/App/Controllers/PistonPumpControl.c
===================================================================
diff -u -rf2ff7172c4501384cf3694d95ad836fb5b477012 -r95e32e6462b952f744f77c7e56f00bffdf8ec5bd
--- firmware/App/Controllers/PistonPumpControl.c	(.../PistonPumpControl.c)	(revision f2ff7172c4501384cf3694d95ad836fb5b477012)
+++ firmware/App/Controllers/PistonPumpControl.c	(.../PistonPumpControl.c)	(revision 95e32e6462b952f744f77c7e56f00bffdf8ec5bd)
@@ -31,8 +31,8 @@
 // ********** private definitions **********
 
 #define PISTON_PUMP_CONTROL_DATA_PUBLISH_INTERVAL   ( 1000 / TASK_GENERAL_INTERVAL )            ///< Interval (ms/task time) at which the piston pump control data published.
-#define PISTON_PUMP_FILL_PERIOD                     ( 2000 / TASK_GENERAL_INTERVAL )            ///< Interval (ms/task time) at which the piston pump filling cycle time
-#define PISTON_PUMP_DISPENSE_PERIOD                 ( 2000 / TASK_GENERAL_INTERVAL )            ///< Interval (ms/task time) at which the piston pump dispense cycle time
+#define PISTON_PUMP_FILL_PERIOD                     ( 4000 / TASK_GENERAL_INTERVAL )            ///< Interval (ms/task time) at which the piston pump filling cycle time
+#define PISTON_PUMP_DISPENSE_PERIOD                 ( 4000 / TASK_GENERAL_INTERVAL )            ///< Interval (ms/task time) at which the piston pump dispense cycle time
 #define PISTON_PUMP_MIN_SPEED                       3.0F                                        ///< Piston pump minimum speed in ml/min.
 #define PISTON_PUMP_MAX_SPEED                       48.0F                                       ///< Maximum speed for piston pump in mL/min
 
@@ -185,8 +185,8 @@
     {
         case PISTONPUMPS_ACID:
             // Valves assocaited to Acid concentrate Pumps
-            setValveState( UFI1, (VALVE_STATE_NAMES_T)inletValveState );
-            setValveState( UFI2, (VALVE_STATE_NAMES_T)outletValveState );
+            setValveState( VHO, (VALVE_STATE_NAMES_T)inletValveState );
+            setValveState( VTD, (VALVE_STATE_NAMES_T)outletValveState );
             break;
 
         case PISTONPUMPS_BICARB:
@@ -251,6 +251,12 @@
         pistonPumpVolumeinMl[ pumpId ] = 0.0F;
         pistonPumpSetSpeed[ pumpId ]   = 0.0F;
         pistonPumpExecState[ pumpId ]  = PISTON_PUMP_OFF_STATE;
+
+        // Close Inlet and Outlet valve
+        pistonPumpInletOutletValveControl( pumpId, TRUE, TRUE );
+
+        //Stop the pump
+        requestConcentratePumpOff( (CONCENTRATE_PUMPS_T)pumpId, FALSE );
     }
     else
     {
@@ -272,10 +278,10 @@
     PISTON_PUMP_EXEC_STATE_T state = PISTON_PUMP_OFF_STATE;
 
     // Close Inlet and Outlet valve
-    pistonPumpInletOutletValveControl( pumpId, TRUE, TRUE );
+    //pistonPumpInletOutletValveControl( pumpId, TRUE, TRUE );
 
     //Stop the pump
-    requestConcentratePumpOff( (CONCENTRATE_PUMPS_T)pumpId, FALSE );
+    //requestConcentratePumpOff( (CONCENTRATE_PUMPS_T)pumpId, FALSE );
 
     // Initiate piston pump control
     if ( pistonPumpCycleCount[ pumpId ] > 0 )