diff --git a/installation_and_upgrade/define_latest_genie_python.bat b/installation_and_upgrade/define_latest_genie_python.bat
index 690989a..ca00a01 100644
--- a/installation_and_upgrade/define_latest_genie_python.bat
+++ b/installation_and_upgrade/define_latest_genie_python.bat
@@ -14,8 +14,13 @@ set "genie_dir=%KITS_ICP_PATH%\genie_python_3"
 if exist "%genie_dir%\LATEST_BUILD.txt" (
 
 	for /f %%i in ( %genie_dir%\LATEST_BUILD.txt ) do (
-	
-		set "LATEST_PYTHON_DIR=%tmp%\Python_Build_%%i" 
+
+		if "%~1" NEQ "" (
+			set "LATEST_PYTHON_DIR=%~1\Python_Build_%%i" 
+		) else (
+			set "LATEST_PYTHON_DIR=%tmp%\Python_Build_%%i"
+		)
+		
 		mkdir !LATEST_PYTHON_DIR!
 	
 		%genie_dir%\BUILD-%%i\genie_python_install.bat !LATEST_PYTHON_DIR!
diff --git a/installation_and_upgrade/remove_genie_python.bat b/installation_and_upgrade/remove_genie_python.bat
index a0b8e4e..0357417 100644
--- a/installation_and_upgrade/remove_genie_python.bat
+++ b/installation_and_upgrade/remove_genie_python.bat
@@ -11,18 +11,18 @@ set modified_path=%path:%substring%=%
 
 if "%path%" neq "%modified_path%" (
 
-    RMDIR /S /Q %path% && @echo Successfully removed %path%.
+    RMDIR /S /Q %path%
 
     set LATEST_PYTHON_DIR=
     set LATEST_PYTHON=
     set LATEST_PYTHON3=
 
-
 ) else (
     @echo Could not find the specified path: %path%.
     goto ERROR
 )
 
+@echo Successfully removed %path% and unset genie build variables.
 exit /b 0
 
 :ERROR