diff --git a/firmware/config/engines/custom_engine.cpp b/firmware/config/engines/custom_engine.cpp
index 7ede8b62ce..c0850896a7 100644
--- a/firmware/config/engines/custom_engine.cpp
+++ b/firmware/config/engines/custom_engine.cpp
@@ -802,10 +802,6 @@ void proteusHarley() {
 	engineConfiguration->camInputs[0] = PROTEUS_DIGITAL_6;
 	engineConfiguration->vvtMode[0] = VVT_MAP_V_TWIN_ANOTHER;
 
-	engineConfiguration->mapCamAveragingLength = 16;
-	engineConfiguration->mapCamSkipFactor = 50;
-	engineConfiguration->mapCamLookForLowPeaks = true;
-
 	engineConfiguration->luaOutputPins[0] = PROTEUS_LS_12;
 #if HW_PROTEUS
 	strncpy(config->luaScript, R"(
diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt
index d90accb607..30a4aaa625 100644
--- a/firmware/integration/rusefi_config.txt
+++ b/firmware/integration/rusefi_config.txt
@@ -651,10 +651,10 @@ uint8_t knockRetardAggression;+Ignition timing to remove when a knock event occu
 uint8_t knockRetardReapplyRate;+After a knock event, reapply timing at this rate.;"deg/s", 0.1, 0, 0, 10, 1
 uint8_t knockRetardMaximum;+Maximum amount of knock retard.;"deg", 1, 0, 0, 30, 0
 
-	uint8_t mapCamDetectionThreshold;;"", 1, 0, 0, 240, 0
+	uint8_t unusedDtectionThreshold;;"", 1, 0, 0, 240, 0
 	uint16_t autoscale vssGearRatio;Number of turns of your vehicle speed sensor per turn of the wheels. For example if your sensor is on the transmission output, enter your axle/differential ratio. If you are using a hub-mounted sensor, enter a value of 1.0.; "ratio", 0.001, 0, 0, 60, 3
 	uint8_t vssToothCount;Number of pulses output per revolution of the shaft where your VSS is mounted.  For example, GM applications of the T56 output 17 pulses per revolution of the transmission output shaft.;"count", 1, 0, 1, 100, 0
-	uint8_t mapCamAveragingLength;;"", 1, 0, 0, 255, 0
+	uint8_t unusedAveragingLength;;"", 1, 0, 0, 255, 0
 
 
 ! todo: rename to triggerSimulatorRpm
@@ -793,7 +793,7 @@ output_pin_e acFanPin;+Optional Radiator Fan used with A/C
 	pin_output_mode_e acFanPinMode;
 
 
-    uint8_t mapCamSkipFactor;;"", 1, 0, 0, 255, 0
+    uint8_t unusedCamSkipFactor;;"", 1, 0, 0, 255, 0
 	uint8_t[DWELL_CURVE_SIZE] dwellVoltageCorrVoltBins;;"volts", 0.1, 0, 0, 20, 1
 
  	custom imu_type_e 1 bits, U08, @OFFSET@, [0:4], "None", "VAG", "MM5.10", "type 2", "type 2"
@@ -907,7 +907,7 @@ custom maf_sensor_type_e 4 bits, S32, @OFFSET@, [0:1], @@maf_sensor_type_e_enum@
 	bit enableInnovateLC2
 	bit showHumanReadableWarning
 	bit stftIgnoreErrorMagnitude;+If enabled, adjust at a constant rate instead of a rate proportional to the current lambda error. This mode may be easier to tune, and more tolerant of sensor noise. Use of this mode is required if you have a narrowband O2 sensor.
-	bit mapCamLookForLowPeaks
+	bit unused45342
 	bit enableSoftwareKnock
 	bit verboseVVTDecoding;enable vvt_details
 	bit invertCamVVTSignal;get invertCamVVTSignal
diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input
index 53bc0661ef..bcaeb3c677 100644
--- a/firmware/tunerstudio/rusefi.input
+++ b/firmware/tunerstudio/rusefi.input
@@ -2215,6 +2215,8 @@ cmd_set_engine_type_default					= "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00"
 		field = "Throttle Up switch",					throttlePedalUpPin
 		field = "Brake pedal switch",					brakePedalPin
 		field = "Flex fuel sensor",					flexSensorPin
+		field = "Turbo Speed Sensor",                   turboSpeedSensorInputPin
+		field = "Turbo Speed Multiplier",               turboSpeedSensorMultiplier
 
 	dialog = fuelLevelDialog,				"Fuel Level Sensor"
 		field = "Input channel", 						fuelLevelSensor
@@ -3563,7 +3565,6 @@ cmd_set_engine_type_default					= "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00"
 
 				;			Racing Features->Launch Control
 	dialog = smLaunchControl, "Launch Control Settings EXPERIMENTAL"
-	    field = "disablePrimaryUart",                   disablePrimaryUart
         field = "Enable Launch Control",               	launchControlEnabled
 		field = "Activation Mode",                      launchActivationMode
 	    field = "Switch Input",                     	launchActivatePin,  {launchActivationMode == 0 && launchControlEnabled == 1}
@@ -3615,15 +3616,14 @@ cmd_set_engine_type_default					= "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00"
 		field = "Trailing Pin 3",						trailingCoilPins3
 		field = "Trailing Pin 4",						trailingCoilPins4
 
+    dialog = mapCamDialog, "Engine Phase by MAP sensor"
+		field = "mapCamDetectionAnglePosition",         mapCamDetectionAnglePosition
+
 	dialog = parkingLot, "Experimental/Broken"
 	    field = "boardUseTachPullUp",                   boardUseTachPullUp
 	    field = "boardUseTempPullUp",                   boardUseTempPullUp
 	    field = "boardUseCrankPullUp",                  boardUseCrankPullUp
-		field = "mapCamDetectionAnglePosition",         mapCamDetectionAnglePosition
-		field = "mapCamDetectionThreshold",             mapCamDetectionThreshold
-		field = "mapCamAveragingLength",                  mapCamAveragingLength
-		field = "mapCamSkipFactor",                     mapCamSkipFactor
-		field = "mapCamLookForLowPeaks",                mapCamLookForLowPeaks
+	    field = "disablePrimaryUart",                   disablePrimaryUart
 		field = "#System hacks"
 		field = "Global fuel correction", 				globalFuelCorrection
 		field = "MAP Averaging Logic @",				mapAveragingSchedulingAtIndex
@@ -3631,9 +3631,8 @@ cmd_set_engine_type_default					= "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00"
 		field = "Warning Message",                      warning_message
 		field = "Ford redundant TPS mode",				useFordRedundantTps
 		field = "consumeObdSensors",                    consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1}
-		field = "turbo speed sensor",                   turboSpeedSensorInputPin
-		field = "turbo speed multiplier",               turboSpeedSensorMultiplier
 		field = "Artificial Misfire",                   artificialTestMisfire
+		panel = mapCamDialog
 		panel = allTriggerDebug
 		panel = torqueCurve