diff --git a/pom.xml b/pom.xml
index 90feea57..73c11127 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>LibsDisguises</groupId>
 	<artifactId>LibsDisguises</artifactId>
-	<version>v2.2</version>
+	<version>v3.0</version>
 	<build>
 		<sourceDirectory>src</sourceDirectory>
 		<defaultGoal>clean package</defaultGoal>
diff --git a/src/me/libraryaddict/disguise/DisguiseTypes/DisguiseType.java b/src/me/libraryaddict/disguise/DisguiseTypes/DisguiseType.java
index e9300200..93182a73 100644
--- a/src/me/libraryaddict/disguise/DisguiseTypes/DisguiseType.java
+++ b/src/me/libraryaddict/disguise/DisguiseTypes/DisguiseType.java
@@ -3,18 +3,19 @@ package me.libraryaddict.disguise.DisguiseTypes;
 public enum DisguiseType {
     ARROW(EntityType.MISC, 60), BAT(EntityType.MOB), BLAZE(EntityType.MOB), BOAT(EntityType.MISC, 1), CAVE_SPIDER(EntityType.MOB), CHICKEN(
             EntityType.MOB), COW(EntityType.MOB), CREEPER(EntityType.MOB), EGG(EntityType.MISC, 62), ENDER_CRYSTAL(
-            EntityType.MISC, 51), ENDER_DRAGON(EntityType.MOB), ENDER_PEARL(EntityType.MISC, 65), ENDER_SIGNAL(
-            EntityType.MISC, 72), ENDERMAN(EntityType.MOB), EXPERIENCE_ORB(EntityType.EXP), FALLING_BLOCK(EntityType.MISC, 70, 1), FIREWORKS(
+            EntityType.MISC, 51), ENDER_DRAGON(EntityType.MOB), ENDER_PEARL(EntityType.MISC, 65), ENDER_SIGNAL(EntityType.MISC,
+            72), ENDERMAN(EntityType.MOB), EXPERIENCE_ORB(EntityType.EXP), FALLING_BLOCK(EntityType.MISC, 70, 1), FIREWORKS(
             EntityType.MISC, 76), FISHING_HOOK(EntityType.MISC, 90), GHAST(EntityType.MOB), GIANT_ZOMBIE(EntityType.MOB), IRON_GOLEM(
-            EntityType.MOB), ITEM(EntityType.MISC, 2, 1), ITEM_FRAME(EntityType.MISC, 71), LARGE_FIREBALL(EntityType.MISC, 63, 0), MAGMA_CUBE(EntityType.MOB), MINECART_CHEST(
-            EntityType.MISC, 10, 1), MINECART_FURNACE(EntityType.MISC, 10, 2), MINECART_HOPPER(EntityType.MISC, 10), MINECART_MOB_SPAWNER(
-            EntityType.MISC, 10, 4), MINECART_RIDEABLE(EntityType.MISC, 10, 0), MINECART_TNT(EntityType.MISC, 10, 3), MUSHROOM_COW(
-            EntityType.MOB), OCELOT(EntityType.MOB), PIG(EntityType.MOB), PIG_ZOMBIE(EntityType.MOB), PLAYER(EntityType.PLAYER), POTION(
-            EntityType.MISC, 73), PRIMED_TNT(EntityType.MISC, 50), SHEEP(EntityType.MOB), SILVERFISH(EntityType.MOB), SKELETON(
-            EntityType.MOB), SLIME(EntityType.MOB), SMALL_FIREBALL(EntityType.MISC, 64, 0), SNOWBALL(EntityType.MISC, 61), SNOWMAN(
-            EntityType.MOB), SPIDER(EntityType.MOB), SQUID(EntityType.MOB), THROWN_EXP_BOTTLE(EntityType.MISC, 75), VILLAGER(
-            EntityType.MOB), WITCH(EntityType.MOB), WITHER(EntityType.MOB), WITHER_SKELETON(EntityType.MOB), WITHER_SKULL(
-            EntityType.MISC, 66), WOLF(EntityType.MOB), ZOMBIE(EntityType.MOB);
+            EntityType.MOB), ITEM(EntityType.MISC, 2, 1), ITEM_FRAME(EntityType.MISC, 71), LARGE_FIREBALL(EntityType.MISC, 63, 0), MAGMA_CUBE(
+            EntityType.MOB), MINECART_CHEST(EntityType.MISC, 10, 1), MINECART_FURNACE(EntityType.MISC, 10, 2), MINECART_HOPPER(
+            EntityType.MISC, 10), MINECART_MOB_SPAWNER(EntityType.MISC, 10, 4), MINECART_RIDEABLE(EntityType.MISC, 10, 0), MINECART_TNT(
+            EntityType.MISC, 10, 3), MUSHROOM_COW(EntityType.MOB), OCELOT(EntityType.MOB), PIG(EntityType.MOB), PIG_ZOMBIE(
+            EntityType.MOB), PLAYER(EntityType.PLAYER), POTION(EntityType.MISC, 73), PRIMED_TNT(EntityType.MISC, 50), SHEEP(
+            EntityType.MOB), SILVERFISH(EntityType.MOB), SKELETON(EntityType.MOB), SLIME(EntityType.MOB), SMALL_FIREBALL(
+            EntityType.MISC, 64, 0), SNOWBALL(EntityType.MISC, 61), SNOWMAN(EntityType.MOB), SPIDER(EntityType.MOB), SQUID(
+            EntityType.MOB), THROWN_EXP_BOTTLE(EntityType.MISC, 75), VILLAGER(EntityType.MOB), WITCH(EntityType.MOB), WITHER(
+            EntityType.MOB), WITHER_SKELETON(EntityType.MOB), WITHER_SKULL(EntityType.MISC, 66), WOLF(EntityType.MOB), ZOMBIE(
+            EntityType.MOB);
 
     public static enum EntityType {
         EXP, MISC, MOB, PLAYER;
diff --git a/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/PigWatcher.java b/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/PigWatcher.java
index f0573bc0..9a3e7d85 100644
--- a/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/PigWatcher.java
+++ b/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/PigWatcher.java
@@ -12,7 +12,9 @@ public class PigWatcher extends AgeableWatcher {
     }
 
     public void setSaddled(boolean isSaddled) {
-        setValue(16, (byte) (isSaddled ? 1 : 0));
-        sendData(16);
+        if (isSaddled() != isSaddled) {
+            setValue(16, (byte) (isSaddled ? 1 : 0));
+            sendData(16);
+        }
     }
 }
diff --git a/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/SheepWatcher.java b/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/SheepWatcher.java
index b31d42ce..fe4e764e 100644
--- a/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/SheepWatcher.java
+++ b/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/SheepWatcher.java
@@ -16,14 +16,17 @@ public class SheepWatcher extends AgeableWatcher {
     }
 
     public void setColor(AnimalColor newColor) {
-        setValue(16, (byte) (newColor.getId() + (isSheared ? 16 : 0)));
-        sendData(16);
+        if (color != newColor) {
+            setValue(16, (byte) (newColor.getId() + (isSheared ? 16 : 0)));
+            sendData(16);
+        }
     }
 
     public void setSheared(boolean sheared) {
         if (sheared != isSheared) {
             isSheared = sheared;
-            setColor(color);
+            setValue(16, (byte) (color.getId() + (isSheared ? 16 : 0)));
+            sendData(16);
         }
     }
 
diff --git a/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/WolfWatcher.java b/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/WolfWatcher.java
index 0c653e65..a5c45c5e 100644
--- a/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/WolfWatcher.java
+++ b/src/me/libraryaddict/disguise/DisguiseTypes/Watchers/WolfWatcher.java
@@ -10,7 +10,7 @@ public class WolfWatcher extends AgeableWatcher {
 
     public WolfWatcher(int entityId) {
         super(entityId);
-        setValue(16, (byte) 7);
+        setValue(16, (byte) 0);
         setValue(17, "");
         setValue(18, 8);
         setValue(19, (byte) 0);
diff --git a/src/me/libraryaddict/disguise/LibsDisguises.java b/src/me/libraryaddict/disguise/LibsDisguises.java
index e3fc205b..077e5621 100644
--- a/src/me/libraryaddict/disguise/LibsDisguises.java
+++ b/src/me/libraryaddict/disguise/LibsDisguises.java
@@ -3,6 +3,7 @@ package me.libraryaddict.disguise;
 import java.util.List;
 
 import me.libraryaddict.disguise.DisguiseTypes.Disguise;
+import me.libraryaddict.disguise.DisguiseTypes.DisguiseType;
 import me.libraryaddict.disguise.DisguiseTypes.PlayerDisguise;
 import net.minecraft.server.v1_5_R3.WatchableObject;