diff --git a/firmware/controllers/system_fsio.h b/firmware/controllers/system_fsio.h
index ae3dfaa955..ae00ad2a15 100644
--- a/firmware/controllers/system_fsio.h
+++ b/firmware/controllers/system_fsio.h
@@ -1,6 +1,6 @@
-// this https://en.wikipedia.org/wiki/Reverse_Polish_notation SHOULD BE generated automatically
+// this https://en.wikipedia.org/wiki/Reverse_Polish_notation is generated automatically
 // from controllers/system_fsio.txt
-// on 2019-09-08_16_41_20_788
+// on 2020-09-10_21_37_44_443
 //
 //
 // in this file we define system FSIO expressions
@@ -12,12 +12,14 @@
 // Jan 19, 2017
 // Andrey Belomutskiy, (c) 2012-2017
 //
+// different way to have the same result would be using "self"
+// (self and (coolant > fan_off_setting)) | (coolant > fan_on_setting) | is_clt_broken
 
 // Human-readable: (fan and (coolant > cfg_fanOffTemperature)) | (coolant > cfg_fanOnTemperature) | is_clt_broken
-#define FAN_CONTROL_LOGIC "fan coolant cfg_fanOffTemperature > and coolant cfg_fanOnTemperature > | is_clt_broken |"
+#define FAN_CONTROL_LOGIC "fan coolant cfg_fanofftemperature > and coolant cfg_fanontemperature > | is_clt_broken |"
 
-// Human-readable: (time_since_boot < startup_fuel_pump_duration) | (rpm > 0)
-#define FUEL_PUMP_LOGIC "time_since_boot startup_fuel_pump_duration < rpm 0 > |"
+// Human-readable: (time_since_boot >= 0 & time_since_boot < startup_fuel_pump_duration) | (rpm > 0)
+#define FUEL_PUMP_LOGIC "time_since_boot 0 time_since_boot & >= startup_fuel_pump_duration < rpm 0 > |"
 
 // Human-readable: vbatt < 14.5
 #define ALTERNATOR_LOGIC "vbatt 14.5 <"
@@ -25,21 +27,17 @@
 // Human-readable: coolant > 120
 #define TOO_HOT_LOGIC "coolant 120 >"
 
-// Human-readable: ac_on_switch & (rpm > 850) & (time_since_ac_on_switch > 0.3)
-// ac_on_switch rpm 850 > & time_since_ac_on_switch 0.3 > &
+// Human-readable: ac_on_switch & (rpm > 850)
 #define AC_RELAY_LOGIC "ac_on_switch rpm 850 > &"
 // Combined RPM, CLT and VBATT warning light
 
 // Human-readable: (rpm > fsio_setting(2)) | ((coolant > fsio_setting(3)) | (vbatt < fsio_setting(4)))
 #define COMBINED_WARNING_LIGHT "rpm 2 fsio_setting > coolant 3 fsio_setting > vbatt 4 fsio_setting < | |"
 //needed by EFI_MAIN_RELAY_CONTROL
+//MAIN_RELAY_LOGIC=(time_since_boot >= 0 & time_since_boot < 2) | (vbatt > 5) | in_shutdown
 
-// Human-readable: (time_since_boot < 2) | (vbatt > 5) | in_shutdown
-#define MAIN_RELAY_LOGIC "time_since_boot 2 < vbatt 5 > | in_shutdown |"
-// could be used for simple variable intake geometry setups or warning light or starter block
-
-// Human-readable: rpm > fsio_setting(1)
-#define RPM_ABOVE_USER_SETTING_1 "rpm 1 fsio_setting >"
+// Human-readable: (vbatt > 5) | in_shutdown
+#define MAIN_RELAY_LOGIC "vbatt 5 > in_shutdown |"
 // could be used for simple variable intake geometry setups or warning light or starter block
 
 // Human-readable: rpm > fsio_setting(1)
@@ -47,7 +45,10 @@
 
 // Human-readable: rpm < fsio_setting(3)
 #define RPM_BELOW_USER_SETTING_3 "rpm 3 fsio_setting <"
+// could be used for simple variable intake geometry setups or warning light or starter block
 
+// Human-readable: rpm > fsio_setting(1)
+#define RPM_ABOVE_USER_SETTING_1 "rpm 1 fsio_setting >"
 
 // Human-readable: rpm > fsio_setting(2)
 #define RPM_ABOVE_USER_SETTING_2 "rpm 2 fsio_setting >"
@@ -77,5 +78,5 @@
 // Human-readable: fsio_table (3, rpm, map) / 100
 #define BOOST_CONTROLLER "3 rpm map fsio_table 100 /"
 
-// Human-readable: if (fsio_setting (0) > 20, 0, 10)
-#define ANALOG_CONDITION "0 fsio_setting 20 > 0 10 if"
+// Human-readable: if(fsio_analog_input (0) > 20, 0, 10)
+#define ANALOG_CONDITION "0 fsio_analog_input 20 > 0 10 if"
diff --git a/firmware/controllers/system_fsio.txt b/firmware/controllers/system_fsio.txt
index a8ed1259f5..3e66a60d88 100644
--- a/firmware/controllers/system_fsio.txt
+++ b/firmware/controllers/system_fsio.txt
@@ -31,6 +31,8 @@ MAIN_RELAY_LOGIC=(vbatt > 5) | in_shutdown
 # could be used for simple variable intake geometry setups or warning light or starter block
 RPM_ABOVE_USER_SETTING_1=rpm > fsio_setting(1)
 
+RPM_BELOW_USER_SETTING_3=rpm < fsio_setting(3)
+
 # could be used for simple variable intake geometry setups or warning light or starter block
 RPM_ABOVE_USER_SETTING_1=rpm > fsio_setting(1)