Index: firmware/App/Tasks/TaskGeneral.c
===================================================================
diff -u -r82bb2222f791a434d22921e2fe4f5edd7e74776d -r50f4b79164155c1bc375dd3ff0e8588f934dc729
--- firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 82bb2222f791a434d22921e2fe4f5edd7e74776d)
+++ firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 50f4b79164155c1bc375dd3ff0e8588f934dc729)
@@ -202,13 +202,13 @@
 #if 1
     static U32 ctr = 0;
     static U32 sta = 0;
-    static BOOL start = TRUE;
-    static BOOL bpStart = FALSE;
+    static BOOL start = FALSE;
+    static BOOL bpStart = TRUE;
     static BOOL bpStop = FALSE;
 
     if ( FALSE == bpStart )
     {
-        setBloodPumpTargetRPM( 1000, MOTOR_DIR_FORWARD );
+        setBloodPumpTargetRPM( 1200, MOTOR_DIR_FORWARD );
         homeEjector();
         retractEjector();
         bpStart = TRUE;
@@ -224,7 +224,8 @@
 
     // Get level sensor data
     readAirTrapLevelSensors();
-    // Control blood pump
+    execSwitches();
+   // Control blood pump
     execBloodFlowMonitor();
     execBloodFlowController();
     execEjectorController();
@@ -247,7 +248,7 @@
         break;
     case 1:
         // look for air at low level and stop
-        if ( AIR_TRAP_LEVEL_AIR == getRawLevelSensorState( H17_LEVL ) )
+        if ( AIR_TRAP_LEVEL_AIR == getRawLevelSensorState( H16_LEVL ) )
         {
             // stop lowering level
             set3WayValveState( H13_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );