diff --git a/git-pull-all.bat b/git-pull-all.bat
index 77941f8..a67f9b4 100644
--- a/git-pull-all.bat
+++ b/git-pull-all.bat
@@ -1,6 +1,19 @@
 @echo off 
 
-@ IF "%1" == "" (if exist D:\faronear (set BASEDIR=D:\faronear) else (set BASEDIR=..\..)) else (set BASEDIR=%1)
+@ if not "%1" == "" (
+  set BASEDIR=%1
+) else (if exist D:\faronear (
+  set BASEDIR=D:\faronear
+) else (if exist C:\faronear (
+  set BASEDIR=C:\faronear
+) else (if exist %HOMEDRIVE%%HOMEPATH%\faronear (
+  set BASEDIR=%HOMEDRIVE%%HOMEPATH%\faronear
+) else (
+  set BASEDIR=..\..
+))))
+
+echo basedir = %BASEDIR%
+@GOTO END
 
 if not exist %BASEDIR% (
   echo *** [%BASEDIR%] not exist! Exit now. ***
diff --git a/npm-boot-all.bat b/npm-boot-all.bat
index ec24426..00e1a48 100644
--- a/npm-boot-all.bat
+++ b/npm-boot-all.bat
@@ -1,6 +1,16 @@
 @echo off
 
-@ IF "%1" == "" (if exist D:\faronear (set BASEDIR=D:\faronear) else (set BASEDIR=..\..)) else (set BASEDIR=%1)
+@ if not "%1" == "" (
+  set BASEDIR=%1
+) else (if exist D:\faronear (
+  set BASEDIR=D:\faronear
+) else (if exist C:\faronear (
+  set BASEDIR=C:\faronear
+) else (if exist %HOMEDRIVE%%HOMEPATH%\faronear (
+  set BASEDIR=%HOMEDRIVE%%HOMEPATH%\faronear
+) else (
+  set BASEDIR=..\..
+))))
 
 if not exist %BASEDIR% (
   echo *** [%BASEDIR%] not exist! Exit now. ***