diff --git a/src/resources/objects/creature/CreatureObject.java b/src/resources/objects/creature/CreatureObject.java
index f7c0554b..bf0aa1e8 100644
--- a/src/resources/objects/creature/CreatureObject.java
+++ b/src/resources/objects/creature/CreatureObject.java
@@ -124,8 +124,8 @@ public class CreatureObject extends TangibleObject implements IPersistent {
 	
 	public Baseline getBaseline1() {
 		Baseline baseline = super.getBaseline1();
-		baseline.put("bankCredits", 1000);
-		baseline.put("cashCredits", 100);
+		baseline.put("bankCredits", 0);
+		baseline.put("cashCredits", 0);
 		baseline.put("baseAttributes", new SWGList<Integer>(this, 1, 2, false));
 		baseline.put("skills", new SWGSet<String>(this, 1, 3, false));
 		return baseline;
@@ -220,9 +220,7 @@ public class CreatureObject extends TangibleObject implements IPersistent {
 	}
 	
 	public void setBankCredits(int bankCredits) {
-		if (getClient() != null && getClient().getSession() != null) {
-			getClient().getSession().write(getBaseline(1).set("bankCredits", bankCredits));
-		}
+		notifySelf(getBaseline(1).set("bankCredits", bankCredits));
 	}
 	
 	public void addBankCredits(int bankCredits) {
@@ -242,9 +240,7 @@ public class CreatureObject extends TangibleObject implements IPersistent {
 	}
 	
 	public void setCashCredits(int cashCredits) {
-		if (getClient() != null && getClient().getSession() != null) {
-			getClient().getSession().write(getBaseline(1).set("cashCredits", cashCredits));
-		}
+		notifySelf(getBaseline(1).set("cashCredits", cashCredits));
 	}
 	
 	public void addCashCredits(int cashCredits) {
@@ -434,9 +430,7 @@ public class CreatureObject extends TangibleObject implements IPersistent {
 	}
 	
 	public void setAccelerationMultiplierBase(float accelerationMultiplierBase) {
-		if (getClient() != null && getClient().getSession() != null) {
-			getClient().getSession().write(getBaseline(4).set("accelerationMultiplierBase", accelerationMultiplierBase));
-		}
+		notifySelf(getBaseline(4).set("accelerationMultiplierBase", accelerationMultiplierBase));
 	}
 	
 	public float getAccelerationMultiplierMod() {
@@ -444,9 +438,7 @@ public class CreatureObject extends TangibleObject implements IPersistent {
 	}
 	
 	public void setAccelerationMultiplierMod(float accelerationMultiplierMod) {
-		if (getClient() != null && getClient().getSession() != null) {
-			getClient().getSession().write(getBaseline(4).set("accelerationMultiplierMod", accelerationMultiplierMod));
-		}
+		notifySelf(getBaseline(4).set("accelerationMultiplierMod", accelerationMultiplierMod));
 	}
 	
 	@SuppressWarnings("unchecked")
@@ -539,9 +531,7 @@ public class CreatureObject extends TangibleObject implements IPersistent {
 	}
 	
 	public void setSpeedMultiplierBase(float speedMultiplierBase) {
-		if (getClient() != null && getClient().getSession() != null) {
-			getClient().getSession().write(getBaseline(4).set("speedMultiplierBase", speedMultiplierBase));
-		}
+		notifySelf(getBaseline(4).set("speedMultiplierBase", speedMultiplierBase));
 	}
 	
 	public float getSpeedMultiplierMod() {
@@ -549,9 +539,7 @@ public class CreatureObject extends TangibleObject implements IPersistent {
 	}
 	
 	public void setSpeedMultiplierMod(float speedMultiplierMod) {
-		if (getClient() != null && getClient().getSession() != null) {
-			getClient().getSession().write(getBaseline(4).set("speedMultiplierMod", speedMultiplierMod));
-		}
+		notifySelf(getBaseline(4).set("speedMultiplierMod", speedMultiplierMod));
 	}
 	
 	public long getListenToId() {
@@ -559,9 +547,7 @@ public class CreatureObject extends TangibleObject implements IPersistent {
 	}
 	
 	public void setListenToId(long listenToId) {
-		if (getClient() != null && getClient().getSession() != null) {
-			getClient().getSession().write(getBaseline(4).set("listenToId", listenToId));
-		}
+		notifySelf(getBaseline(4).set("listenToId", listenToId));
 	}
 	
 	public float getRunSpeed() {
@@ -569,9 +555,7 @@ public class CreatureObject extends TangibleObject implements IPersistent {
 	}
 	
 	public void setRunSpeed(float runSpeed) {
-		if (getClient() != null && getClient().getSession() != null) {
-			getClient().getSession().write(getBaseline(4).set("runSpeed", runSpeed));
-		}
+		notifySelf(getBaseline(4).set("runSpeed", runSpeed));
 	}
 	
 	public float getSlopeModAngle() {
@@ -579,9 +563,7 @@ public class CreatureObject extends TangibleObject implements IPersistent {
 	}
 	
 	public void setSlopeModAngle(float slopeModAngle) {
-		if (getClient() != null && getClient().getSession() != null) {
-			getClient().getSession().write(getBaseline(4).set("slopeModAngle", slopeModAngle));
-		}
+		notifySelf(getBaseline(4).set("slopeModAngle", slopeModAngle));
 	}
 	
 	public float getSlopeModPercent() {
@@ -589,9 +571,7 @@ public class CreatureObject extends TangibleObject implements IPersistent {
 	}
 	
 	public void setSlopeModPercent(float slopeModPercent) {
-		if (getClient() != null && getClient().getSession() != null) {
-			getClient().getSession().write(getBaseline(4).set("slopeModPercent", slopeModPercent));
-		}
+		notifySelf(getBaseline(4).set("slopeModPercent", slopeModPercent));
 	}
 	
 	public float getTurnRadius() {
@@ -599,9 +579,7 @@ public class CreatureObject extends TangibleObject implements IPersistent {
 	}
 	
 	public void setTurnRadius(float turnRadius) {
-		if (getClient() != null && getClient().getSession() != null) {
-			getClient().getSession().write(getBaseline(4).set("turnRadius", turnRadius));
-		}
+		notifySelf(getBaseline(4).set("turnRadius", turnRadius));
 	}
 	
 	public float getWalkSpeed() {
@@ -609,9 +587,7 @@ public class CreatureObject extends TangibleObject implements IPersistent {
 	}
 	
 	public void setWalkSpeed(float walkSpeed) {
-		if (getClient() != null && getClient().getSession() != null) {
-			getClient().getSession().write(getBaseline(4).set("walkSpeed", walkSpeed));
-		}
+		notifySelf(getBaseline(4).set("walkSpeed", walkSpeed));
 	}
 	
 	public float getWaterModPercent() {
@@ -619,9 +595,7 @@ public class CreatureObject extends TangibleObject implements IPersistent {
 	}
 	
 	public void setWaterModPercent(float waterModPercent) {
-		if (getClient() != null && getClient().getSession() != null) {
-			getClient().getSession().write(getBaseline(4).set("waterModPercent", waterModPercent));
-		}
+		notifySelf(getBaseline(4).set("waterModPercent", waterModPercent));
 	}
 	
 	@SuppressWarnings("unchecked")
@@ -661,9 +635,7 @@ public class CreatureObject extends TangibleObject implements IPersistent {
 	}
 	
 	public void setDisplayXp(int displayXp) {
-		if (getClient() != null && getClient().getSession() != null) {
-			getClient().getSession().write(getBaseline(4).set("displayXp", displayXp));
-		}
+		notifySelf(getBaseline(4).set("displayXp", displayXp));
 	}
 	
 	public short getLevel() {
@@ -748,9 +720,7 @@ public class CreatureObject extends TangibleObject implements IPersistent {
 	}
 	
 	public void updateGroupInviteInfo() {
-		if (getClient() != null && getClient().getSession() != null) {
-			getClient().getSession().write(getBaseline(6).set("groupInviteInfo", getGroupInviteInfo()));
-		}
+		notifySelf(getBaseline(6).set("groupInviteInfo", getGroupInviteInfo()));
 	}
 	
 	public int getGuildId() {
@@ -1381,9 +1351,7 @@ public class CreatureObject extends TangibleObject implements IPersistent {
 	}
 	
 	public void sendSystemMessage(String message, OutOfBand outOfBand, byte displayType) {
-		if (getClient() != null && getClient().getSession() != null) {
-			getClient().getSession().write((new ChatSystemMessage(message, outOfBand, displayType)).serialize());
-		}
+		notifySelf((new ChatSystemMessage(message, outOfBand, displayType)).serialize())};
 	}
 	
 	public void playMusic(String sndFile) {
@@ -1403,13 +1371,19 @@ public class CreatureObject extends TangibleObject implements IPersistent {
 	}
 	
 	public void playMusic(String sndFile, long targetId, int repetitions, boolean flag) {
-		getClient().getSession().write(new PlayMusicMessage(sndFile, targetId, 1, false));
+		notifySelf(new PlayMusicMessage(sndFile, targetId, 1, false));
 	}
 	
 	public TangibleObject getInventory() {
 		return (TangibleObject) getSlottedObject("inventory");
 	}
 	
+	public void notifySelf(IoBuffer buffer) {
+		if (getClient() != null && getClient().getSession() != null) {
+			getClient().getSession().write(buffer);
+		}
+	}
+	
 	public void notifyClients(IoBuffer buffer, boolean notifySelf) {
 		notifyObservers(buffer, notifySelf);
 	}