diff --git a/W10MUI/OnDemand/15063-OnDemand.txt b/W10MUI/OnDemand/15063-OnDemand.txt
index c70bd86..9d39bc4 100644
--- a/W10MUI/OnDemand/15063-OnDemand.txt
+++ b/W10MUI/OnDemand/15063-OnDemand.txt
@@ -167,6 +167,7 @@ http://download.windowsupdate.com/c/msdownload/update/software/updt/2017/03/micr
 http://download.windowsupdate.com/c/msdownload/update/software/updt/2017/03/microsoft-windows-languagefeatures-texttospeech-th-th-package_5e7f2e6874af6d19a151c75d39f25b7e9991bc2d.cab
 tr-tr / Turkish
 http://download.windowsupdate.com/d/msdownload/update/software/updt/2017/03/microsoft-windows-languagefeatures-basic-tr-tr-package_fff5e7df0d6711dd478c3e17dd4ed383129aa64a.cab
+http://download.windowsupdate.com/d/msdownload/update/software/updt/2017/03/microsoft-windows-languagefeatures-handwriting-tr-tr-package_bb02755634806786e463d7fd81799171a80adc75.cab
 http://download.windowsupdate.com/d/msdownload/update/software/updt/2017/03/microsoft-windows-languagefeatures-ocr-tr-tr-package_842a685da9906e9d50dfd424dd820d05aa70a44e.cab
 http://download.windowsupdate.com/d/msdownload/update/software/updt/2017/03/microsoft-windows-languagefeatures-texttospeech-tr-tr-package_b79466b5c46ceed866097ef1c3c80f9ccb7c5c37.cab
 uk-ua / Ukrainian
diff --git a/YAOCTRI/YAOCTRIR_Configurator.cmd b/YAOCTRI/YAOCTRIR_Configurator.cmd
index 65f8990..d6053c0 100644
--- a/YAOCTRI/YAOCTRIR_Configurator.cmd
+++ b/YAOCTRI/YAOCTRIR_Configurator.cmd
@@ -17,13 +17,14 @@ if exist "%SystemRoot%\Sysnative\reg.exe" (
 set "SysPath=%SystemRoot%\Sysnative"
 set "Path=%SystemRoot%\Sysnative;%SystemRoot%;%SystemRoot%\Sysnative\Wbem;%SystemRoot%\Sysnative\WindowsPowerShell\v1.0\;%Path%"
 )
+set "_psc=powershell -nop -c"
 set "_err===== ERROR ===="
 set winbuild=1
 for /f "tokens=6 delims=[]. " %%G in ('ver') do set winbuild=%%G
 if %winbuild% lss 7601 goto :E_Win
 set _cwmi=0
 for %%# in (wmic.exe) do @if not "%%~$PATH:#"=="" (
-wmic path Win32_ComputerSystem get CreationClassName /value 2>nul | find /i "ComputerSystem" 1>nul && set _cwmi=1
+cmd /c "wmic path Win32_ComputerSystem get CreationClassName /value" 2>nul | find /i "ComputerSystem" 1>nul && set _cwmi=1
 )
 set _pwsh=1
 for %%# in (powershell.exe) do @if "%%~$PATH:#"=="" set _pwsh=0
@@ -555,7 +556,8 @@ set _O24Access=ON
 set _O24Excel=ON
 set _O24Outlook=ON
 set _O24PowerPoint=ON
-set _O24SkypeForBusiness=ON
+set _O24SkypeForBusiness=OFF
+if %_D24SB%==1 set _O24SkypeForBusiness=ON
 set _O24Word=ON
 set _O365Pro=ON
 set _O365Bus=OFF
@@ -751,12 +753,10 @@ if %errlvl%==1 (if !_O%xv%Pro!==ON (set _O%xv%Pro=OFF) else (set _O%xv%Pro=ON&se
 goto :Menu00Suite
 
 :Menu00Apps
-set _optSB=1
-if %xv% EQU 24 (
-set _optSB=%_D24SB%
-)
 if %xv% EQU 19 (set oe=16&set pb=%xv%) else (set oe=21&set pb=21)
-if !_O%xv%Access!==OFF if !_O%xv%Excel!==OFF if !_O%oe%OneNote!==OFF if !_O%xv%Outlook!==OFF if !_O%xv%PowerPoint!==OFF if !_O%pb%Publisher!==OFF if !_O%xv%SkypeForBusiness!==OFF if !_O%xv%Word!==OFF if !_O%xv%PrjPro!==OFF if !_O%xv%PrjStd!==OFF if !_O%xv%VisPro!==OFF if !_O%xv%VisStd!==OFF set _O%xv%Word=ON
+if %xv% EQU 24 (set _optSB=%_D24SB%) else (set _optSB=1)
+if %_optSB%==1 (set sf=%xv%) else (set sf=21)
+if !_O%xv%Access!==OFF if !_O%xv%Excel!==OFF if !_O%oe%OneNote!==OFF if !_O%xv%Outlook!==OFF if !_O%xv%PowerPoint!==OFF if !_O%pb%Publisher!==OFF if !_O%sf%SkypeForBusiness!==OFF if !_O%xv%Word!==OFF if !_O%xv%PrjPro!==OFF if !_O%xv%PrjStd!==OFF if !_O%xv%VisPro!==OFF if !_O%xv%VisStd!==OFF set _O%xv%Word=ON
 call :showPV
 cls
 echo %line%
@@ -771,9 +771,7 @@ echo. N. OneNote 20%oe%          : !_O%oe%OneNote!
 echo. O. Outlook 20%xv%          : !_O%xv%Outlook!
 echo. P. PowerPoint 20%xv%       : !_O%xv%PowerPoint!
 echo. R. Publisher 20%pb%        : !_O%pb%Publisher!
-if %_optSB%==1 (
-echo. S. SkypeForBusiness 20%xv% : !_O%xv%SkypeForBusiness!
-) else (echo.)
+echo. S. SkypeForBusiness 20%sf% : !_O%sf%SkypeForBusiness!
 echo. W. Word 20%xv%             : !_O%xv%Word!
 echo.
 echo. D. OneDrive Desktop      : %_OneDrive%
@@ -798,7 +796,7 @@ if %errlvl%==11 if %_supv%==1 (if !_O%xv%PrjStd!==ON (set _O%xv%PrjStd=OFF) else
 if %errlvl%==10 if %_supv%==1 (if !_O%xv%PrjPro!==ON (set _O%xv%PrjPro=OFF) else (set _O%xv%PrjPro=ON&set _O%xv%PrjStd=OFF)&goto :Menu00Apps)
 if %errlvl%==9 (if %_OneDrive%==ON (set _OneDrive=OFF) else (set _OneDrive=ON))&goto :Menu00Apps
 if %errlvl%==8 (if !_O%xv%Word!==ON (set _O%xv%Word=OFF) else (set _O%xv%Word=ON))&goto :Menu00Apps
-if %errlvl%==7 if %_optSB%==1 (if !_O%xv%SkypeForBusiness!==ON (set _O%xv%SkypeForBusiness=OFF) else (set _O%xv%SkypeForBusiness=ON))&goto :Menu00Apps
+if %errlvl%==7 (if !_O%sf%SkypeForBusiness!==ON (set _O%sf%SkypeForBusiness=OFF) else (set _O%sf%SkypeForBusiness=ON))&goto :Menu00Apps
 if %errlvl%==6 (if !_O%pb%Publisher!==ON (set _O%pb%Publisher=OFF) else (set _O%pb%Publisher=ON))&goto :Menu00Apps
 if %errlvl%==5 (if !_O%xv%PowerPoint!==ON (set _O%xv%PowerPoint=OFF) else (set _O%xv%PowerPoint=ON))&goto :Menu00Apps
 if %errlvl%==4 (if !_O%xv%Outlook!==ON (set _O%xv%Outlook=OFF) else (set _O%xv%Outlook=ON))&goto :Menu00Apps
@@ -1049,6 +1047,9 @@ if %winbuild% lss 10240 (set _sku!cc!=PublisherRetail&set /a cc+=1&set _sku!cc!=
 if %_O24SkypeForBusiness%==ON (
 set /a cc+=1
 if %winbuild% lss 10240 (set _sku!cc!=SkypeForBusinessRetail&set /a cc+=1&set _sku!cc!=SkypeForBusiness2024Retail) else (set _sku!cc!=SkypeForBusiness2024Retail)
+) else if %_O21SkypeForBusiness%==ON (
+set /a cc+=1
+if %winbuild% lss 10240 (set _sku!cc!=SkypeForBusinessRetail&set /a cc+=1&set _sku!cc!=SkypeForBusiness2021Retail) else (set _sku!cc!=SkypeForBusiness2021Retail)
 )
 if %_O24Word%==ON (
 set /a cc+=1
@@ -1422,7 +1423,7 @@ goto :MenuFinal
 :MenuFinal2
 cls
 if %_cwmi% equ 1 for /f "tokens=2 delims==." %%# in ('wmic os get localdatetime /value') do set "_date=%%#"
-if %_cwmi% equ 0 for /f "tokens=1 delims=." %%# in ('powershell -nop -c "([WMI]'Win32_OperatingSystem=@').LocalDateTime"') do set "_date=%%#"
+if %_cwmi% equ 0 for /f "tokens=1 delims=." %%# in ('%_psc% "([WMI]'Win32_OperatingSystem=@').LocalDateTime"') do set "_date=%%#"
 copy /y nul "!_work!\#.rw" 1>nul 2>nul && (if exist "!_work!\#.rw" del /f /q "!_work!\#.rw") || (set "_ini=!_dsk!")
 
 (
@@ -1507,7 +1508,7 @@ set "cfile=!_file:\=\\!"
 if exist "!_file!" if %_cwmi% equ 1 for /f "tokens=4 delims==." %%i in ('wmic datafile where "name='!cfile!'" get Version /value ^| find "="') do (
   if %%i geq %verchk% (set CTRexe=0)
 )
-if exist "!_file!" if %_cwmi% equ 0 for /f "tokens=3 delims==." %%i in ('powershell -nop -c "([WMI]'CIM_DataFile.Name=''!cfile!''').Version"') do (
+if exist "!_file!" if %_cwmi% equ 0 for /f "tokens=3 delims==." %%i in ('%_psc% "([WMI]'CIM_DataFile.Name=''!cfile!''').Version"') do (
   if %%i geq %verchk% (set CTRexe=0)
 )
 call :StopService 1>nul 2>nul
diff --git a/uup-converter-wimlib/convert-UUP.cmd b/uup-converter-wimlib/convert-UUP.cmd
index 8b25311..8469b5b 100644
--- a/uup-converter-wimlib/convert-UUP.cmd
+++ b/uup-converter-wimlib/convert-UUP.cmd
@@ -1,6 +1,6 @@
 <!-- : Begin batch script
 @setlocal DisableDelayedExpansion
-@set uivr=v109
+@set uivr=v109u
 @echo off
 :: Change to 1 to enable debug mode
 set _Debug=0
@@ -555,7 +555,10 @@ if /i %arch%==arm64 if %winbuild% lss 9600 if %AddUpdates% equ 1 (
 if %_build% geq 17763 (set AddUpdates=2) else (set AddUpdates=0)
 )
 if %Cleanup% equ 0 set ResetBase=0
-if %AIO% neq 1 if %_count% leq 1 if /i "%editionid%"=="PPIPro" (set StartVirtual=0)
+if %AIO% neq 1 if %_count% leq 1 (
+if /i "%editionid%"=="PPIPro" set StartVirtual=0
+if /i "%editionid%"=="WNC" set StartVirtual=0
+)
 if %_build% lss 17063 (set StartVirtual=0)
 if %_build% lss 17763 if %AddUpdates% equ 2 (set AddUpdates=1)
 if %_build% lss 17763 if %AddUpdates% equ 1 if %W10UI% equ 0 (set AddUpdates=0)
@@ -939,7 +942,9 @@ if !_ESDSrv%%#! equ 1 (
 )
 if %_updexist% equ 1 if %_build% geq 22000 if exist "%SysPath%\ucrtbase.dll" if not exist "bin\dpx.dll" if not exist "temp\dpx.dll" call :uups_dll dpx
 if %_reMSU% equ 1 if %_build% geq 25336 call :uups_msu
-if %_reMSU% equ 1 if %_build% lss 25336 if %SkipLCUmsu% equ 0 call :uups_msu
+if %_reMSU% equ 1 if %_build% lss 25336 (
+if exist "!_UUP!\*Windows1*-KB*.wim" (call :uups_msu) else (if %SkipLCUmsu% equ 0 call :uups_msu)
+)
 if exist "!_cabdir!\" rmdir /s /q "!_cabdir!\"
 del /f /q %_dLog%\* %_Nul3%
 if not exist "%_dLog%\" mkdir "%_dLog%" %_Nul3%
@@ -1137,7 +1142,7 @@ for %%# in (ru-ru,zh-cn,zh-tw,zh-hk) do if /i !langid%%A!==%%# set "_os%%A=!_oNa
 >nul chcp %oemcp%
 del /f /q bin\info*.txt
 if %_build% geq 21382 if exist "!_UUP!\*.AggregatedMetadata*.cab" if exist "!_UUP!\*Windows1*-KB*.cab" if exist "!_UUP!\*Windows1*-KB*.psf" set _reMSU=1
-if %_build% geq 25336 if exist "!_UUP!\*.AggregatedMetadata*.cab" if exist "!_UUP!\*Windows1*-KB*.wim" if exist "!_UUP!\*Windows1*-KB*.psf" set _reMSU=1
+if %_build% geq 22621 if exist "!_UUP!\*.AggregatedMetadata*.cab" if exist "!_UUP!\*Windows1*-KB*.wim" if exist "!_UUP!\*Windows1*-KB*.psf" set _reMSU=1
 if %_build% geq 22563 (
 if exist "!_UUP!\*.appx*" set _OPA=1
 if exist "!_UUP!\*.msix*" set _OPA=1
@@ -1482,6 +1487,7 @@ if %uLang% equ 1 for %%# in (
 "ServerRdsh:%_wtx% Enterprise multi-session"
 "Starter:%_wtx% Starter"
 "StarterN:%_wtx% Starter N"
+"WNC:%_wtx% Cloud PC"
 "ServerStandardCore:%_wsr% Standard"
 "ServerStandard:%_wsr% Standard (Desktop Experience)"
 "ServerDatacenterCore:%_wsr% Datacenter"
@@ -1694,12 +1700,15 @@ copy /y "_tMSU\%_MSUonf%" "_tWIM\%_MSUonf%" %_Nul3%
 if %optSSU% equ 1 copy /y "%_MSUssu%" "_tWIM\%_MSUtsu%" %_Nul3%
 copy /y "%_MSUcab%" "_tWIM\%_MSUkbf%.wim" %_Nul3%
 copy /y "%_MSUpsf%" "_tWIM\%_MSUkbf%.psf" %_Nul3%
-%_Nul3% wimlib-imagex.exe capture _tWIM\ %_MSUkbf%.msu content --compress=none --nocheck --no-acls
+popd
+%_Nul3% wimlib-imagex.exe capture "!_UUP!\_tWIM" "!_UUP!\%_MSUkbf%.msu" content --compress=none --nocheck --no-acls
 if %ERRORLEVEL% neq 0 (
 call :dk_color1 %Red% "capture %_MSUkbf%.msu failed, skip operation." 4
 (echo.&echo capture %_MSUkbf%.msu failed)>>"!logerr!"
+pushd "!_UUP!"
 goto :eof
 )
+pushd "!_UUP!"
 rem. call :undpx
 goto :eof
 
@@ -3017,8 +3026,7 @@ if not exist "!dest!\*enablement-package*.mum" set "edge=!edge! /PackagePath:!de
 goto :eof
 )
 if exist "!dest!\update.mum" findstr /i /m "Package_for_SafeOSDU" "!dest!\update.mum" %_Nul3% && (
-if %_build% geq 26052 if not exist "%mumtarget%\Windows\Servicing\Packages\WinPE-Rejuv-Package~*.mum" goto :eof
-if %_build% lss 26052 if not exist "%mumtarget%\Windows\Servicing\Packages\WinPE-Rejuv-Package~*.mum" if not exist "%mumtarget%\Windows\Servicing\Packages\WinPE-SRT-Package~*.mum" if not exist "%mumtarget%\Windows\Servicing\Packages\WinPE-Setup-Package~*.mum" goto :eof
+if not exist "%mumtarget%\Windows\Servicing\Packages\WinPE-Rejuv-Package~*.mum" goto :eof
 set "safeos=!safeos! /PackagePath:!dest!\update.mum"
 goto :eof
 )
@@ -3969,7 +3977,7 @@ for /f "delims=" %%# in ('dir /b /a:-d "_tmpMD\*TargetCompDB_App_Moment_*.xml" %
 )
 >>AppsList.xml echo ^</CoreN^>
 >>AppsList.xml echo ^<Team^>
-for %%# in (PPIPro) do if exist _tmpMD\*CompDB_%%#_*.xml (
+for %%# in (PPIPro,WNC) do if exist _tmpMD\*CompDB_%%#_*.xml (
 >>AppsList.xml (find /i "PreinstalledApps" _tmpMD\*CompDB_%%#_*.xml | find /v "-")
 )
 >>AppsList.xml echo ^</Team^>
@@ -4066,6 +4074,7 @@ for %%# in (CoreN,ProfessionalN,ProfessionalEducationN,ProfessionalWorkstationN,
 if /i "%_edtn%"=="%%#" set "_appList=%_appProN%"
 )
 if /i "%_edtn%"=="PPIPro" set "_appList=%_appTeam%"
+if /i "%_edtn%"=="WNC" set "_appList=%_appTeam%"
 for %%# in (AzureStackHCICor) do (
 if /i "%_edtn%"=="%%#" set "_appList=%_appAzure%"
 )
@@ -4179,7 +4188,7 @@ if exist temp\ rmdir /s /q temp\
 if exist bin\expand.exe if not exist bin\dpx.dll del /f /q bin\expand.exe
 popd
 call :dk_color2 %Green% "Finished." %_Yellow% " You chose to start create_virtual_editions.cmd independently." 7 8
-Press 0 or q to exit.
+echo Press 0 or q to exit.
 choice /c 0Q /n
 if errorlevel 1 (exit /b) else (rem.)
 exit /b