diff --git a/src/network/packets/swg/login/LoginClusterStatus.java b/src/network/packets/swg/login/LoginClusterStatus.java
index a42b98c3..019fc05b 100644
--- a/src/network/packets/swg/login/LoginClusterStatus.java
+++ b/src/network/packets/swg/login/LoginClusterStatus.java
@@ -58,7 +58,7 @@ public class LoginClusterStatus extends SWGPacket {
 			g.setPopulation(getInt(data));
 			getInt(data); // population status
 			g.setMaxCharacters(getInt(data));
-			g.setTimeZone(getInt(data));
+			getInt(data);	// Time zone
 			g.setStatus(getInt(data));
 			g.setRecommended(getBoolean(data));
 			g.setOnlinePlayerLimit(getInt(data));
@@ -83,7 +83,7 @@ public class LoginClusterStatus extends SWGPacket {
 			 addInt(    data, g.getPopulation());
 			 addInt(    data, g.getPopulationStatus());
 			 addInt(    data, g.getMaxCharacters());
-			 addInt(    data, g.getTimeZone());
+			 addInt(    data, g.getDistance());
 			 addInt(    data, g.getStatus().getStatus());
 			 addBoolean(data, g.isRecommended());
 			 addInt(    data, g.getOnlinePlayerLimit());
diff --git a/src/network/packets/swg/login/LoginEnumCluster.java b/src/network/packets/swg/login/LoginEnumCluster.java
index 8415be24..8c60343a 100644
--- a/src/network/packets/swg/login/LoginEnumCluster.java
+++ b/src/network/packets/swg/login/LoginEnumCluster.java
@@ -59,7 +59,7 @@ public class LoginEnumCluster extends SWGPacket {
 			Galaxy g = new Galaxy();
 			g.setId(getInt(data));
 			g.setName(getAscii(data));
-			g.setTimeZone(getInt(data));
+			getInt(data);	// Time zone
 			galaxies.add(g);
 		}
 		maxCharacters = getInt(data);
@@ -76,7 +76,7 @@ public class LoginEnumCluster extends SWGPacket {
 		for (Galaxy g : galaxies) {
 			addInt(  data, g.getId());
 			addAscii(data, g.getName());
-			addInt(  data, g.getTimeZone());
+			addInt(  data, g.getDistance());
 		}
 		addInt(data, maxCharacters);
 		return data;
diff --git a/src/resources/Galaxy.java b/src/resources/Galaxy.java
index 983b3227..ebe8fc11 100644
--- a/src/resources/Galaxy.java
+++ b/src/resources/Galaxy.java
@@ -27,6 +27,7 @@
 ***********************************************************************************/
 package resources;
 
+import java.util.TimeZone;
 
 public class Galaxy {
 	
@@ -45,14 +46,14 @@ public class Galaxy {
 	private int pingPort = 44462;
 	private int population = 0;
 	private GalaxyStatus status = GalaxyStatus.DOWN;
-	private int timeZone = 0;
+	private final TimeZone timeZone;
 	private int maxCharacters = 0;
 	private int onlinePlayerLimit = 0;
 	private int onlineFreeTrialLimit = 0;
 	private boolean recommended = true;
 	
 	public Galaxy() {
-		
+		timeZone = TimeZone.getDefault();
 	}
 	
 	public synchronized int    getId()                   { return id; }
@@ -62,7 +63,7 @@ public class Galaxy {
 	public synchronized int    getPingPort()             { return pingPort; }
 	public synchronized int    getPopulation()           { return population; }
 	public synchronized GalaxyStatus getStatus()         { return status; }
-	public synchronized int    getTimeZone()             { return timeZone; }
+	public synchronized int    getDistance()             { System.out.println(timeZone.getRawOffset() / 1000); return timeZone.getRawOffset() / 1000; }
 	public synchronized int    getMaxCharacters()        { return maxCharacters; }
 	public synchronized int    getOnlinePlayerLimit()    { return onlinePlayerLimit; }
 	public synchronized int    getOnlineFreeTrialLimit() { return onlineFreeTrialLimit; }
@@ -91,7 +92,6 @@ public class Galaxy {
 	public synchronized void setPingPort(int port)            { this.pingPort = port; }
 	public synchronized void setPopulation(int population)    { this.population = population; }
 	public synchronized void setStatus(GalaxyStatus status)   { this.status = status; }
-	public synchronized void setTimeZone(int timeZone)        { this.timeZone = timeZone; }
 	public synchronized void setMaxCharacters(int max)        { this.maxCharacters = max; }
 	public synchronized void setOnlinePlayerLimit(int max)    { this.onlinePlayerLimit = max; }
 	public synchronized void setOnlineFreeTrialLimit(int max) { this.onlineFreeTrialLimit = max; }
diff --git a/src/services/CoreManager.java b/src/services/CoreManager.java
index 514d4374..2a9f0706 100644
--- a/src/services/CoreManager.java
+++ b/src/services/CoreManager.java
@@ -44,6 +44,7 @@ import intents.network.InboundPacketIntent;
 import intents.network.OutboundPacketIntent;
 import intents.server.ServerManagementIntent;
 import intents.server.ServerStatusIntent;
+import java.util.TimeZone;
 import resources.Galaxy;
 import resources.Galaxy.GalaxyStatus;
 import resources.config.ConfigFile;
@@ -250,7 +251,6 @@ public class CoreManager extends Manager {
 		GALAXY.setName(c.getString("GALAXY-NAME", "Holocore"));
 		GALAXY.setAddress("");
 		GALAXY.setPopulation(0);
-		GALAXY.setTimeZone(c.getInt("GALAXY-TIMEZONE", -6));
 		GALAXY.setZonePort(0);
 		GALAXY.setPingPort(0);
 		GALAXY.setStatus(GalaxyStatus.DOWN);