Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r3e7b064885d99793bb56d940bd613555b1cdbdfa -r9f25f22ef6cd3566f8f7fbbc5c037a69e7f9411b
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 3e7b064885d99793bb56d940bd613555b1cdbdfa)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 9f25f22ef6cd3566f8f7fbbc5c037a69e7f9411b)
@@ -15,7 +15,10 @@
  **************************************************************************/
 
 #include "CPLD.h"
+#include "DrainPump.h"
+#include "Heaters.h"
 #include "OperationModes.h"
+#include "ROPump.h"
 #include "SystemComm.h"
 #include "Timers.h"
 #include "Valves.h"
@@ -71,15 +74,17 @@
     // re-initialize standby mode each time we transition to standby mode
     initStandbyMode();
 
-    // TODO - set initial actuator states
+    // set initial actuator states
     setValveState( VPI, VALVE_STATE_CLOSED );
     setValveState( VRC, VALVE_STATE_DRAIN_C_TO_NO );
     setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
     setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
-    setValveState( VRF, VALVE_STATE_R1_C_TO_NC );
-    setValveState( VRI, VALVE_STATE_R2_C_TO_NC );
-    setValveState( VRD, VALVE_STATE_R1_C_TO_NC );
-    setValveState( VRO, VALVE_STATE_R2_C_TO_NC );
+    signalROPumpHardStop();
+    signalDrainPumpHardStop();
+    stopPrimaryHeater();
+    stopTrimmerHeater();
+    // conc. pumps off
+    // UV off
 }
 
 /*********************************************************************//**