diff --git a/build_all.bat b/build_all.bat
index c1745f7..985a70f 100644
--- a/build_all.bat
+++ b/build_all.bat
@@ -1,21 +1,7 @@
 echo off
-set CPU=x86
 set OEM=""
 set NOV=""
 
-if "%1"=="x86" (
-	set CPU=x86
-) else if "%1"=="x64" (
-	set CPU=x64
-) else if "%2"=="x86" (
-	set CPU=x86
-) else if "%2"=="x64" (
-	set CPU=x64
-) else if "%3"=="x86" (
-	set CPU=x86
-) else if "%3"=="x64" (
-	set CPU=x64
-)
 if "%1"=="hw" (
 	set OEM=%1
 ) else if "%1"=="lsc" (
@@ -43,34 +29,65 @@ if "%CPU%"=="" (
 
 echo build -cpu %CPU% -oem %OEM% %NOV%
 
+set CPU=x64
 if "%OEM%"=="hw" (
-	build.bat hw %CPU% 0x1000 %NOV%
-	build.bat hw %CPU% onlytwain 0x1002 nov
-	build.bat hw %CPU% onlytwain 0x7000 nov
-	build.bat hw %CPU% onlytwain 0x7002 nov
-	build.bat hw %CPU% onlytwain 0x7039 nov
-	build.bat hw %CPU% onlytwain 0x8000 nov
-	build.bat hw %CPU% onlytwain 0x9000 nov
+	build.bat hw x64 0x1000 %NOV%
+	build.bat hw x64 onlytwain 0x1002 nov
+	build.bat hw x64 onlytwain 0x7000 nov
+	build.bat hw x64 onlytwain 0x7002 nov
+	build.bat hw x64 onlytwain 0x7039 nov
+	build.bat hw x64 onlytwain 0x8000 nov
+	build.bat hw x64 onlytwain 0x9000 nov
+	set CPU=x86
+	build.bat hw x86 0x1000 nov
+	build.bat hw x86 onlytwain 0x1002 nov
+	build.bat hw x86 onlytwain 0x7000 nov
+	build.bat hw x86 onlytwain 0x7002 nov
+	build.bat hw x86 onlytwain 0x7039 nov
+	build.bat hw x86 onlytwain 0x8000 nov
+	build.bat hw x86 onlytwain 0x9000 nov
 ) else if "%OEM%" == "lsc" (
-	build.bat lsc %CPU% 0x8200 %NOV%
-	build.bat lsc %CPU% onlytwain 0x8420 nov
-	build.bat lsc %CPU% onlytwain 0x8429 nov
-	build.bat lsc %CPU% onlytwain 0x8520 nov
-	build.bat lsc %CPU% onlytwain 0x8529 nov
-	build.bat lsc %CPU% onlytwain 0x8620 nov
-	build.bat lsc %CPU% onlytwain 0x8629 nov
-	build.bat lsc %CPU% onlytwain 0x8730 nov
-	build.bat lsc %CPU% onlytwain 0x8739 nov
+	build.bat lsc x64 0x8200 %NOV%
+	build.bat lsc x64 onlytwain 0x8420 nov
+	build.bat lsc x64 onlytwain 0x8429 nov
+	build.bat lsc x64 onlytwain 0x8520 nov
+	build.bat lsc x64 onlytwain 0x8529 nov
+	build.bat lsc x64 onlytwain 0x8620 nov
+	build.bat lsc x64 onlytwain 0x8629 nov
+	build.bat lsc x64 onlytwain 0x8730 nov
+	build.bat lsc x64 onlytwain 0x8739 nov
+	set CPU=x86	  
+	build.bat lsc x86 0x8200 nov
+	build.bat lsc x86 onlytwain 0x8420 nov
+	build.bat lsc x86 onlytwain 0x8429 nov
+	build.bat lsc x86 onlytwain 0x8520 nov
+	build.bat lsc x86 onlytwain 0x8529 nov
+	build.bat lsc x86 onlytwain 0x8620 nov
+	build.bat lsc x86 onlytwain 0x8629 nov
+	build.bat lsc x86 onlytwain 0x8730 nov
+	build.bat lsc x86 onlytwain 0x8739 nov
 ) else (
-	build.bat %CPU% 0x100 %NOV%
-	build.bat %CPU% onlytwain 0x139 nov
-	build.bat %CPU% onlytwain 0x200 nov
-	build.bat %CPU% onlytwain 0x239 nov
-	build.bat %CPU% onlytwain 0x300 nov
-	build.bat %CPU% onlytwain 0x302 nov
-	build.bat %CPU% onlytwain 0x339 nov
-	build.bat %CPU% onlytwain 0x400 nov
-	build.bat %CPU% onlytwain 0x402 nov
-	build.bat %CPU% onlytwain 0x439 nov
-	build.bat %CPU% onlytwain 0x7823 nov
+	build.bat x64 0x100 %NOV%
+	build.bat x64 onlytwain 0x139 nov
+	build.bat x64 onlytwain 0x200 nov
+	build.bat x64 onlytwain 0x239 nov
+	build.bat x64 onlytwain 0x300 nov
+	build.bat x64 onlytwain 0x302 nov
+	build.bat x64 onlytwain 0x339 nov
+	build.bat x64 onlytwain 0x400 nov
+	build.bat x64 onlytwain 0x402 nov
+	build.bat x64 onlytwain 0x439 nov
+	build.bat x64 onlytwain 0x7823 nov
+	set CPU=x86
+	build.bat x86 0x100 nov
+	build.bat x86 onlytwain 0x139 nov
+	build.bat x86 onlytwain 0x200 nov
+	build.bat x86 onlytwain 0x239 nov
+	build.bat x86 onlytwain 0x300 nov
+	build.bat x86 onlytwain 0x302 nov
+	build.bat x86 onlytwain 0x339 nov
+	build.bat x86 onlytwain 0x400 nov
+	build.bat x86 onlytwain 0x402 nov
+	build.bat x86 onlytwain 0x439 nov
+	build.bat x86 onlytwain 0x7823 nov
 )