Index: firmware/App/Modes/ModeFault.c
===================================================================
diff -u -r379f78f1fad668d741b3ccf1e78c69f3fccc45b5 -r8a4182663ef6b12e3fd6414c0c14158943cd4ce1
--- firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision 379f78f1fad668d741b3ccf1e78c69f3fccc45b5)
+++ firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision 8a4182663ef6b12e3fd6414c0c14158943cd4ce1)
@@ -15,6 +15,7 @@
 *
 ***************************************************************************/
 
+#include "ConcentratePumps.h"
 #include "DrainPump.h"
 #include "Heaters.h"
 #include "ModeFault.h"
@@ -113,26 +114,18 @@
     setValveState( VPI, VALVE_STATE_CLOSED );
     setValveState( VBF, VALVE_STATE_CLOSED );
     setValveState( VSP, VALVE_STATE_CLOSED );
-#ifndef V_2_SYSTEM
     setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NO );
-#else
-    setValveState( VPD, VALVE_STATE_OPEN_C_TO_NO );
-#endif
     setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
     setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
     setValveState( VRC, VALVE_STATE_DRAIN_C_TO_NO );
     setValveState( VRO, VALVE_STATE_R1_C_TO_NO );
-
-#ifndef V_2_SYSTEM
     setValveState( VRD1, VALVE_STATE_CLOSED );
     setValveState( VRD2, VALVE_STATE_CLOSED );
-#else
-    setValveState( VRD, VALVE_STATE_R2_C_TO_NO );
-#endif
     setValveState( VRI, VALVE_STATE_R1_C_TO_NO );
     setValveState( VRF, VALVE_STATE_R2_C_TO_NO );
 
-    //TODO add the composition pumps
+    requestConcentratePumpsOff( CONCENTRATEPUMPS_CP1_ACID );
+    requestConcentratePumpsOff( CONCENTRATEPUMPS_CP2_BICARB );
     signalROPumpHardStop();
     signalDrainPumpHardStop();
     stopPrimaryHeater();