diff --git a/Novetus/NovetusCMD/NovetusCMD.cs b/Novetus/NovetusCMD/NovetusCMD.cs
index bf1a566..c69a6e7 100644
--- a/Novetus/NovetusCMD/NovetusCMD.cs
+++ b/Novetus/NovetusCMD/NovetusCMD.cs
@@ -317,15 +317,7 @@ namespace NovetusCMD
 
         static void ServerExited(object sender, EventArgs e)
 		{
-            string pingURL = "http://" + GlobalVars.UserConfiguration.ServerBrowserServerAddress +
-                "/query.php?name=" + GlobalVars.UserConfiguration.ServerBrowserServerName +
-                "&ip=" + (!string.IsNullOrWhiteSpace(GlobalVars.UserConfiguration.AlternateServerIP) ? GlobalVars.UserConfiguration.AlternateServerIP : GlobalVars.ExternalIP) +
-                "&port=" + GlobalVars.UserConfiguration.RobloxPort +
-                "&client=" + GlobalVars.UserConfiguration.SelectedClient + "&online=0";
-
-            GlobalFuncs.ConsolePrint("Server closed. Pinging master server.", 4);
-            string response = GlobalFuncs.HttpGet(pingURL);
-            GlobalFuncs.ConsolePrint(!response.Contains("ERROR:") ? "Pinging done. Response from the server was: " + response : response, response.Contains("ERROR:") ? 2 : 4);
+            GlobalFuncs.PingMasterServer(0);
             Environment.Exit(0);
 		}
         #endregion
diff --git a/Novetus/NovetusCore/StorageAndFunctions/GlobalFuncs.cs b/Novetus/NovetusCore/StorageAndFunctions/GlobalFuncs.cs
index da9f46e..07597b2 100644
--- a/Novetus/NovetusCore/StorageAndFunctions/GlobalFuncs.cs
+++ b/Novetus/NovetusCore/StorageAndFunctions/GlobalFuncs.cs
@@ -1915,6 +1915,18 @@ public class GlobalFuncs
             {
                 OpenClient(type, rbxexe, args, ClientName, mapname, e);
             }
+
+            if (type.Equals(ScriptType.Server))
+            {
+#if LAUNCHER
+                if (box != null)
+                {
+                    PingMasterServer(1, box);
+                }
+#elif CMD
+                PingMasterServer(1);
+#endif
+            }
         }
 #if URI || LAUNCHER || CMD
         catch (Exception ex)
@@ -1945,6 +1957,33 @@ public class GlobalFuncs
         }
     }
 
+#if LAUNCHER
+    public static void PingMasterServer(int online, RichTextBox box)
+#else
+    public static void PingMasterServer(int online)
+#endif
+    {
+        string pingURL = "http://" + GlobalVars.UserConfiguration.ServerBrowserServerAddress +
+            "/query.php?name=" + GlobalVars.UserConfiguration.ServerBrowserServerName +
+            "&ip=" + (!string.IsNullOrWhiteSpace(GlobalVars.UserConfiguration.AlternateServerIP) ? GlobalVars.UserConfiguration.AlternateServerIP : GlobalVars.ExternalIP) +
+            "&port=" + GlobalVars.UserConfiguration.RobloxPort +
+            "&client=" + GlobalVars.UserConfiguration.SelectedClient +
+            "&version=" + GlobalVars.ProgramInformation.Version + 
+            "&online=" + online;
+
+#if LAUNCHER
+        ConsolePrint("Pinging master server.", 4, box);
+#elif CMD
+        ConsolePrint("Pinging master server.", 4);
+#endif
+        string response = HttpGet(pingURL);
+#if LAUNCHER
+        ConsolePrint(!response.Contains("ERROR:") ? "Pinging done. Response from the server was: " + response : response, response.Contains("ERROR:") ? 2 : 4, box);
+#elif CMD
+        ConsolePrint(!response.Contains("ERROR:") ? "Pinging done. Response from the server was: " + response : response, response.Contains("ERROR:") ? 2 : 4);
+#endif
+    }
+
     private static void OpenClient(ScriptType type, string rbxexe, string args, string clientname, string mapname, EventHandler e)
     {
         Process client = new Process();
diff --git a/Novetus/NovetusCore/StorageAndFunctions/ScriptFuncs.cs b/Novetus/NovetusCore/StorageAndFunctions/ScriptFuncs.cs
index 5233973..919559c 100644
--- a/Novetus/NovetusCore/StorageAndFunctions/ScriptFuncs.cs
+++ b/Novetus/NovetusCore/StorageAndFunctions/ScriptFuncs.cs
@@ -73,12 +73,7 @@ public class ScriptFuncs
 						+ GlobalVars.UserConfiguration.RobloxPort + ","
 						+ GlobalVars.UserConfiguration.PlayerLimit + ","
 						+ md5s + ","
-						+ GlobalVars.UserConfiguration.ShowServerNotifications.ToString().ToLower() + ",'"
-						+ GlobalVars.UserConfiguration.ServerBrowserServerName + "','"
-						+ GlobalVars.UserConfiguration.ServerBrowserServerAddress + "','"
-						+ (!string.IsNullOrWhiteSpace(GlobalVars.UserConfiguration.AlternateServerIP) ? GlobalVars.UserConfiguration.AlternateServerIP : GlobalVars.ExternalIP) + "','"
-						+ GlobalVars.UserConfiguration.SelectedClient + "','"
-						+ GlobalVars.ProgramInformation.Version + "');";
+						+ GlobalVars.UserConfiguration.ShowServerNotifications.ToString().ToLower() + "');";
 				case ScriptType.Solo:
 				case ScriptType.EasterEgg:
 					return "_G.CSSolo("
diff --git a/Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs b/Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs
index ef4eb8d..9b64adc 100644
--- a/Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs
+++ b/Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs
@@ -530,16 +530,7 @@ namespace NovetusLauncher
 
         void ServerExited(object sender, EventArgs e)
         {
-            string pingURL = "http://" + GlobalVars.UserConfiguration.ServerBrowserServerAddress +
-                "/query.php?name=" + GlobalVars.UserConfiguration.ServerBrowserServerName +
-                "&ip=" + (!string.IsNullOrWhiteSpace(GlobalVars.UserConfiguration.AlternateServerIP) ? GlobalVars.UserConfiguration.AlternateServerIP : GlobalVars.ExternalIP) +
-                "&port=" + GlobalVars.UserConfiguration.RobloxPort +
-                "&client=" + GlobalVars.UserConfiguration.SelectedClient + "&online=0";
-
-            GlobalFuncs.ConsolePrint("Server closed. Pinging master server.", 4, ConsoleBox);
-            string response = GlobalFuncs.HttpGet(pingURL);
-            GlobalFuncs.ConsolePrint(!response.Contains("ERROR:") ? "Pinging done. Response from the server was: " + response : response, response.Contains("ERROR:") ? 2 : 4, ConsoleBox);
-
+            GlobalFuncs.PingMasterServer(0, ConsoleBox);
             ClientExitedBase(sender, e);
         }
 
diff --git a/query.php b/query.php
index e68bfdc..6d9215d 100644
--- a/query.php
+++ b/query.php
@@ -26,8 +26,10 @@ $name = $_GET["name"];
 $port = $_GET["port"];
 //client
 $client = $_GET["client"];
+//version
+$version = $_GET["version"];
 
-if (!empty($port) and $port < 65535 and is_numeric($port) and !empty($name) and !empty($client))
+if (!empty($port) and $port < 65535 and is_numeric($port) and !empty($name) and !empty($client) and !empty($version))
 {
 	//server ip
 	$ip = $_GET["ip"];
@@ -41,7 +43,7 @@ if (!empty($port) and $port < 65535 and is_numeric($port) and !empty($name) and
 	$file = 'serverlist.txt';
 
 	//ONLY the $name and $client arguments will show up in the master server!
-	$text = base64_encode(base64_encode($name).'|'.base64_encode($ip).'|'.base64_encode($port).'|'.base64_encode($client))."\r\n";
+	$text = base64_encode(base64_encode($name).'|'.base64_encode($ip).'|'.base64_encode($port).'|'.base64_encode($client).'|'.base64_encode($version))."\r\n";
 
 	if ($online == 1)
 	{
@@ -76,6 +78,6 @@ if (!empty($port) and $port < 65535 and is_numeric($port) and !empty($name) and
 	}
 
 	// Display the server info to browsers.
-	echo "" . htmlspecialchars($name) . ". A " . htmlspecialchars($client) . " server. Server Status: " . htmlspecialchars($status) . "";
+	echo "" . htmlspecialchars($name) . ". A " . htmlspecialchars($client) . " server running on ". htmlspecialchars($version) .". Server Status: " . htmlspecialchars($status) . "";
 }
 ?>
\ No newline at end of file
diff --git a/scripts/game/2006S-Shaders/CSMPFunctions.lua b/scripts/game/2006S-Shaders/CSMPFunctions.lua
index d2e8b4f..ac4e4bc 100644
--- a/scripts/game/2006S-Shaders/CSMPFunctions.lua
+++ b/scripts/game/2006S-Shaders/CSMPFunctions.lua
@@ -213,14 +213,9 @@ function LoadTripcode(Player)
 	end
 end
 
-function PingMasterServer(online, ServerBrowserAddress, ServerBrowserName, ServerIP, Port, Client)
-	local pingURL = "http://" .. ServerBrowserAddress .. "/query.php?name=" .. ServerBrowserName .. "&ip=" .. ServerIP .. "&port=" .. Port .. "&client=" .. Client
-	game:httpGet(pingURL .. "&online=" .. online)
-end
-
 print("ROBLOX Client version '0.3.368.0' loaded.")
 
-function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Notifications,ServerBrowserName,ServerBrowserAddress,ServerIP,Client)
+function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Notifications)
 	Server = game:service("NetworkServer")
 	RunService = game:service("RunService")
 	PlayerService = game:service("Players")
@@ -302,9 +297,8 @@ function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Noti
 		end
 	end)
 	InitalizeSecurityValues(game.Lighting,ClientEXEMD5,LauncherMD5,ClientScriptMD5)
-	PingMasterServer(1, ServerBrowserAddress, ServerBrowserName, ServerIP, Port, Client)
 	Server.IncommingConnection:connect(IncommingConnection)
-	pcall(function() game.Close:connect(function() PingMasterServer(0, ServerBrowserAddress, ServerBrowserName, ServerIP, Port, Client) Server:stop() end) end)
+	pcall(function() game.Close:connect(function() Server:stop() end) end)
 end
 
 function CSConnect(UserID,ServerIP,ServerPort,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID,LeftArmColorID,RightArmColorID,LeftLegColorID,RightLegColorID,TShirtID,ShirtID,PantsID,FaceID,HeadID,IconType,ItemID,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Tripcode,Ticket)
diff --git a/scripts/game/2006S/CSMPFunctions.lua b/scripts/game/2006S/CSMPFunctions.lua
index 7300df1..4ced27c 100644
--- a/scripts/game/2006S/CSMPFunctions.lua
+++ b/scripts/game/2006S/CSMPFunctions.lua
@@ -213,14 +213,9 @@ function LoadTripcode(Player)
 	end
 end
 
-function PingMasterServer(online, ServerBrowserAddress, ServerBrowserName, ServerIP, Port, Client)
-	local pingURL = "http://" .. ServerBrowserAddress .. "/query.php?name=" .. ServerBrowserName .. "&ip=" .. ServerIP .. "&port=" .. Port .. "&client=" .. Client
-	game:httpGet(pingURL .. "&online=" .. online)
-end
-
 print("ROBLOX Client version '0.3.368.0' loaded.")
 
-function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Notifications,ServerBrowserName,ServerBrowserAddress,ServerIP,Client)
+function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Notifications)
 	Server = game:service("NetworkServer")
 	RunService = game:service("RunService")
 	PlayerService = game:service("Players")
@@ -302,9 +297,8 @@ function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Noti
 		end
 	end)
 	InitalizeSecurityValues(game.Lighting,ClientEXEMD5,LauncherMD5,ClientScriptMD5)
-	PingMasterServer(1, ServerBrowserAddress, ServerBrowserName, ServerIP, Port, Client)
 	Server.IncommingConnection:connect(IncommingConnection)
-	pcall(function() game.Close:connect(function() PingMasterServer(0, ServerBrowserAddress, ServerBrowserName, ServerIP, Port, Client) Server:stop() end) end)
+	pcall(function() game.Close:connect(function() Server:stop() end) end)
 end
 
 function CSConnect(UserID,ServerIP,ServerPort,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID,LeftArmColorID,RightArmColorID,LeftLegColorID,RightLegColorID,TShirtID,ShirtID,PantsID,FaceID,HeadID,IconType,ItemID,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Tripcode,Ticket)
diff --git a/scripts/game/2007E-Shaders/CSMPFunctions.lua b/scripts/game/2007E-Shaders/CSMPFunctions.lua
index 281411e..5be5424 100644
--- a/scripts/game/2007E-Shaders/CSMPFunctions.lua
+++ b/scripts/game/2007E-Shaders/CSMPFunctions.lua
@@ -237,14 +237,9 @@ function LoadTripcode(Player)
 	end
 end
 
-function PingMasterServer(online, ServerBrowserAddress, ServerBrowserName, ServerIP, Port, Client)
-	local pingURL = "http://" .. ServerBrowserAddress .. "/query.php?name=" .. ServerBrowserName .. "&ip=" .. ServerIP .. "&port=" .. Port .. "&client=" .. Client
-	game:httpGet(pingURL .. "&online=" .. online)
-end
-
 print("ROBLOX Client version '0.3.368.0' loaded.")
 
-function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Notifications,ServerBrowserName,ServerBrowserAddress,ServerIP,Client)
+function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Notifications)
 	Server = game:service("NetworkServer")
 	RunService = game:service("RunService")
 	PlayerService = game:service("Players")
@@ -326,9 +321,8 @@ function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Noti
 		end
 	end)
 	InitalizeSecurityValues(game.Lighting,ClientEXEMD5,LauncherMD5,ClientScriptMD5)
-	PingMasterServer(1, ServerBrowserAddress, ServerBrowserName, ServerIP, Port, Client)
 	Server.IncommingConnection:connect(IncommingConnection)
-	pcall(function() game.Close:connect(function() PingMasterServer(0, ServerBrowserAddress, ServerBrowserName, ServerIP, Port, Client) Server:stop() end) end)
+	pcall(function() game.Close:connect(function() Server:stop() end) end)
 end
 
 function CSConnect(UserID,ServerIP,ServerPort,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID,LeftArmColorID,RightArmColorID,LeftLegColorID,RightLegColorID,TShirtID,ShirtID,PantsID,FaceID,HeadID,IconType,ItemID,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Tripcode,Ticket)
diff --git a/scripts/game/2007E/CSMPFunctions.lua b/scripts/game/2007E/CSMPFunctions.lua
index 281411e..5be5424 100644
--- a/scripts/game/2007E/CSMPFunctions.lua
+++ b/scripts/game/2007E/CSMPFunctions.lua
@@ -237,14 +237,9 @@ function LoadTripcode(Player)
 	end
 end
 
-function PingMasterServer(online, ServerBrowserAddress, ServerBrowserName, ServerIP, Port, Client)
-	local pingURL = "http://" .. ServerBrowserAddress .. "/query.php?name=" .. ServerBrowserName .. "&ip=" .. ServerIP .. "&port=" .. Port .. "&client=" .. Client
-	game:httpGet(pingURL .. "&online=" .. online)
-end
-
 print("ROBLOX Client version '0.3.368.0' loaded.")
 
-function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Notifications,ServerBrowserName,ServerBrowserAddress,ServerIP,Client)
+function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Notifications)
 	Server = game:service("NetworkServer")
 	RunService = game:service("RunService")
 	PlayerService = game:service("Players")
@@ -326,9 +321,8 @@ function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Noti
 		end
 	end)
 	InitalizeSecurityValues(game.Lighting,ClientEXEMD5,LauncherMD5,ClientScriptMD5)
-	PingMasterServer(1, ServerBrowserAddress, ServerBrowserName, ServerIP, Port, Client)
 	Server.IncommingConnection:connect(IncommingConnection)
-	pcall(function() game.Close:connect(function() PingMasterServer(0, ServerBrowserAddress, ServerBrowserName, ServerIP, Port, Client) Server:stop() end) end)
+	pcall(function() game.Close:connect(function() Server:stop() end) end)
 end
 
 function CSConnect(UserID,ServerIP,ServerPort,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID,LeftArmColorID,RightArmColorID,LeftLegColorID,RightLegColorID,TShirtID,ShirtID,PantsID,FaceID,HeadID,IconType,ItemID,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Tripcode,Ticket)
diff --git a/scripts/game/2007M-Shaders/CSMPFunctions.lua b/scripts/game/2007M-Shaders/CSMPFunctions.lua
index 5808a25..0e82207 100644
--- a/scripts/game/2007M-Shaders/CSMPFunctions.lua
+++ b/scripts/game/2007M-Shaders/CSMPFunctions.lua
@@ -328,14 +328,9 @@ function LoadTripcode(Player)
 	end
 end
 
-function PingMasterServer(online, ServerBrowserAddress, ServerBrowserName, ServerIP, Port, Client)
-	local pingURL = "http://" .. ServerBrowserAddress .. "/query.php?name=" .. ServerBrowserName .. "&ip=" .. ServerIP .. "&port=" .. Port .. "&client=" .. Client
-	game:httpGet(pingURL .. "&online=" .. online)
-end
-
 print("ROBLOX Client version '0.3.512.0' loaded.")
 
-function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Notifications,ServerBrowserName,ServerBrowserAddress,ServerIP,Client)
+function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Notifications)
 	Server = game:GetService("NetworkServer")
 	RunService = game:GetService("RunService")
 	PlayerService = game:GetService("Players")
@@ -417,9 +412,8 @@ function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Noti
 		end
 	end)
 	InitalizeSecurityValues(game.Lighting,ClientEXEMD5,LauncherMD5,ClientScriptMD5)
-	PingMasterServer(1, ServerBrowserAddress, ServerBrowserName, ServerIP, Port, Client)
 	Server.IncommingConnection:connect(IncommingConnection)
-	pcall(function() game.Close:connect(function() PingMasterServer(0, ServerBrowserAddress, ServerBrowserName, ServerIP, Port, Client) Server:stop() end) end)
+	pcall(function() game.Close:connect(function() Server:stop() end) end)
 end
 
 function CSConnect(UserID,ServerIP,ServerPort,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID,LeftArmColorID,RightArmColorID,LeftLegColorID,RightLegColorID,TShirtID,ShirtID,PantsID,FaceID,HeadID,IconType,ItemID,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Tripcode,Ticket)
diff --git a/scripts/game/2007M/CSMPFunctions.lua b/scripts/game/2007M/CSMPFunctions.lua
index f963847..a2ea60a 100644
--- a/scripts/game/2007M/CSMPFunctions.lua
+++ b/scripts/game/2007M/CSMPFunctions.lua
@@ -328,14 +328,9 @@ function LoadTripcode(Player)
 	end
 end
 
-function PingMasterServer(online, ServerBrowserAddress, ServerBrowserName, ServerIP, Port, Client)
-	local pingURL = "http://" .. ServerBrowserAddress .. "/query.php?name=" .. ServerBrowserName .. "&ip=" .. ServerIP .. "&port=" .. Port .. "&client=" .. Client
-	game:httpGet(pingURL .. "&online=" .. online)
-end
-
 print("ROBLOX Client version '0.3.512.0' loaded.")
 
-function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Notifications,ServerBrowserName,ServerBrowserAddress,ServerIP,Client)
+function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Notifications)
 	Server = game:GetService("NetworkServer")
 	RunService = game:GetService("RunService")
 	PlayerService = game:GetService("Players")
@@ -417,9 +412,8 @@ function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Noti
 		end
 	end)
 	InitalizeSecurityValues(game.Lighting,ClientEXEMD5,LauncherMD5,ClientScriptMD5)
-	PingMasterServer(1, ServerBrowserAddress, ServerBrowserName, ServerIP, Port, Client)
 	Server.IncommingConnection:connect(IncommingConnection)
-	pcall(function() game.Close:connect(function() PingMasterServer(0, ServerBrowserAddress, ServerBrowserName, ServerIP, Port, Client) Server:stop() end) end)
+	pcall(function() game.Close:connect(function() Server:stop() end) end)
 end
 
 function CSConnect(UserID,ServerIP,ServerPort,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID,LeftArmColorID,RightArmColorID,LeftLegColorID,RightLegColorID,TShirtID,ShirtID,PantsID,FaceID,HeadID,IconType,ItemID,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Tripcode,Ticket)
diff --git a/scripts/game/2008M/CSMPFunctions.lua b/scripts/game/2008M/CSMPFunctions.lua
index f2787a2..94c8f90 100644
--- a/scripts/game/2008M/CSMPFunctions.lua
+++ b/scripts/game/2008M/CSMPFunctions.lua
@@ -457,15 +457,10 @@ function LoadTripcode(Player)
 	end
 end
 
-function PingMasterServer(online, ServerBrowserAddress, ServerBrowserName, ServerIP, Port, Client)
-	local pingURL = "http://" .. ServerBrowserAddress .. "/query.php?name=" .. ServerBrowserName .. "&ip=" .. ServerIP .. "&port=" .. Port .. "&client=" .. Client
-	game:HttpGet(pingURL .. "&online=" .. online)
-end
-
 rbxversion = version()
 print("ROBLOX Client version '" .. rbxversion .. "' loaded.")
 
-function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Notifications,ServerBrowserName,ServerBrowserAddress,ServerIP,Client)
+function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Notifications)
 	Server = game:GetService("NetworkServer")
 	RunService = game:GetService("RunService")
 	Server:start(Port, 20)
@@ -545,9 +540,8 @@ function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Noti
 		end
 	end)
 	InitalizeSecurityValues(game.Lighting,ClientEXEMD5,LauncherMD5,ClientScriptMD5)
-	PingMasterServer(1, ServerBrowserAddress, ServerBrowserName, ServerIP, Port, Client)
 	Server.IncommingConnection:connect(IncommingConnection)
-	pcall(function() game.Close:connect(function() PingMasterServer(0, ServerBrowserAddress, ServerBrowserName, ServerIP, Port, Client) Server:Stop() end) end)
+	pcall(function() game.Close:connect(function() Server:Stop() end) end)
 end
 
 function CSConnect(UserID,ServerIP,ServerPort,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID,LeftArmColorID,RightArmColorID,LeftLegColorID,RightLegColorID,TShirtID,ShirtID,PantsID,FaceID,HeadID,IconType,ItemID,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Tripcode,Ticket)
diff --git a/scripts/game/2009E-HD/CSMPFunctions.lua b/scripts/game/2009E-HD/CSMPFunctions.lua
index 3dc7e3d..7c980a3 100644
--- a/scripts/game/2009E-HD/CSMPFunctions.lua
+++ b/scripts/game/2009E-HD/CSMPFunctions.lua
@@ -538,15 +538,10 @@ function LoadTripcode(Player)
 	end
 end
 
-function PingMasterServer(online, ServerBrowserAddress, ServerBrowserName, ServerIP, Port, Client)
-	local pingURL = "http://" .. ServerBrowserAddress .. "/query.php?name=" .. ServerBrowserName .. "&ip=" .. ServerIP .. "&port=" .. Port .. "&client=" .. Client
-	game:HttpGet(pingURL .. "&online=" .. online)
-end
-
 rbxversion = version()
 print("ROBLOX Client version '" .. rbxversion .. "' loaded.")
 
-function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Notifications,ServerBrowserName,ServerBrowserAddress,ServerIP,Client)
+function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Notifications)
 	Server = game:GetService("NetworkServer")
 	RunService = game:GetService("RunService")
 	Server:start(Port, 20)
@@ -626,9 +621,8 @@ function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Noti
 		end
 	end)
 	InitalizeSecurityValues(game.Lighting,ClientEXEMD5,LauncherMD5,ClientScriptMD5)
-	PingMasterServer(1, ServerBrowserAddress, ServerBrowserName, ServerIP, Port, Client)
 	Server.IncommingConnection:connect(IncommingConnection)
-	pcall(function() game.Close:connect(function() PingMasterServer(0, ServerBrowserAddress, ServerBrowserName, ServerIP, Port, Client) Server:Stop() end) end)
+	pcall(function() game.Close:connect(function() Server:Stop() end) end)
 end
 
 function CSConnect(UserID,ServerIP,ServerPort,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID,LeftArmColorID,RightArmColorID,LeftLegColorID,RightLegColorID,TShirtID,ShirtID,PantsID,FaceID,HeadID,IconType,ItemID,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Tripcode,Ticket)
diff --git a/scripts/game/2009E/CSMPFunctions.lua b/scripts/game/2009E/CSMPFunctions.lua
index 3dc7e3d..7c980a3 100644
--- a/scripts/game/2009E/CSMPFunctions.lua
+++ b/scripts/game/2009E/CSMPFunctions.lua
@@ -538,15 +538,10 @@ function LoadTripcode(Player)
 	end
 end
 
-function PingMasterServer(online, ServerBrowserAddress, ServerBrowserName, ServerIP, Port, Client)
-	local pingURL = "http://" .. ServerBrowserAddress .. "/query.php?name=" .. ServerBrowserName .. "&ip=" .. ServerIP .. "&port=" .. Port .. "&client=" .. Client
-	game:HttpGet(pingURL .. "&online=" .. online)
-end
-
 rbxversion = version()
 print("ROBLOX Client version '" .. rbxversion .. "' loaded.")
 
-function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Notifications,ServerBrowserName,ServerBrowserAddress,ServerIP,Client)
+function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Notifications)
 	Server = game:GetService("NetworkServer")
 	RunService = game:GetService("RunService")
 	Server:start(Port, 20)
@@ -626,9 +621,8 @@ function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Noti
 		end
 	end)
 	InitalizeSecurityValues(game.Lighting,ClientEXEMD5,LauncherMD5,ClientScriptMD5)
-	PingMasterServer(1, ServerBrowserAddress, ServerBrowserName, ServerIP, Port, Client)
 	Server.IncommingConnection:connect(IncommingConnection)
-	pcall(function() game.Close:connect(function() PingMasterServer(0, ServerBrowserAddress, ServerBrowserName, ServerIP, Port, Client) Server:Stop() end) end)
+	pcall(function() game.Close:connect(function() Server:Stop() end) end)
 end
 
 function CSConnect(UserID,ServerIP,ServerPort,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID,LeftArmColorID,RightArmColorID,LeftLegColorID,RightLegColorID,TShirtID,ShirtID,PantsID,FaceID,HeadID,IconType,ItemID,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Tripcode,Ticket)
diff --git a/scripts/game/2010L/CSMPFunctions.lua b/scripts/game/2010L/CSMPFunctions.lua
index afdb5d8..456f4e2 100644
--- a/scripts/game/2010L/CSMPFunctions.lua
+++ b/scripts/game/2010L/CSMPFunctions.lua
@@ -541,15 +541,10 @@ function LoadTripcode(Player)
 	end
 end
 
-function PingMasterServer(online, ServerBrowserAddress, ServerBrowserName, ServerIP, Port, Client)
-	local pingURL = "http://" .. ServerBrowserAddress .. "/query.php?name=" .. ServerBrowserName .. "&ip=" .. ServerIP .. "&port=" .. Port .. "&client=" .. Client
-	game:HttpGet(pingURL .. "&online=" .. online)
-end
-
 rbxversion = version()
 print("ROBLOX Client version '" .. rbxversion .. "' loaded.")
 
-function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Notifications,ServerBrowserName,ServerBrowserAddress,ServerIP,Client)
+function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Notifications)
 	assert((type(Port)~="number" or tonumber(Port)~=nil or Port==nil),"CSRun Error: Port must be nil or a number.")
 	local NetworkServer=game:GetService("NetworkServer")
 	local RunService = game:GetService("RunService")
@@ -629,9 +624,8 @@ function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Noti
 	RunService:Run()
 	game.Workspace:InsertContent("rbxasset://Fonts//libraries.rbxm")
 	InitalizeSecurityValues(game.Lighting,ClientEXEMD5,LauncherMD5,ClientScriptMD5)
-	PingMasterServer(1, ServerBrowserAddress, ServerBrowserName, ServerIP, Port, Client)
 	NetworkServer.IncommingConnection:connect(IncommingConnection)
-	pcall(function() game.Close:connect(function() PingMasterServer(0, ServerBrowserAddress, ServerBrowserName, ServerIP, Port, Client) NetworkServer:Stop() end) end)
+	pcall(function() game.Close:connect(function() NetworkServer:Stop() end) end)
 end
 
 function CSConnect(UserID,ServerIP,ServerPort,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID,LeftArmColorID,RightArmColorID,LeftLegColorID,RightLegColorID,TShirtID,ShirtID,PantsID,FaceID,HeadID,IconType,ItemID,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Tripcode,Ticket)
diff --git a/scripts/game/2011E/CSMPFunctions.lua b/scripts/game/2011E/CSMPFunctions.lua
index 1ed1ef3..a1acc05 100644
--- a/scripts/game/2011E/CSMPFunctions.lua
+++ b/scripts/game/2011E/CSMPFunctions.lua
@@ -557,15 +557,10 @@ function LoadTripcode(Player)
 	end
 end
 
-function PingMasterServer(online, ServerBrowserAddress, ServerBrowserName, ServerIP, Port, Client)
-	local pingURL = "http://" .. ServerBrowserAddress .. "/query.php?name=" .. ServerBrowserName .. "&ip=" .. ServerIP .. "&port=" .. Port .. "&client=" .. Client
-	game:HttpGet(pingURL .. "&online=" .. online)
-end
-
 rbxversion = version()
 print("ROBLOX Client version '" .. rbxversion .. "' loaded.")
 
-function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Notifications,ServerBrowserName,ServerBrowserAddress,ServerIP,Client)
+function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Notifications)
 	assert((type(Port)~="number" or tonumber(Port)~=nil or Port==nil),"CSRun Error: Port must be nil or a number.")
 	local NetworkServer=game:GetService("NetworkServer")
 	local RunService = game:GetService("RunService")
@@ -644,9 +639,8 @@ function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Noti
 	RunService:Run()
 	game.Workspace:InsertContent("rbxasset://Fonts//libraries.rbxm")
 	InitalizeSecurityValues(game.Lighting,ClientEXEMD5,LauncherMD5,ClientScriptMD5)
-	PingMasterServer(1, ServerBrowserAddress, ServerBrowserName, ServerIP, Port, Client)
 	NetworkServer.IncommingConnection:connect(IncommingConnection)
-	pcall(function() game.Close:connect(function() PingMasterServer(0, ServerBrowserAddress, ServerBrowserName, ServerIP, Port, Client) NetworkServer:Stop() end) end)
+	pcall(function() game.Close:connect(function() NetworkServer:Stop() end) end)
 end
 
 function CSConnect(UserID,ServerIP,ServerPort,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID,LeftArmColorID,RightArmColorID,LeftLegColorID,RightLegColorID,TShirtID,ShirtID,PantsID,FaceID,HeadID,IconType,ItemID,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Tripcode,Ticket)
diff --git a/scripts/game/2011M/CSMPFunctions.lua b/scripts/game/2011M/CSMPFunctions.lua
index d19643f..cd1d333 100644
--- a/scripts/game/2011M/CSMPFunctions.lua
+++ b/scripts/game/2011M/CSMPFunctions.lua
@@ -548,15 +548,10 @@ function LoadTripcode(Player)
 	end
 end
 
-function PingMasterServer(online, ServerBrowserAddress, ServerBrowserName, ServerIP, Port, Client)
-	local pingURL = "http://" .. ServerBrowserAddress .. "/query.php?name=" .. ServerBrowserName .. "&ip=" .. ServerIP .. "&port=" .. Port .. "&client=" .. Client
-	game:HttpGet(pingURL .. "&online=" .. online)
-end
-
 rbxversion = version()
 print("ROBLOX Client version '" .. rbxversion .. "' loaded.")
 
-function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Notifications,ServerBrowserName,ServerBrowserAddress,ServerIP,Client)
+function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Notifications)
 	assert((type(Port)~="number" or tonumber(Port)~=nil or Port==nil),"CSRun Error: Port must be nil or a number.")
 	local NetworkServer=game:GetService("NetworkServer")
 	local RunService = game:GetService("RunService")
@@ -635,9 +630,8 @@ function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Noti
 	RunService:Run()
 	game.Workspace:InsertContent("rbxasset://Fonts//libraries.rbxm")
 	InitalizeSecurityValues(game.Lighting,ClientEXEMD5,LauncherMD5,ClientScriptMD5)
-	PingMasterServer(1, ServerBrowserAddress, ServerBrowserName, ServerIP, Port, Client)
 	NetworkServer.IncommingConnection:connect(IncommingConnection)
-	pcall(function() game.Close:connect(function() PingMasterServer(0, ServerBrowserAddress, ServerBrowserName, ServerIP, Port, Client) NetworkServer:Stop() end) end)
+	pcall(function() game.Close:connect(function() NetworkServer:Stop() end) end)
 end
 
 function CSConnect(UserID,ServerIP,ServerPort,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID,LeftArmColorID,RightArmColorID,LeftLegColorID,RightLegColorID,TShirtID,ShirtID,PantsID,FaceID,HeadID,IconType,ItemID,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Tripcode,Ticket)