diff --git a/src/resources/objects/creature/CreatureObject.java b/src/resources/objects/creature/CreatureObject.java
index 6173600b..7fbac962 100644
--- a/src/resources/objects/creature/CreatureObject.java
+++ b/src/resources/objects/creature/CreatureObject.java
@@ -66,7 +66,7 @@ import resources.objects.player.PlayerObject;
 import resources.objects.tangible.TangibleObject;
 import services.command.BaseSWGCommand;
 
-@Entity(version=6)
+@Entity(version=7)
 public class CreatureObject extends TangibleObject implements IPersistent {
 	
 	@NotPersistent
@@ -81,7 +81,6 @@ public class CreatureObject extends TangibleObject implements IPersistent {
 
 	// CREO 3
 	private byte posture = 0;
-	private int factionStatus = 0;
 	private float height;
 	private int battleFatigue = 0;
 	private long stateBitmask = 0;
@@ -469,13 +468,8 @@ public class CreatureObject extends TangibleObject implements IPersistent {
 		notifyObservers(messageBuilder.buildFactionDelta(faction), true);
 		//updatePvpStatus();
 	}
-
-	public int getFactionStatus() {
-		synchronized(objectMutex) {
-			return factionStatus;
-		}
-	}
-
+	
+	@Override
 	public void setFactionStatus(int factionStatus) {
 		synchronized(objectMutex) {
 			this.factionStatus = factionStatus;
@@ -484,7 +478,7 @@ public class CreatureObject extends TangibleObject implements IPersistent {
 		notifyObservers(messageBuilder.buildFactionStatusDelta(factionStatus), true);
 		//updatePvpStatus();
 	}
-
+	
 	public float getHeight() {
 		synchronized(objectMutex) {
 			return height;
diff --git a/src/resources/objects/tangible/TangibleObject.java b/src/resources/objects/tangible/TangibleObject.java
index de1b586b..d3b64cd4 100644
--- a/src/resources/objects/tangible/TangibleObject.java
+++ b/src/resources/objects/tangible/TangibleObject.java
@@ -53,7 +53,7 @@ import engine.resources.scene.Planet;
 import engine.resources.scene.Point3D;
 import engine.resources.scene.Quaternion;
 
-@Persistent(version=5)
+@Persistent(version=6)
 public class TangibleObject extends SWGObject {
 	
 	// TODO: Thread safety
@@ -68,6 +68,7 @@ public class TangibleObject extends SWGObject {
 	private int maxDamage = 1000;
 	private boolean staticObject = true;
 	protected String faction = ""; // Says you're "Imperial Special Forces" if it's 0 for some reason
+	protected int factionStatus = 0;
 	@NotPersistent
 	private Vector<TangibleObject> defendersList = new Vector<TangibleObject>();	// unused in packets but useful for the server
 	@NotPersistent
@@ -309,7 +310,19 @@ public class TangibleObject extends SWGObject {
 		
 		updatePvpStatus();
 	}
-
+	
+	public int getFactionStatus() {
+		synchronized(objectMutex) {
+			return factionStatus;
+		}
+	}
+	
+	public void setFactionStatus(int factionStatus) {
+		synchronized(objectMutex) {
+			this.factionStatus = factionStatus;
+		}
+	}
+	
 	public Vector<TangibleObject> getDefendersList() {
 	    synchronized(objectMutex) {
     			return defendersList;