Index: firmware/App/Modes/ModeService.c
===================================================================
diff -u -r660876bca7ae34f862ae9cc6feef9a30ec02fe94 -r71765ffa0a251ca541fce096ee6008fc5a26a8a1
--- firmware/App/Modes/ModeService.c	(.../ModeService.c)	(revision 660876bca7ae34f862ae9cc6feef9a30ec02fe94)
+++ firmware/App/Modes/ModeService.c	(.../ModeService.c)	(revision 71765ffa0a251ca541fce096ee6008fc5a26a8a1)
@@ -15,12 +15,14 @@
 *
 ***************************************************************************/
 
+#include "AirPump.h"
 #include "BloodFlow.h"
 #include "Buttons.h"
 #include "DGInterface.h"
 #include "DialInFlow.h"
 #include "DialOutFlow.h"
 #include "ModeService.h"
+#include "NVDataMgmt.h"
 #include "OperationModes.h"
 #include "Switches.h"
 #include "SyringePump.h"
@@ -63,18 +65,23 @@
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, FALSE );
     setAlarmUserActionEnabled( ALARM_USER_ACTION_END_TREATMENT, FALSE );
 
-    // Start out with all actuators de-energized in service mode
+    // Start out with all actuators off in service mode (exception for valves which will be in insert position to allow cartridge insert)
     cmdStopDGTrimmerHeater();
     stopSyringePump();
     signalBloodPumpHardStop();
     signalDialInPumpHardStop();
     signalDialOutPumpHardStop();
-    // TODO - turn off air pump
+#ifndef _RELEASE_
+    if ( SW_CONFIG_DISABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_AIR_PUMP ) )
+#endif
+    {
+        setAirPumpState( AIR_PUMP_STATE_OFF );
+    }
     setValveAirTrap( STATE_CLOSED );
-    setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
-    setValvePosition( VDO, VALVE_POSITION_C_CLOSE );
-    setValvePosition( VBA, VALVE_POSITION_C_CLOSE );
-    setValvePosition( VBV, VALVE_POSITION_C_CLOSE );
+    setValvePosition( VDI, VALVE_POSITION_A_INSERT_EJECT );
+    setValvePosition( VDO, VALVE_POSITION_A_INSERT_EJECT );
+    setValvePosition( VBA, VALVE_POSITION_A_INSERT_EJECT );
+    setValvePosition( VBV, VALVE_POSITION_A_INSERT_EJECT );
 
     return 0;
 }