diff --git a/ClickToBuild.cmd b/ClickToBuild.cmd
index 5fc7ac469..3c0b68c2d 100644
--- a/ClickToBuild.cmd
+++ b/ClickToBuild.cmd
@@ -9,23 +9,25 @@ goto build
 
 
 :initialize2k8Dev12
-call "%ProgramFiles%\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86
-goto build
-
-:initialize2k8on64Dev12
 call "%ProgramFiles(x86)%\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86
 goto build
 
-:initialize2k8Dev11
-call "%ProgramFiles%\Microsoft Visual Studio 11.0\VC\vcvarsall.bat" x86
+:initialize2k8on64Dev12
+call "%ProgramFiles%\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86
 goto build
 
-:initialize2k8on64Dev11
+:initialize2k8Dev11
 call "%ProgramFiles(x86)%\Microsoft Visual Studio 11.0\VC\vcvarsall.bat" x86
 goto build
 
+:initialize2k8on64Dev11
+call "%ProgramFiles%\Microsoft Visual Studio 11.0\VC\vcvarsall.bat" x86
+goto build
+
 :build
-call build
+if "%~1"=="" msbuild /t:Build Orchard.proj
+msbuild /t:%~1 Orchard.proj
+
 pause
 goto end
 
diff --git a/ClickToBuildAzurePackage.cmd b/ClickToBuildAzurePackage.cmd
index 6995dc8ec..89f5cba72 100644
--- a/ClickToBuildAzurePackage.cmd
+++ b/ClickToBuildAzurePackage.cmd
@@ -9,23 +9,25 @@ goto build
 
 
 :initialize2k8Dev12
-call "%ProgramFiles%\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86
-goto build
-
-:initialize2k8on64Dev12
 call "%ProgramFiles(x86)%\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86
 goto build
 
-:initialize2k8Dev11
-call "%ProgramFiles%\Microsoft Visual Studio 11.0\VC\vcvarsall.bat" x86
+:initialize2k8on64Dev12
+call "%ProgramFiles%\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86
 goto build
 
-:initialize2k8on64Dev11
+:initialize2k8Dev11
 call "%ProgramFiles(x86)%\Microsoft Visual Studio 11.0\VC\vcvarsall.bat" x86
 goto build
 
+:initialize2k8on64Dev11
+call "%ProgramFiles%\Microsoft Visual Studio 11.0\VC\vcvarsall.bat" x86
+goto build
+
 :build
-msbuild /t:Build AzurePackage.proj
+if "%~1"=="" msbuild /t:Build AzurePackage.proj
+msbuild /t:%~1 AzurePackage.proj
+
 pause
 goto end
 
diff --git a/build.cmd b/build.cmd
index eeddd1991..97f51bea8 100644
--- a/build.cmd
+++ b/build.cmd
@@ -1,3 +1,2 @@
-if "%~1"=="" build Build
-msbuild /t:%~1 Orchard.proj
-
+if "%~1"=="" call clicktobuild 
+call clicktobuild %~1 
\ No newline at end of file