diff --git a/01_DownloadAll.cmd b/01_DownloadAll.cmd
index 38dff96..2cbfccd 100644
--- a/01_DownloadAll.cmd
+++ b/01_DownloadAll.cmd
@@ -39,6 +39,28 @@ echo.
 rem go back ...
 cd ..
 
+rem check for apps directory ...
+if NOT EXIST apps (
+  echo ERROR: directory [ apps ] NOT FOUND!
+  echo ABORT.
+  exit /b
+) else (
+  cd apps
+)
+
+echo ================================================
+echo START download of APPS from SOURCE sites ... 
+echo ================================================
+date /t
+time /t
+echo.
+
+call download-apps-from-source.cmd
+echo.
+
+rem go back ...
+cd ..
+
 echo.
 date /t
 time /t
diff --git a/08_CopyWIM2Stick.cmd b/08_CopyWIM2Stick.cmd
index 3be4a1c..833d106 100644
--- a/08_CopyWIM2Stick.cmd
+++ b/08_CopyWIM2Stick.cmd
@@ -139,7 +139,7 @@ if EXIST software (
     /XF *.iso /XF *.txt /XF *.cmd /XF *.csv /XF .gitignore /XD .git
 )
 
-for %%P in (drivers scripts source optional personal company) do (
+for %%P in (drivers scripts source optional personal company apps) do (
   if EXIST %%P (
     echo.
     echo copying folder [ %%P ] to %USBDRIVE%\tools ...
diff --git a/apps/download-apps-from-source.cmd b/apps/download-apps-from-source.cmd
index 198495f..a5146bd 100644
--- a/apps/download-apps-from-source.cmd
+++ b/apps/download-apps-from-source.cmd
@@ -17,8 +17,13 @@ rem ###################################
 
 FOR /F "tokens=1" %%E in (%LISTFILE%) do (
   echo URL = [ %%E ]
-  powershell -command .\Download-AppxFromStore.ps1 %%E %APPSFOLDER%
+  rem powershell -command .\Download-AppxFromStore.ps1 %%E %APPSFOLDER%
   echo.
 )
 
+echo Cleanup ...
+del /F /Q %APPSFOLDER%\*.BlockMap
+del /F /Q %APPSFOLDER%\*x86*
+del /F /Q %APPSFOLDER%\*arm*
+del /F /Q %APPSFOLDER%\*.eappxbundle