diff --git a/Program.cs b/Program.cs
index 31e116a..f7d44a3 100644
--- a/Program.cs
+++ b/Program.cs
@@ -12,33 +12,37 @@ ServerStartInfo.FileName = "AyaNova.exe";
 ServerStartInfo.WorkingDirectory = ServerExeFolderPath;
 ServerStartInfo.UseShellExecute = true;
 var ServerProcess = Process.Start(ServerStartInfo);
-
-
-
-
-Console.WriteLine("#############################################");
-Console.WriteLine("Press CTL-C key to shut down AyaNova Server");
-Console.WriteLine("#############################################");
-bool Quit = false;
-ConsoleKeyInfo cki;
-do
-{
-    cki = Console.ReadKey(false);
-
-    if (cki.Key == ConsoleKey.C && (cki.Modifiers & ConsoleModifiers.Control) != 0)
-    {
-        Quit = true;
-    }
-    else
-    {
-        Console.WriteLine("Press CTL-C key to shut down AyaNova Server");
-    }
-    //Console.WriteLine(cki.Key.ToString());
-} while (!Quit);
-
+Console.WriteLine("Waiting for server to exit");
 if (ServerProcess != null)
-{
-    ServerProcess.CloseMainWindow();
-    ServerProcess.Close();
-}
+    ServerProcess.WaitForExit();
+
+
+
+
+
+// Console.WriteLine("#############################################");
+// Console.WriteLine("Press CTL-C key to shut down AyaNova Server");
+// Console.WriteLine("#############################################");
+// bool Quit = false;
+// ConsoleKeyInfo cki;
+// do
+// {
+//     cki = Console.ReadKey(false);
+
+//     if (cki.Key == ConsoleKey.C && (cki.Modifiers & ConsoleModifiers.Control) != 0)
+//     {
+//         Quit = true;
+//     }
+//     else
+//     {
+//         Console.WriteLine("Press CTL-C key to shut down AyaNova Server");
+//     }
+//     //Console.WriteLine(cki.Key.ToString());
+// } while (!Quit);
+
+// if (ServerProcess != null)
+// {
+//     ServerProcess.CloseMainWindow();
+//     ServerProcess.Close();
+// }