     }
 
 
-    if (now > (timerStart + ACTIVE_TIME_MS))
+    if (now > (timerStart + ACTIVE_TIME))
     {
       Serial.println("Done being active!");
       digitalWrite(BLENDER_PIN, LOW);

  }
  
  Serial.println("Warming up...");
  timerStart = millis();

  currentState = S_WARMING_UP;
  buttonThen = 0;

    //Leave the red light on while we're armed
    turnOffAllLEDs();
    digitalWrite(ARMED_LED_PIN, HIGH);
    
    //Make sure we wait for debouncing.
    if (now > (timerStart + BUTTON_DEBOUNCE))
    {
    //If there's a rising edge on the sensor pin
    if (sensorRising)
    {
