diff --git a/hardware/Common_Rail_MC33816/Common_Rail_MC33816.sch b/hardware/Common_Rail_MC33816/Common_Rail_MC33816.sch
index db301f3d46..ff8ae9aea7 100644
--- a/hardware/Common_Rail_MC33816/Common_Rail_MC33816.sch
+++ b/hardware/Common_Rail_MC33816/Common_Rail_MC33816.sch
@@ -54,7 +54,7 @@ F 3 "" H 7325 3975 60  0001 C CNN
 F 4 "Nexperia,BUK9230-100B" V 3805 3950 60  0001 C CNN "MFG,MFG#"
 F 5 "DIGI,1727-4708-1-ND" V 3805 3950 60  0001 C CNN "VEND1,VEND1#"
 F 6 "," H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
-F 7 "C194346" H 10675 3100 50  0001 C CNN "LCSC"
+F 7 "C67277 " H 10675 3100 50  0001 C CNN "LCSC"
 	1    10675 3100
 	1    0    0    -1  
 $EndComp
@@ -69,7 +69,7 @@ F 3 "" H 7325 3975 60  0001 C CNN
 F 4 "Nexperia,BUK9230-100B" V 3805 3950 60  0001 C CNN "MFG,MFG#"
 F 5 "DIGI,1727-4708-1-ND" V 3805 3950 60  0001 C CNN "VEND1,VEND1#"
 F 6 "," H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
-F 7 "C194346" H 11975 2575 50  0001 C CNN "LCSC"
+F 7 "C67277 " H 11975 2575 50  0001 C CNN "LCSC"
 	1    11975 2575
 	1    0    0    -1  
 $EndComp
@@ -239,7 +239,7 @@ F 3 "" H 7325 3975 60  0001 C CNN
 F 4 "Nexperia,BUK9230-100B" V 3805 3950 60  0001 C CNN "MFG,MFG#"
 F 5 "DIGI,1727-4708-1-ND" V 3805 3950 60  0001 C CNN "VEND1,VEND1#"
 F 6 "," H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
-F 7 "C194346" H 10675 4300 50  0001 C CNN "LCSC"
+F 7 "C67277 " H 10675 4300 50  0001 C CNN "LCSC"
 	1    10675 4300
 	1    0    0    -1  
 $EndComp
@@ -353,7 +353,7 @@ F 3 "" H 7325 3975 60  0001 C CNN
 F 4 "Nexperia,BUK9230-100B" V 3805 3950 60  0001 C CNN "MFG,MFG#"
 F 5 "DIGI,1727-4708-1-ND" V 3805 3950 60  0001 C CNN "VEND1,VEND1#"
 F 6 "," H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
-F 7 "C194346" H 11975 4850 50  0001 C CNN "LCSC"
+F 7 "C67277 " H 11975 4850 50  0001 C CNN "LCSC"
 	1    11975 4850
 	1    0    0    -1  
 $EndComp
@@ -454,7 +454,7 @@ F 3 "" H 7325 3975 60  0001 C CNN
 F 4 "Nexperia,BUK9230-100B" V 3805 3950 60  0001 C CNN "MFG,MFG#"
 F 5 "DIGI,1727-4708-1-ND" V 3805 3950 60  0001 C CNN "VEND1,VEND1#"
 F 6 "," H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
-F 7 "C194346" H 5975 6000 50  0001 C CNN "LCSC"
+F 7 "C67277 " H 5975 6000 50  0001 C CNN "LCSC"
 	1    5975 6000
 	-1   0    0    -1  
 $EndComp
@@ -469,7 +469,7 @@ F 3 "" H 7325 3975 60  0001 C CNN
 F 4 "Nexperia,BUK9230-100B" V 3805 3950 60  0001 C CNN "MFG,MFG#"
 F 5 "DIGI,1727-4708-1-ND" V 3805 3950 60  0001 C CNN "VEND1,VEND1#"
 F 6 "," H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
-F 7 "C194346" H 10750 6650 50  0001 C CNN "LCSC"
+F 7 "C67277 " H 10750 6650 50  0001 C CNN "LCSC"
 	1    10750 6650
 	1    0    0    -1  
 $EndComp
@@ -796,7 +796,7 @@ F 3 "" H 7325 3975 60  0001 C CNN
 F 4 "Nexperia,BUK9230-100B" V 3805 3950 60  0001 C CNN "MFG,MFG#"
 F 5 "DIGI,1727-4708-1-ND" V 3805 3950 60  0001 C CNN "VEND1,VEND1#"
 F 6 "," H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
-F 7 "C194346" H 5975 7000 50  0001 C CNN "LCSC"
+F 7 "C67277 " H 5975 7000 50  0001 C CNN "LCSC"
 	1    5975 7000
 	-1   0    0    -1  
 $EndComp
@@ -1462,7 +1462,7 @@ F 3 "" H 7325 3975 60  0001 C CNN
 F 4 "Nexperia,BUK9230-100B" V 3805 3950 60  0001 C CNN "MFG,MFG#"
 F 5 "DIGI,1727-4708-1-ND" V 3805 3950 60  0001 C CNN "VEND1,VEND1#"
 F 6 "," H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
-F 7 "C194346" H 5875 3100 50  0001 C CNN "LCSC"
+F 7 "C67277 " H 5875 3100 50  0001 C CNN "LCSC"
 	1    5875 3100
 	-1   0    0    -1  
 $EndComp
@@ -1477,7 +1477,7 @@ F 3 "" H 7325 3975 60  0001 C CNN
 F 4 "Nexperia,BUK9230-100B" V 3805 3950 60  0001 C CNN "MFG,MFG#"
 F 5 "DIGI,1727-4708-1-ND" V 3805 3950 60  0001 C CNN "VEND1,VEND1#"
 F 6 "," H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
-F 7 "C194346" H 4575 2575 50  0001 C CNN "LCSC"
+F 7 "C67277 " H 4575 2575 50  0001 C CNN "LCSC"
 	1    4575 2575
 	-1   0    0    -1  
 $EndComp
@@ -1636,7 +1636,7 @@ F 3 "" H 7325 3975 60  0001 C CNN
 F 4 "Nexperia,BUK9230-100B" V 3805 3950 60  0001 C CNN "MFG,MFG#"
 F 5 "DIGI,1727-4708-1-ND" V 3805 3950 60  0001 C CNN "VEND1,VEND1#"
 F 6 "," H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
-F 7 "C194346" H 5875 4300 50  0001 C CNN "LCSC"
+F 7 "C67277 " H 5875 4300 50  0001 C CNN "LCSC"
 	1    5875 4300
 	-1   0    0    -1  
 $EndComp
@@ -1735,7 +1735,7 @@ F 3 "" H 7325 3975 60  0001 C CNN
 F 4 "Nexperia,BUK9230-100B" V 3805 3950 60  0001 C CNN "MFG,MFG#"
 F 5 "DIGI,1727-4708-1-ND" V 3805 3950 60  0001 C CNN "VEND1,VEND1#"
 F 6 "," H 7325 3975 60  0001 C CNN "VEND2,VEND2#"
-F 7 "C194346" H 4575 4850 50  0001 C CNN "LCSC"
+F 7 "C67277 " H 4575 4850 50  0001 C CNN "LCSC"
 	1    4575 4850
 	-1   0    0    -1  
 $EndComp
diff --git a/hardware/Common_Rail_MC33816/gerbers/Common_Rail_MC33816_R0.3.2/Common_Rail_MC33816_R0.3.2_JLC_BOM.csv b/hardware/Common_Rail_MC33816/gerbers/Common_Rail_MC33816_R0.3.2/Common_Rail_MC33816_R0.3.2_JLC_BOM.csv
index c1f59ae423..722db19208 100644
--- a/hardware/Common_Rail_MC33816/gerbers/Common_Rail_MC33816_R0.3.2/Common_Rail_MC33816_R0.3.2_JLC_BOM.csv
+++ b/hardware/Common_Rail_MC33816/gerbers/Common_Rail_MC33816_R0.3.2/Common_Rail_MC33816_R0.3.2_JLC_BOM.csv
@@ -23,7 +23,7 @@ Comment,Designator,Footprint,LCSC, LCSC, MFG,MFG#, VEND1,VEND1#, VEND2,VEND2#
 "INJ_Term","J8,J12","Terminal_Blocks:TerminalBlock_bornier-2_P5.08mm","","","onshore,OSTTG025100B","DIGI,ED2703-ND",","
 "6uH","L1","rusefi_lib:744710610-Inductor","","","Würth Elektronik,744710610","DIGI,732-3255-ND",","
 "10uH","L2","rusefi_lib:IHLP6767GZER100M01","","","Vishay,IHLP6767GZER100M01","DIGI,541-1259-1-ND",","
-"BUK9230-100B","Q6,Q5,Q9,Q10,Q11,Q2,Q12,Q4,Q3,Q8,Q7","TO_SOT_Packages_SMD:TO-252-2Lead","","C194346","Nexperia,BUK9230-100B","DIGI,1727-4708-1-ND",","
+"BUK9230-100B","Q6,Q5,Q9,Q10,Q11,Q2,Q12,Q4,Q3,Q8,Q7","TO_SOT_Packages_SMD:TO-252-2Lead","","C67277 ","Nexperia,BUK9230-100B","DIGI,1727-4708-1-ND",","
 "0R010","R12","Resistors_SMD:R_1206_HandSoldering","","","Ohmite,MCS1632R010FER","DIGI,MCS1632R010FERCT-ND",","
 "10R","R16,R15,R19,R20,R11,R23,R24,R14,R13,R18,R17","rusefi_lib:R_0805","","C17403","Stackpole,RMCF0805JG10R0","DIGI,RMCF0805JG10R0CT-ND","JLCPCB,C17403"
 "0R015","R22,R26,R21","Resistors_SMD:R_1206_HandSoldering","","C201281","Panasonic,ERJ-8CWFR015V","DIGI,P0.015BVCT-ND","JLCPCB,C201281"
diff --git a/simulator/clean.bat b/simulator/clean.bat
index 63d0d0d7e9..20ae4d6a70 100644
--- a/simulator/clean.bat
+++ b/simulator/clean.bat
@@ -1,3 +1,8 @@
-echo Entering simulator\clean.bat
-rm -rf .dep
-rm -rf build
+@echo off
+sh.exe compile.sh || (
+  if exist C:\cygwin64 (
+    C:\cygwin64\bin\sh.exe compile.sh
+  ) else (
+    if exist C:\cygwin ( C:\cygwin\bin\sh.exe compile.sh )
+  )
+)
diff --git a/simulator/clean.sh b/simulator/clean.sh
new file mode 100644
index 0000000000..614e345812
--- /dev/null
+++ b/simulator/clean.sh
@@ -0,0 +1,3 @@
+echo "Entering simulator/clean.sh"
+rm -rf .dep
+rm -rf build
diff --git a/simulator/compile.bat b/simulator/compile.bat
index 9a4356ccc6..20ae4d6a70 100644
--- a/simulator/compile.bat
+++ b/simulator/compile.bat
@@ -1,5 +1,8 @@
-rem this is about CygWin colon issue, .dep files are invalid because of that
-rem rm -rf .dep
-rm -f build/rusefi_simulator.exe
-make -j4 -r
-echo "TIMESTAMP %date% %time% just compiled rusefi simulator"
\ No newline at end of file
+@echo off
+sh.exe compile.sh || (
+  if exist C:\cygwin64 (
+    C:\cygwin64\bin\sh.exe compile.sh
+  ) else (
+    if exist C:\cygwin ( C:\cygwin\bin\sh.exe compile.sh )
+  )
+)
diff --git a/simulator/compile.sh b/simulator/compile.sh
new file mode 100644
index 0000000000..0175decbb3
--- /dev/null
+++ b/simulator/compile.sh
@@ -0,0 +1,3 @@
+rm -f build/rusefi_simulator.exe
+make -j4 -r
+echo "TIMESTAMP $(date "+%D %T.%2N") just compiled rusefi simulator"
diff --git a/simulator/make_clean.bat b/simulator/make_clean.bat
deleted file mode 100644
index edbfb5ced5..0000000000
--- a/simulator/make_clean.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-make clean
-make 2> err > log
\ No newline at end of file
diff --git a/simulator/make_run.bat b/simulator/make_run.bat
deleted file mode 100644
index 121b51deea..0000000000
--- a/simulator/make_run.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-make -r
-
-cd build
-rusefi_simulator.exe
-
diff --git a/unit_tests/compile.bat b/unit_tests/compile.bat
index 1f0ee470ef..20ae4d6a70 100644
--- a/unit_tests/compile.bat
+++ b/unit_tests/compile.bat
@@ -1,4 +1,8 @@
-echo I am compiling unit tests
-rm -rf .dep/
-rm -rf build/
-make -j4
+@echo off
+sh.exe compile.sh || (
+  if exist C:\cygwin64 (
+    C:\cygwin64\bin\sh.exe compile.sh
+  ) else (
+    if exist C:\cygwin ( C:\cygwin\bin\sh.exe compile.sh )
+  )
+)
diff --git a/unit_tests/compile.sh b/unit_tests/compile.sh
new file mode 100644
index 0000000000..f6452ffe7e
--- /dev/null
+++ b/unit_tests/compile.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+echo "Compiling unit tests"
+rm -rf .dep/
+rm -rf build/
+make -j4