   }
 
   soundAlarmAtThisPointIfNeeded();
+  
+  long currentTime = millis();
 
   //Disable alarm if it has gone longer than maximum
-  if(currentState == ALARM && (millis() - alarmLastStarted) > MAX_ALARM_LENGTH){
+  if(currentState == ALARM && (currentTime - alarmLastStarted) > MAX_ALARM_LENGTH){
     stopAlarm();
+  }
+  
+  if(currentState == NORMAL && showLCD && ((currentTime - lastScreenActiveTime) > TIME_BEFORE_STANDBY)){
+    showLCD = false;
+    turnOffLCDIfCommandIsOff();
   }
 
   if(showLCD || currentState == ALARM){

int milliVoltIndex = 0;     
long milliVoltTotal = 0;     



void setup() {


  }

  timeLastPressedRightButton = currentMillis;
  lastScreenActiveTime = currentMillis;

  //Serial.println("Right Button Pressed");

