diff --git a/firmware/config/engines/bmw_e34.cpp b/firmware/config/engines/bmw_e34.cpp
index 93f1d53b8d..9f2497459d 100644
--- a/firmware/config/engines/bmw_e34.cpp
+++ b/firmware/config/engines/bmw_e34.cpp
@@ -36,6 +36,9 @@ void setBmwE34(DECLARE_ENGINE_PARAMETER_F) {
 	engineConfiguration->injectionMode = IM_SIMULTANEOUS;
 	engineConfiguration->ignitionMode = IM_WASTED_SPARK;
 
+	boardConfiguration->triggerInputPins[0] = GPIOC_6;
+	boardConfiguration->triggerInputPins[1] = GPIOA_5;
+
 	engineConfiguration->ignMathCalculateAtIndex = 15;
 
 	setConstantDwell(engineConfiguration, 3); // a bit shorter dwell
@@ -55,34 +58,27 @@ void setBmwE34(DECLARE_ENGINE_PARAMETER_F) {
 //	bc->isFastAdcEnabled = true;
 
 	bc->ignitionPinMode = OM_INVERTED;
-	bc->ignitionPins[0] = GPIOC_7; // #1
-	bc->ignitionPins[1] = GPIO_UNASSIGNED; // #2
-	bc->ignitionPins[2] = GPIOE_4; // #3
-	bc->ignitionPins[3] = GPIO_UNASSIGNED; // #4
-	bc->ignitionPins[4] = GPIOC_9; // #5
-	bc->ignitionPins[5] = GPIO_UNASSIGNED; // #6
+	bc->ignitionPins[0] = GPIOB_8; // #1
+	bc->ignitionPins[1] = GPIOE_2; // #2
+	bc->ignitionPins[2] = GPIOE_3; // #3
+	bc->ignitionPins[3] = GPIOE_4; // #4
+	bc->ignitionPins[4] = GPIOE_5; // #5
+	bc->ignitionPins[5] = GPIOE_6; // #6
 
 	bc->injectionPinMode = OM_INVERTED;
 
-	bc->injectionPins[0] = GPIOB_9; // #1
-	bc->injectionPins[1] = GPIOB_8; // #2
-	/**
-	 * this is a relatively dirty performance hack: with unassigned pin we
-	 * have less stuff to put into wave chart
-	 */
-	bc->injectionPins[2] = GPIO_UNASSIGNED; // #3
-	bc->injectionPins[3] = GPIO_UNASSIGNED; // #4
-	bc->injectionPins[4] = GPIO_UNASSIGNED; // #5
-	bc->injectionPins[5] = GPIO_UNASSIGNED; // #6
+	bc->injectionPins[0] = GPIOB_5; // #1
+	bc->injectionPins[1] = GPIOB_6; // #2
+	bc->injectionPins[2] = GPIOB_7; // #3
 
 	bc->triggerErrorPin = GPIOE_3;
 
 	engineConfiguration->clutchUpPin = GPIOD_3;
 	engineConfiguration->clutchUpPinMode = PI_PULLUP;
 
-	boardConfiguration->fuelPumpPin = GPIOC_13;
+	boardConfiguration->fuelPumpPin = GPIOD_4;
 
-	boardConfiguration->idleValvePin = GPIOB_10;
+	boardConfiguration->idleValvePin = GPIOC_14;
 	boardConfiguration->idleValvePinMode = OM_INVERTED;
 	boardConfiguration->idleSolenoidFrequency = 300;
 	// set_idle_pwm 50
diff --git a/firmware/gen_config.bat b/firmware/gen_config.bat
index 4969cbd5c1..a79a70cad3 100644
--- a/firmware/gen_config.bat
+++ b/firmware/gen_config.bat
@@ -1,2 +1,2 @@
 
-java -jar ../java_tools/ConfigDefinition.jar integration tunerstudio controllers\algo ../java_console/io/src
+java -jar ../java_tools/ConfigDefinition.jar integration tunerstudio controllers\algo ../java_console
diff --git a/firmware/integration/rusefi.xml b/firmware/integration/rusefi.xml
new file mode 100644
index 0000000000..86423765e3
--- /dev/null
+++ b/firmware/integration/rusefi.xml
@@ -0,0 +1,67 @@
+<roms>
+  <rom>
+    <romid>
+      <xmlid>RUSEFI</xmlid>
+      <internalidaddress>0</internalidaddress>
+      <internalidstring>RUSEFI0.1</internalidstring>
+      <ecuid>RUSEFI</ecuid>
+      <year>00</year>
+      <market>US</market>
+      <make>rusEfi</make>
+      <model>rusEfi</model>
+      <submodel>ANY</submodel>
+      <transmission>MT</transmission>
+      <memmodel>SH7055</memmodel>
+      <flashmethod>sti04</flashmethod>
+      <filesize>15288</filesize>
+    </romid>
+
+    <table type="3D" name="Ignition Advance" storageaddress="24B8" sizex="16" sizey="16" storagetype="float" endian="big">
+      <scaling units="Engine Load" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1" />
+      <table type="X Axis" storageaddress="28B8" storagetype="float" endian="big" logparam="engine_load">
+          <scaling units="degree" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1" />
+      </table>
+      <table type="Y Axis" storageaddress="28F8" storagetype="float" endian="big" logparam="rpm">
+          <scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1" />
+      </table>
+    </table>
+
+      <table type="3D" name="Volumetric Efficiency" storageaddress="2938" sizex="16" sizey="16" storagetype="float" endian="big">
+          <scaling units="Engine Load" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1" />
+          <table type="X Axis" storageaddress="2D38" storagetype="float" endian="big" logparam="engine_load">
+              <scaling units="degree" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1" />
+          </table>
+          <table type="Y Axis" storageaddress="2D78" storagetype="float" endian="big" logparam="rpm">
+              <scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1" />
+          </table>
+      </table>
+
+      <table type="3D" name="Fuel Table" storageaddress="2038" sizex="16" sizey="16" storagetype="float" endian="big">
+      <scaling units="Engine Load" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1" />
+      <table type="X Axis" storageaddress="2438" storagetype="float" endian="big" logparam="engine_load">
+          <scaling units="degree" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1" />
+      </table>
+      <table type="Y Axis" storageaddress="2478" storagetype="float" endian="big" logparam="rpm">
+          <scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1" />
+      </table>
+    </table>
+
+    <table type="3D" name="Target AFR" storageaddress="2DB8" sizex="16" sizey="16" storagetype="float" endian="big">
+      <scaling units="Engine Load" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1" />
+      <table type="X Axis" storageaddress="31B8" storagetype="float" endian="big">
+          <scaling units="degree" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1" />
+      </table>
+      <table type="Y Axis" storageaddress="31F8" storagetype="float" endian="big">
+          <scaling units="RPM" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1" />
+      </table>
+    </table>
+
+
+    <table type="2D" name="Coolant-based Warnup Enrichment" storageaddress="90" sizex="16" storagetype="float" endian="big">
+      <scaling units="Target Boost (psia) Compensation (%)" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1" />
+        <table type="X Axis" storageaddress="50" storagetype="float" endian="big">
+            <scaling units="uni" expression="x" to_byte="x" format="0.00" fineincrement=".1" coarseincrement="1" />
+        </table>
+    </table>
+  </rom>
+</roms>
\ No newline at end of file