diff --git a/CLIENT_DATA/setup3264.ins b/CLIENT_DATA/setup3264.ins
index 1fd32dc..c52da01 100644
--- a/CLIENT_DATA/setup3264.ins
+++ b/CLIENT_DATA/setup3264.ins
@@ -108,8 +108,12 @@ endif
 [Dosbatch_install_32]
 pendmove %Systemroot%\notepad.exe %Systemroot%\notepad.exe.orig
 pendmove %Systemroot%\system32\notepad.exe %Systemroot%\system32\notepad.exe.orig
-pendmove %ScriptPath%\X86\i686\wait_for_exit\notepad.exe %Systemroot%\notepad.exe
-pendmove %ScriptPath%\X86\i686\wait_for_exit\notepad.exe %Systemroot%\system32\notepad.exe
+
+vcopy %ScriptPath%\X86\i686\wait_for_exit\notepad.exe %Systemroot%\notepad.exe.pp
+vcopy %ScriptPath%\X86\i686\wait_for_exit\notepad.exe %Systemroot%\system32\notepad.exe.pp
+
+pendmove %Systemroot%\notepad.exe.pp %Systemroot%\notepad.exe
+pendmove %Systemroot%\system32\notepad.exe.pp %Systemroot%\system32\notepad.exe
 
 
 [Files_install_32]
@@ -127,9 +131,15 @@ copy "$IniCfgFile$" "$InstallDir32$"
 pendmove %Systemroot%\notepad.exe %Systemroot%\notepad.exe.orig
 pendmove %Systemroot%\system32\notepad.exe %Systemroot%\system32\notepad.exe.orig
 pendmove %Systemroot%\SysWOW64\notepad.exe %Systemroot%\SysWOW64\notepad.exe.orig
-pendmove %ScriptPath%\X86\x86_64\wait_for_exit\notepad.exe %Systemroot%\notepad.exe
-pendmove %ScriptPath%\X86\x86_64\wait_for_exit\notepad.exe %Systemroot%\system32\notepad.exe
-pendmove %ScriptPath%\X86\x86_64\wait_for_exit\notepad.exe %Systemroot%\SysWOW64\notepad.exe
+
+vcopy %ScriptPath%\X86\x86_64\wait_for_exit\notepad.exe %Systemroot%\notepad.exe.pp
+vcopy %ScriptPath%\X86\x86_64\wait_for_exit\notepad.exe %Systemroot%\system32\notepad.exe.pp
+vcopy %ScriptPath%\X86\x86_64\wait_for_exit\notepad.exe %Systemroot%\SysWOW64\notepad.exe.pp
+
+pendmove %Systemroot%\notepad.exe.pp %Systemroot%\notepad.exe
+pendmove %Systemroot%\system32\notepad.exe.pp %Systemroot%\system32\notepad.exe
+pendmove %%Systemroot%\SysWOW64\notepad.exe.pp %Systemroot%\SysWOW64\notepad.exe
+
 
 [Files_install_64]
 ; copy the ini file to the InstallDir
diff --git a/OPSI/control b/OPSI/control
index 30c7d89..c6bd304 100644
--- a/OPSI/control
+++ b/OPSI/control
@@ -33,3 +33,9 @@ requiredProduct: kliu.pendmove
 requiredStatus: installed
 requirementType: before
 
+[ProductDependency]
+action: setup
+requiredProduct: kliu.vcopy
+requiredStatus: installed
+requirementType: before
+