diff --git a/make.msvc.bat b/make.msvc.bat
index 2add404..0fceb94 100755
--- a/make.msvc.bat
+++ b/make.msvc.bat
@@ -1,6 +1,5 @@
 @ECHO OFF
 
-
 :: Toolkit 2003
 if defined VCToolkitInstallDir (
 	if exist "%VCToolkitInstallDir%\vcvars32.bat2" (
@@ -16,9 +15,10 @@ if defined VCToolkitInstallDir (
 if defined VCINSTALLDIR (
 	if exist "%VCINSTALLDIR%\vcvarsall.bat" (
 		echo -
-		echo - Visual C++ found.
+		echo - Visual C++ 8 found.
 		echo -
-		call "%VCINSTALLDIR%\vcvarsall.bat"
+		call "%VCINSTALLDIR%\vcvarsall.bat x86"
+		set MSVCDir=%VCINSTALLDIR%
 		goto STARTCOMPILING
 	)
 	if exist "%VCINSTALLDIR%\vcvars32.bat" (
@@ -47,7 +47,6 @@ goto ERROR
 
 :: loki buid process
 
-@ECHO ON
 
 cd src
 call make.msvc.bat
@@ -57,21 +56,14 @@ cd examples
 call make.msvc.bat
 cd ..
 
-cd test\flex_string
+cd test
 call make.msvc.bat
-cd ..\..
+cd ..
 
-cd test\SafeFormat
+cd tools
 call make.msvc.bat
-cd ..\..
+cd ..
 
-cd test\SmallObj
-call make.msvc.bat
-cd ..\..
-
-cd tools\RegressionTest
-call make.msvc.bat
-cd ..\..
 
 goto LEAVE
 
diff --git a/test/make.msvc.bat b/test/make.msvc.bat
new file mode 100755
index 0000000..44adaad
--- /dev/null
+++ b/test/make.msvc.bat
@@ -0,0 +1,12 @@
+
+cd flex_string
+call make.msvc.bat
+cd ..
+
+cd SafeFormat
+call make.msvc.bat
+cd ..
+
+cd SmallObj
+call make.msvc.bat
+cd ..
diff --git a/tools/RegressionTest/make.msvc.bat b/tools/RegressionTest/make.msvc.bat
index 164f761..4197663 100755
--- a/tools/RegressionTest/make.msvc.bat
+++ b/tools/RegressionTest/make.msvc.bat
@@ -1,6 +1,6 @@
 if not exist obj\ mkdir obj
 
-::cl -c -Zm200 -O2 -MT -EHsc -GR -W0 -wd4710 -I"." -I"..\..\include" -I"..\..\include\loki" -Foobj\ Test.cpp
+cl -c -Zm200 -O2 -MT -EHsc -GR -W0 -wd4710 -I"." -I"..\..\include" -I"..\..\include\loki" -Foobj\ Test.cpp
 
 link /NOLOGO /SUBSYSTEM:CONSOLE /incremental:no /OUT:"main-msvc.exe" obj\Test.obj 
 ::..\..\lib\SmallObj.obj ..\..\lib\Singleton.obj 
\ No newline at end of file
diff --git a/tools/make.msvc.bat b/tools/make.msvc.bat
new file mode 100755
index 0000000..4c0265b
--- /dev/null
+++ b/tools/make.msvc.bat
@@ -0,0 +1,5 @@
+
+cd RegressionTest
+call make.msvc.bat
+cd ..
+