diff --git a/esp-vent-main/inc/StateHandler/StateHandler.h b/esp-vent-main/inc/StateHandler/StateHandler.h
index 9e80a61..7ce0300 100644
--- a/esp-vent-main/inc/StateHandler/StateHandler.h
+++ b/esp-vent-main/inc/StateHandler/StateHandler.h
@@ -198,6 +198,8 @@ private:
    *
    */
   void pid ();
+
+  int fan_speed_normalized();
 };
 
 #endif /* STATE_HANDLER_H_ */
diff --git a/esp-vent-main/src/StateHandler/StateHandler.cpp b/esp-vent-main/src/StateHandler/StateHandler.cpp
index 54e8caa..1188778 100644
--- a/esp-vent-main/src/StateHandler/StateHandler.cpp
+++ b/esp-vent-main/src/StateHandler/StateHandler.cpp
@@ -108,15 +108,12 @@ StateHandler::stateManual (const Event &event)
   switch (event.type)
     {
     case Event::eEnter:
-      displaySet (saved_set_value[MANUAL], saved_curr_value[MANUAL]);
-      this->A01->write (this->value[FAN_SPEED].getCurrent ());
+      this->A01->write (fan_speed_normalized());
       break;
     case Event::eExit:
-      _lcd->clear ();
       break;
     case Event::eKey:
       handleControlButtons (event.value);
-      this->A01->write (value[MANUAL].getCurrent () * 10);
       break;
     case Event::eTick:
       if (event.value > 500)
@@ -253,6 +250,14 @@ StateHandler::save (int eventValue, size_t mode)
     }
 }
 
+int
+StateHandler::fan_speed_normalized() {
+	int speed = value[MANUAL].getCurrent();
+	if(speed <=92)
+		speed += 8;
+	return speed * 10;
+}
+
 void
 StateHandler::pid ()
 {