diff --git a/firmware/config/engines/mazda_626.cpp b/firmware/config/engines/mazda_626.cpp
index 831b110dc8..0b0bc54444 100644
--- a/firmware/config/engines/mazda_626.cpp
+++ b/firmware/config/engines/mazda_626.cpp
@@ -14,7 +14,7 @@
 
 void setMazda626EngineConfiguration(engine_configuration_s *engineConfiguration) {
 	board_configuration_s *boardConfiguration = &engineConfiguration->bc;
-	engineConfiguration->trigger.type = TT_FORD_ESCORT_GT_T;
+	engineConfiguration->trigger.type = TT_MAZDA_DOHC_1_4;
 
 	// todo: introduce trigger offset parameter
 	// set_global_trigger_offset_angle 137.119154
diff --git a/firmware/config/engines/mazda_miata.cpp b/firmware/config/engines/mazda_miata.cpp
index 37fd042a97..9e6ab5d7b5 100644
--- a/firmware/config/engines/mazda_miata.cpp
+++ b/firmware/config/engines/mazda_miata.cpp
@@ -229,7 +229,7 @@ void setMiata1990(engine_configuration_s *engineConfiguration, board_configurati
 
 void setFordEscortGt(engine_configuration_s *engineConfiguration) {
 	board_configuration_s *boardConfiguration = &engineConfiguration->bc;
-	engineConfiguration->trigger.type = TT_FORD_ESCORT_GT_T;
+	engineConfiguration->trigger.type = TT_MAZDA_DOHC_1_4;
 
 	common079721_2351(engineConfiguration, boardConfiguration);
 
diff --git a/firmware/controllers/algo/auto_generated_enums.cpp b/firmware/controllers/algo/auto_generated_enums.cpp
index f9bbb47633..9d18c421a5 100644
--- a/firmware/controllers/algo/auto_generated_enums.cpp
+++ b/firmware/controllers/algo/auto_generated_enums.cpp
@@ -87,10 +87,10 @@ case TT_DODGE_NEON_2003:
   return "TT_DODGE_NEON_2003";
 case TT_FORD_ASPIRE:
   return "TT_FORD_ASPIRE";
-case TT_MAZDA_SOHC:
-  return "TT_MAZDA_SOHC";
-case TT_FORD_ESCORT_GT_T:
-  return "TT_FORD_ESCORT_GT_T";
+case TT_MAZDA_SOHC_4:
+  return "TT_MAZDA_SOHC_4";
+case TT_MAZDA_DOHC_1_4:
+  return "TT_MAZDA_DOHC_1_4";
 case TT_GM_7X:
   return "TT_GM_7X";
 case TT_HONDA_ACCORD_CD:
diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h
index ac6882753c..310b474659 100644
--- a/firmware/controllers/algo/engine_configuration_generated_structures.h
+++ b/firmware/controllers/algo/engine_configuration_generated_structures.h
@@ -1,4 +1,4 @@
-// this section was generated by config_definition.jar on Sat Jan 31 08:21:49 EST 2015
+// this section was generated by config_definition.jar on Mon Feb 02 10:48:00 EST 2015
 // begin
 #include "rusefi_types.h"
 typedef struct {
@@ -413,7 +413,7 @@ typedef struct {
 	/**
 	 * offset 404
 	 */
-	egt_cs_array_t max31855_cs;
+	brain_pin_e max31855_cs[MAX31855_CS_COUNT];
 	/**
 	 * offset 436
 	 */
@@ -1112,4 +1112,4 @@ typedef struct {
 } engine_configuration_s;
 
 // end
-// this section was generated by config_definition.jar on Sat Jan 31 08:21:49 EST 2015
+// this section was generated by config_definition.jar on Mon Feb 02 10:48:00 EST 2015
diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h
index 780e87300c..a4839f09ee 100644
--- a/firmware/controllers/algo/rusefi_enums.h
+++ b/firmware/controllers/algo/rusefi_enums.h
@@ -110,7 +110,7 @@ typedef enum {
 	TT_MAZDA_MIATA_NB = 4,
 	TT_GM_7X = 5,
 	TT_MINI_COOPER_R50 = 6,
-	TT_MAZDA_SOHC = 7,
+	TT_MAZDA_SOHC_4 = 7,
 	TT_TOOTHED_WHEEL_60_2 = 8,
 	TT_TOOTHED_WHEEL_36_1 = 9,
 
@@ -124,7 +124,7 @@ typedef enum {
 
 	TT_DODGE_NEON_2003 = 14,
 
-	TT_FORD_ESCORT_GT_T = 15,
+	TT_MAZDA_DOHC_1_4 = 15,
 
 
 	Force_4b_trigger_type = ENUM_32_BITS,
diff --git a/firmware/controllers/trigger/trigger_decoder.cpp b/firmware/controllers/trigger/trigger_decoder.cpp
index 51bf098e86..65fac9409b 100644
--- a/firmware/controllers/trigger/trigger_decoder.cpp
+++ b/firmware/controllers/trigger/trigger_decoder.cpp
@@ -303,11 +303,11 @@ void initializeTriggerShape(Logging *logger, engine_configuration_s const *engin
 		configureGmTriggerShape(triggerShape);
 		break;
 
-	case TT_FORD_ESCORT_GT_T:
+	case TT_MAZDA_DOHC_1_4:
 		configureMazdaProtegeLx(triggerShape);
 		break;
 
-	case TT_MAZDA_SOHC:
+	case TT_MAZDA_SOHC_4:
 		configureMazdaProtegeSOHC(triggerShape);
 		break;
 
diff --git a/firmware/controllers/trigger/trigger_structure.cpp b/firmware/controllers/trigger/trigger_structure.cpp
index 6cc5ee3ff6..1c8874ca75 100644
--- a/firmware/controllers/trigger/trigger_structure.cpp
+++ b/firmware/controllers/trigger/trigger_structure.cpp
@@ -40,6 +40,7 @@ TriggerShape::TriggerShape() :
 	gapBothDirections = false;
 	isSynchronizationNeeded = false;
 	invertOnAdd = false;
+	tdcPosition = 0;
 }
 
 int TriggerShape::getSize() const {
diff --git a/firmware/controllers/trigger/trigger_structure.h b/firmware/controllers/trigger/trigger_structure.h
index ed0b7e2006..a1933ca5ee 100644
--- a/firmware/controllers/trigger/trigger_structure.h
+++ b/firmware/controllers/trigger/trigger_structure.h
@@ -47,6 +47,11 @@ public:
 	float syncRatioFrom;
 	float syncRatioTo;
 
+	/**
+	 * that's the angle distance from trigger event #0 and actual engine TDC
+	 */
+	float tdcPosition;
+
 	/**
 	 * Should we use falls or rises for gap ratio detection?
 	 */
diff --git a/firmware/rusefi_config.ini b/firmware/rusefi_config.ini
index 1372a6802e..4689d8d43d 100644
--- a/firmware/rusefi_config.ini
+++ b/firmware/rusefi_config.ini
@@ -341,8 +341,7 @@ bit is_enabled_spi_2
 
 	pin_output_mode_e mainRelayPinMode;
 
-custom egt_cs_array_t 32 todo array? type?
-	egt_cs_array_t max31855_cs;
+	brain_pin_e[MAX31855_CS_COUNT iterate] max31855_cs;
 
 	spi_device_e max31855spiDevice;