   }
   else if (pumping && diff > FILLTIME_MILLIS){
     lcd.print("Water too long  ");
-    Serial.print("Water on passed fill time ");
-    Serial.println(diff);
-    Serial.println(FILLTIME_MILLIS);
+    //Serial.print("Water on passed fill time ");
+    //Serial.println(diff);
+    //Serial.println(FILLTIME_MILLIS);
     WaterOff();
   }
   else if (pumping && diff < FILLTIME_MILLIS) {
     lcd.print("Within fill, OK ");
-    Serial.println("Within fill cycle, all OK");
+    //Serial.println("Within fill cycle, all OK");
   }
   else if (!pumping && WATERON && diff < FILLTIME_MILLIS) {
     lcd.print("Resume fill, OK ");
-    Serial.println("Within fill cycle, resume OK");
+    //Serial.println("Within fill cycle, resume OK");
     digitalWrite(PUMP_PIN, LOW);
   }
   else {
     WaterOff();
     lcd.print("Water off, OK   ");
-    Serial.println("Water off, all OK");
+    //Serial.println("Water off, all OK");
   }
 }
 

}

void WaterOff(){
  Serial.println("Water OFF");
  digitalWrite(PUMP_PIN, HIGH);
  WATERON = false;
}

void CheckWaterOn(){
  unsigned long diff = millis() - last_fill_start;
  lcd.setCursor(0, 1);

  //setTime(8,29,50,1,1,11); // set time to Saturday 8:29:00am Jan 1 2011
  
  // create the alarms 
  //Alarm.alarmRepeat(8,00,0, MorningAlarm);  // 8:00am every day
  //Alarm.alarmRepeat(8,35,0,EveningAlarm);  // 8:45pm every day 
  
  Alarm.timerRepeat(0, CHECK_INTERVAL_MINUTES, 0, CheckWaterOn);            // timer for every fill time    
  //Alarm.timerRepeat(FILL_INTERVAL, FillTimer);  //For testing with higher frequencey

  Alarm.alarmRepeat(0,00,0, FillTimer);  
  Alarm.alarmRepeat(8,00,0, FillTimer);
  Alarm.alarmRepeat(12,00,0, FillTimer);
  Alarm.alarmRepeat(20,00,0, FillTimer);
}

void  loop(){  
  CheckWaterOn();
  CheckButtons();
  digitalClockDisplay();
  Alarm.delay(0); // wait one second between clock display
}

// functions to be called when an alarm triggers:
void FillTimer(){
  Serial.println("FillTimer: - turn water on");    
  WaterOn();
}

void ForcedTimer(){
  Serial.println("ForcedTimer: - turn water on");    
  WaterOn();
}

