diff --git a/firmware/config/engines/toyota_jzs147.cpp b/firmware/config/engines/toyota_jzs147.cpp
index 16804abf02..65280cf053 100644
--- a/firmware/config/engines/toyota_jzs147.cpp
+++ b/firmware/config/engines/toyota_jzs147.cpp
@@ -24,7 +24,9 @@
 #include "mazda_miata_vvt.h"
 
 static void common2jz() {
-	setFrankensoConfiguration(); // default pinout
+	strcpy(engineConfiguration->engineMake, ENGINE_MAKE_TOYOTA);
+	strcpy(engineConfiguration->engineCode, "2JZ");
+	strcpy(engineConfiguration->vehicleName, "VVT example");
 
 	engineConfiguration->displacement = 3.0;
 	engineConfiguration->cylindersCount = 6;
@@ -32,6 +34,8 @@ static void common2jz() {
 	// set ignition_mode 1
 	engineConfiguration->ignitionMode = IM_INDIVIDUAL_COILS;
 
+#if HW_FRANKENSO
+	setFrankensoConfiguration(); // default pinout
 	engineConfiguration->ignitionPins[0] = Gpio::E14;
 	engineConfiguration->ignitionPins[1] = Gpio::C7;
 	engineConfiguration->ignitionPins[2] = Gpio::C9;
@@ -46,6 +50,7 @@ static void common2jz() {
 	engineConfiguration->injectionPins[3] = Gpio::B7; // #4
 	engineConfiguration->injectionPins[4] = Gpio::E3; // #5
 	engineConfiguration->injectionPins[5] = Gpio::E4; // #6
+#endif // HW_FRANKENSO
 
 	engineConfiguration->fuelPumpPin = Gpio::Unassigned;
 
@@ -75,11 +80,14 @@ void setToyota_2jz_vics() {
 	setCrankOperationMode();
 	engineConfiguration->trigger.type = trigger_type_e::TT_TOOTHED_WHEEL_36_2;
 
+#if HW_FRANKENSO
 	engineConfiguration->triggerInputPins[0] = Gpio::A5; // crank sensor
 	engineConfiguration->triggerInputPins[1] = Gpio::Unassigned; // cam sensor will he handled by custom vtti code
 
 	engineConfiguration->camInputs[0] = Gpio::C6;
 	engineConfiguration->vvtMode[0] = VVT_TOYOTA_3_TOOTH;
+	engineConfiguration->vvtPins[0] = Gpio::E3; // VVT solenoid control
+#endif // HW_FRANKENSO
 
 	// set global_trigger_offset_angle 155
 	engineConfiguration->globalTriggerAngleOffset = 155; // todo
@@ -88,13 +96,8 @@ void setToyota_2jz_vics() {
 	engineConfiguration->injectionMode = IM_BATCH; // just for now
 	engineConfiguration->twoWireBatchIgnition = true;
 
-	strcpy(engineConfiguration->engineMake, ENGINE_MAKE_TOYOTA);
-	strcpy(engineConfiguration->engineCode, "2JZ");
-	strcpy(engineConfiguration->vehicleName, "VVT example");
-
 	// todo: these magic values would be hardcoded once we find out proper magic values!
 	//	engineConfiguration->scriptSetting[4] = 175 - 45;
 	//	engineConfiguration->scriptSetting[5] = 175 + 45;
 
-	engineConfiguration->vvtPins[0] = Gpio::E3; // VVT solenoid control
 }
diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input
index 69d7442b8b..9bff6934aa 100644
--- a/firmware/tunerstudio/rusefi.input
+++ b/firmware/tunerstudio/rusefi.input
@@ -2257,8 +2257,9 @@ cmd_set_engine_type_PROTEUS_NISSAN_VQ35				= "@@TS_IO_TEST_COMMAND_char@@@@ts_co
 cmd_set_engine_type_PROTEUS_M111    				= "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_PROTEUS_M111_16_hex@@"@@if_show_Proteus_presets
 
 cmd_set_engine_type_GM_SBC	        			= "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_GM_SBC_16_hex@@"@@if_show_Proteus_presets
-cmd_set_engine_type_GM_SBC       			= "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_GM_SBC_16_hex@@"@@if_show_8chan_presets
-cmd_set_engine_type_GM_SBC       			= "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_GM_SBC_16_hex@@"@@if_show_uaefi_presets
+cmd_set_engine_type_GM_SBC       			    = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_GM_SBC_16_hex@@"@@if_show_8chan_presets
+cmd_set_engine_type_GM_SBC       			    = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_GM_SBC_16_hex@@"@@if_show_uaefi_presets
+cmd_set_engine_type_TOYOTA_2JZ_GTE_VVTi   = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_TOYOTA_2JZ_GTE_VVTi_16_hex@@"@@if_show_uaefi_presets
 
 
 cmd_set_engine_type_HYUNDAI_PB				        = "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_SET_ENGINE_TYPE_16_hex@@@@engine_type_e_HYUNDAI_PB_16_hex@@"@@if_show_Proteus_presets
@@ -4556,6 +4557,7 @@ dialog = tcuControls, "Transmission Settings"
 		commandButton = "Fuel Bench",               cmd_set_engine_type_FUEL_BENCH
 
 		commandButton = "Small Block Chevy",		        cmd_set_engine_type_GM_SBC@@if_show_uaefi_presets
+		commandButton = "2JZ",		                      cmd_set_engine_type_TOYOTA_2JZ_GTE_VVTi@@if_show_uaefi_presets
 
 		commandButton = "SBC",			            cmd_set_engine_type_GM_SBC@@if_show_8chan_presets
 		commandButton = "Honda BCM",	            cmd_set_engine_type_SMALL_CB_HONDA_BCM@@if_show_small_can_board_presets