Index: firmware/App/Tasks/TaskGeneral.c
===================================================================
diff -u -r285b5d82539c96524c93703d52a66fff76fb64fc -rceddc04641038a62bbbd9714a045d0cbfc473c8f
--- firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 285b5d82539c96524c93703d52a66fff76fb64fc)
+++ firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision ceddc04641038a62bbbd9714a045d0cbfc473c8f)
@@ -186,7 +186,7 @@
             sta = 1;
             // lower the level
             set3WayValveState( H13_VALV, VALVE_3WAY_COMMON_TO_OPEN_STATE );
-            setAirPumpState( AIR_PUMP_STATE_ON, 255 );
+            setAirPumpState( AIR_PUMP_STATE_ON, 25 );
         }
         break;
     case 1:
@@ -201,14 +201,16 @@
         }
         break;
     case 2:
+#if 1
         // stay low for 5 sec
-        if ( ++ctr > ( 5 * 20 ) )
+//        if ( ++ctr > ( 5 * 20 ) )
         {
             // raise the level
             set3WayValveState( H20_VALV, VALVE_3WAY_COMMON_TO_OPEN_STATE );
-            setAirPumpState( AIR_PUMP_STATE_ON, 255 );
+            setAirPumpState( AIR_PUMP_STATE_ON, 25 );
             sta = 3;
         }
+#endif
         break;
     case 3:
         // look for fluid at high level and stop
@@ -217,19 +219,30 @@
             // stop raising level
             set3WayValveState( H20_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
             setAirPumpState( AIR_PUMP_STATE_OFF, AIR_PUMP_MOTOR_OFF );
-            ctr = 0;
             sta = 4;
         }
         break;
     case 4:
+#if 1
+        // look for air at high level
+        if ( AIR_TRAP_LEVEL_AIR == getRawLevelSensorState( H16_LEVL ) )
+        {
+            // start raising level
+            set3WayValveState( H20_VALV, VALVE_3WAY_COMMON_TO_OPEN_STATE );
+            setAirPumpState( AIR_PUMP_STATE_ON, 25 );
+            sta = 3;
+        }
+#endif
+#if 0
         // stay high for 5 sec
         if ( ++ctr > ( 5 * 20 ) )
         {
             // lower the level
             set3WayValveState( H13_VALV, VALVE_3WAY_COMMON_TO_OPEN_STATE );
-            setAirPumpState( AIR_PUMP_STATE_ON, 255 );
+            setAirPumpState( AIR_PUMP_STATE_ON, 25 );
             sta = 1;
         }
+#endif
         break;
     default:
         sta = 0;