diff --git a/SetupComplete.cmd b/SetupComplete.cmd
new file mode 100644
index 0000000..98449d0
--- /dev/null
+++ b/SetupComplete.cmd
@@ -0,0 +1,5 @@
+rem Disable Windows Hi Animation ...
+
+reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" /v EnableFirstLogonAnimation /t REG_DWORD /d 0 /f
+reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System" /v EnableFirstLogonAnimation /t REG_DWORD /d 0 /f
+
diff --git a/autounattend.xml b/autounattend.xml
index a2992c0..4bd2c62 100644
--- a/autounattend.xml
+++ b/autounattend.xml
@@ -146,30 +146,37 @@
                     <Description>Control Panel View</Description>
                     <Order>1</Order>
                     <CommandLine>reg add "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\ControlPanel" /v StartupPage /t REG_DWORD /d 1 /f</CommandLine>
-                    <RequiresUserInput>true</RequiresUserInput>
                 </SynchronousCommand>
                 <SynchronousCommand wcm:action="add">
                     <Order>2</Order>
                     <Description>Control Panel Icon Size</Description>
-                    <RequiresUserInput>false</RequiresUserInput>
                     <CommandLine>reg add "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\ControlPanel" /v AllItemsIconView /t REG_DWORD /d 0 /f</CommandLine>
                 </SynchronousCommand>
                 <SynchronousCommand wcm:action="add">
                     <Order>3</Order>
-                    <RequiresUserInput>false</RequiresUserInput>
                     <CommandLine>cmd /C wmic useraccount where name=&quot;support&quot; set PasswordExpires=false</CommandLine>
                     <Description>Password Never Expires</Description>
                 </SynchronousCommand>
                 <SynchronousCommand wcm:action="add">
-                    <Order>5</Order>
-                    <CommandLine>D:\1st_logon.cmd</CommandLine>
-                    <RequiresUserInput>true</RequiresUserInput>
+                    <Order>7</Order>
+                    <CommandLine>cmd /C D:\1st-logon.cmd</CommandLine>
+                    <Description>Initial Setup</Description>
                 </SynchronousCommand>
                 <SynchronousCommand wcm:action="add">
                     <Order>4</Order>
                     <Description>Turn Firewall OFF</Description>
                     <CommandLine>cmd /C netsh advfirewall set allprofiles state off</CommandLine>
                 </SynchronousCommand>
+                <SynchronousCommand wcm:action="add">
+                    <CommandLine>reg add &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon&quot; /v EnableFirstLogonAnimation /t REG_DWORD /d 0 /f</CommandLine>
+                    <Order>5</Order>
+                    <Description>Disable Windows Hi Animation (Part1)</Description>
+                </SynchronousCommand>
+                <SynchronousCommand wcm:action="add">
+                    <Order>6</Order>
+                    <Description>Disable Windows Hi Animation (Part2)</Description>
+                    <CommandLine>reg add &quot;HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System&quot; /v EnableFirstLogonAnimation /t REG_DWORD /d 0 /f</CommandLine>
+                </SynchronousCommand>
             </FirstLogonCommands>
         </component>
     </settings>