diff --git a/hardware/Common_Rail_MC33816/gerbers/MC33816_R0.3-bom.csv b/hardware/Common_Rail_MC33816/gerbers/MC33816_R0.3-bom.csv
index 48313e3bbe..45a1bf12cd 100644
--- a/hardware/Common_Rail_MC33816/gerbers/MC33816_R0.3-bom.csv
+++ b/hardware/Common_Rail_MC33816/gerbers/MC33816_R0.3-bom.csv
@@ -1,6 +1,12 @@
 Comment,Designator,Footprint,LCSC Part #
-DNP Schottky diode,"D15,D20",D_SOD-323,
-100UF 50V Polarized capacitor,C2,CP_Elec_8x10.5,
-4.7nF Unpolarized capacitor,"C3,C11",C_0603_1608Metric,C53987
-470nF Unpolarized capacitor,"C4,C5",C_0603_1608Metric,C1623
-10uF Unpolarized capacitor,"C7,C9,C8",C_0603_1608Metric,C19702
+0.1uF,C10 C11 C13 C8 ,rusEFI_LIB:C_0805,C49678
+4.7uF,C12 ,rusEFI_LIB:C_0805,C1779
+470pF,C26 ,rusEFI_LIB:C_0805,C1743
+1000pF,C35 C36 C37 C38 C55 C56 C57 C58 C63 C71 ,rusEFI_LIB:C_0805,C209838
+0.33uF,C39 C40 C41 C42 C64 ,rusEFI_LIB:C_0805,C1740
+4700pF,C43 C44 C45 C46 C47 C48 C49 C50 C65 C67 ,rusEFI_LIB:C_0805,C21217
+330pF,C23 C24 C28 C59 C60 C73 ,rusEFI_LIB:C_0805,C51207
+1uF,C9 ,rusEFI_LIB:C_0805,C28323
+10R,R11 R13 R14 R15 R16 R17 R18 R19 R20 R23 R24 ,rusEFI_LIB:R_0805,C17415
+0R015,R21 R22 R26 ,Resistors_SMD:R_1206_HandSoldering,C201281
+5.1R,R10 R9 ,rusEFI_LIB:R_0805,C17724
diff --git a/hardware/Common_Rail_MC33816/gerbers/kicadBom2jlcpcb.bat b/hardware/Common_Rail_MC33816/gerbers/kicadBom2jlcpcb.bat
index bad4f286e1..278436105c 100644
--- a/hardware/Common_Rail_MC33816/gerbers/kicadBom2jlcpcb.bat
+++ b/hardware/Common_Rail_MC33816/gerbers/kicadBom2jlcpcb.bat
@@ -1,3 +1,4 @@
+@echo off
 
 set inputFile=../Common_Rail_MC33816.csv
 set outputFile=MC33816_R0.3-bom.csv
@@ -8,15 +9,7 @@ echo "Translating from %inputFile% to %outputFile%"
 
 echo Comment,Designator,Footprint,LCSC Part #> %outputFile%
                        
-grep JLCPCB %inputFile%
 
 grep JLCPCB %inputFile% > %outputFile%.temp
 
-sed -f removedoublecomma.sed %outputFile%.temp > %outputFile%.all
-
-
-
-
-rem  | gawk -F "," '{print $4}'
-
-
+sed -f removedoublecomma.sed %outputFile%.temp | gawk -F "," '{print $3 "," $1 "," $4 "," $10}' >> %outputFile%