diff --git a/pom.xml b/pom.xml
index cbc1ed2..994a896 100644
--- a/pom.xml
+++ b/pom.xml
@@ -145,7 +145,7 @@
         <dependency>
             <groupId>com.github.retrooper</groupId>
             <artifactId>packetevents-spigot</artifactId>
-            <version>2.6.0</version>
+            <version>2.7.0</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/src/main/java/re/imc/geysermodelengine/model/EntityTask.java b/src/main/java/re/imc/geysermodelengine/model/EntityTask.java
index 27af6b3..efc8412 100644
--- a/src/main/java/re/imc/geysermodelengine/model/EntityTask.java
+++ b/src/main/java/re/imc/geysermodelengine/model/EntityTask.java
@@ -154,7 +154,7 @@ public class EntityTask {
                 sendColor(Collections.singleton(player), true);
                 updateEntityProperties(Collections.singleton(player), true);
             }, 1000, TimeUnit.MILLISECONDS);
-        }, delay * 50L, TimeUnit.MILLISECONDS);
+        }, Math.max(50, delay * 50L), TimeUnit.MILLISECONDS);
     }
 
     public void sendScale(Collection<Player> players, boolean firstSend) {
@@ -351,8 +351,7 @@ public class EntityTask {
         if (playerLocation.distanceSquared(entityLocation) > player.getSendViewDistance() * player.getSendViewDistance() * 48) {
             return false;
         }
-        CullType type = model.getActiveModel().getModeledEntity().getBase().getData().getTracking().get(player);
-        return type != null;
+        return true;
         /*
         if (entity.getLocation().getChunk() == player.getChunk()) {
             return true;
diff --git a/src/main/java/re/imc/geysermodelengine/model/ModelEntity.java b/src/main/java/re/imc/geysermodelengine/model/ModelEntity.java
index 77d85b5..d8d41e1 100644
--- a/src/main/java/re/imc/geysermodelengine/model/ModelEntity.java
+++ b/src/main/java/re/imc/geysermodelengine/model/ModelEntity.java
@@ -59,7 +59,7 @@ public class ModelEntity {
     }
 
     public PacketEntity spawnEntity() {
-        entity = new PacketEntity(EntityTypes.BAT, viewers, modeledEntity.getBase().getLocation());
+        entity = new PacketEntity(EntityTypes.PIG, viewers, modeledEntity.getBase().getLocation());
         return entity;
     }
 
diff --git a/src/main/java/re/imc/geysermodelengine/packet/entity/PacketEntity.java b/src/main/java/re/imc/geysermodelengine/packet/entity/PacketEntity.java
index eebeb96..4f6210e 100644
--- a/src/main/java/re/imc/geysermodelengine/packet/entity/PacketEntity.java
+++ b/src/main/java/re/imc/geysermodelengine/packet/entity/PacketEntity.java
@@ -3,6 +3,7 @@ package re.imc.geysermodelengine.packet.entity;
 import com.github.retrooper.packetevents.PacketEvents;
 import com.github.retrooper.packetevents.manager.server.ServerVersion;
 import com.github.retrooper.packetevents.protocol.entity.EntityPositionData;
+import com.github.retrooper.packetevents.protocol.entity.data.EntityMetadataProvider;
 import com.github.retrooper.packetevents.protocol.entity.type.EntityType;
 import com.github.retrooper.packetevents.protocol.entity.type.EntityTypes;
 import com.github.retrooper.packetevents.protocol.teleport.RelativeFlag;