diff --git a/cogs/servertatus.py b/cogs/servertatus.py
index 078f307..09edb27 100644
--- a/cogs/servertatus.py
+++ b/cogs/servertatus.py
@@ -9,17 +9,24 @@ class ServerStatus(commands.Cog):
 
     @commands.command(name="Ping", aliases=["Status"])
     async def ping(self, ctx):
-        #25568 -> Earth
-        #25567 -> Moon
-        server = MinecraftServer.lookup("81.82.224.207:25568")
-        try:
-            latency = server.ping()
-            embedVar = discord.Embed(title="", description="", color=0x00ff00)
-            embedVar.add_field(name="Server1", value="🟢 The Minecraft Server replied in {0} ms".format(latency), inline=False)
-            await ctx.send(embed=embedVar)
-        except ConnectionRefusedError:
-            await ctx.send("🔴 The Minecraft Server is offline")
+        servers = {"Earth": "25568", "Moon": "25567"}
+        ip = "81.82.224.207:"
 
+        embed = discord.Embed(colour=0x00ff00)
+        embed.set_author(name="Status")
+
+        # Add field for all the servers (for-loop so nothing has to be changed for future servers)
+        for server in servers:
+            minecraftServer = MinecraftServer.lookup(ip + servers[server])
+            try:
+                latency = f":green_circle: Server replied in {minecraftServer.ping()}ms."
+            except ConnectionRefusedError:
+                latency = ":red_circle: Server is offline."
+            embed.add_field(name=server, value=latency, inline=False)
+
+        # Bot's latency
+        embed.add_field(name="WorldCraft Bot", value=f":green_circle: {round(self.client.latency * 1000)}ms")
+        await ctx.send(embed=embed)
 
 
 def setup(client):