diff --git a/SystemChecks/l_FixWordPad.bat b/SystemChecks/l_FixWordPad.bat
index b49eee6..07ee80f 100644
--- a/SystemChecks/l_FixWordPad.bat
+++ b/SystemChecks/l_FixWordPad.bat
@@ -7,20 +7,15 @@ echo "START: %~n0"
 set path=%PATH%
 
 set Software="Wordpad"
-set SoftwarePath="C:\Program Files\LibreOffice\program\soffice.exe"
+set SoftwarePath="W:\Windows NT"
 
 
 REM Check if Wordpad is available
 if exist %SoftwarePath% (
     echo "%Software% is available"
-    xcopy "W:\WordPad\Windows NT\Accessories" "C:\Program Files\Windows NT\Accessories" /h /e
-    xcopy "W:\WordPad" "S:\Scripts" /h /e
-
-    assoc .rtf=rtffile
-
-    ftype rtffile="C:\Scripts\Wordpad\Windows NT\Accessories\WORDPAD.EXE" "%%1"
-
 
+    mkdir "C:\Scripts\Wordpad"
+    xcopy "W:\" "S:\Scripts\Wordpad" /h /e /y
 
 ) else (
     echo "%Software% is not installed"
diff --git a/local_Onboot.bat b/local_Onboot.bat
index aa8766e..599f72f 100644
--- a/local_Onboot.bat
+++ b/local_Onboot.bat
@@ -6,7 +6,8 @@ echo "%~n0: Start"
 ping -n 7 -i 7 192.8.1.1
 call %TMESSAGE% '"STARTED local %check_computername% "'
 
-    
+call C:\Scripts\wBase\bin\fix_wordpad2.bat
+
 if "%check_computername%" EQU "SERVER" (
     ping -n 7 -i 7 192.8.1.1
     call %TMESSAGEH% '" %check_computername% has STARTED "'