diff --git a/src/main/java/me/sashegdev/fabled_hearts/ai/EllieSleepGoal.java b/src/main/java/me/sashegdev/fabled_hearts/ai/EllieSleepGoal.java
index 6a6b4a5..8845cb4 100644
--- a/src/main/java/me/sashegdev/fabled_hearts/ai/EllieSleepGoal.java
+++ b/src/main/java/me/sashegdev/fabled_hearts/ai/EllieSleepGoal.java
@@ -3,6 +3,7 @@ package me.sashegdev.fabled_hearts.ai;
 import me.sashegdev.fabled_hearts.entity.ellie.EllieEntity;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.ai.goal.Goal;
+import net.minecraft.world.level.block.BedBlock;
 import net.minecraft.world.level.block.DoorBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.Vec3;
@@ -26,9 +27,8 @@ public class EllieSleepGoal extends Goal {
 
     @Override
     public boolean canUse() {
-        if (!ellie.level().isNight() && !ellie.isTired()) return false;
         if (ellie.isSleeping()) return false;
-        if (ellie.hurtTime > 0) return false;
+        if (!ellie.level().isNight() && !ellie.isTired()) return false;
 
         bedPos = findBed();
         return bedPos != null;
@@ -46,9 +46,6 @@ public class EllieSleepGoal extends Goal {
     public void start() {
         claimed = false;
         if (bedPos != null) {
-            if (ellie.isSpaceLow(bedPos)) {
-                ellie.setPose(net.minecraft.world.entity.Pose.CROUCHING);
-            }
             ellie.getNavigation().moveTo(bedPos.getX() + 0.5, bedPos.getY(), bedPos.getZ() + 0.5, 0.6);
         }
     }
@@ -57,7 +54,6 @@ public class EllieSleepGoal extends Goal {
     public void tick() {
         if (bedPos == null) return;
 
-        // Open doors in path
         tryOpenDoor();
 
         double distSqr = ellie.distanceToSqr(Vec3.atCenterOf(bedPos));
@@ -69,10 +65,11 @@ public class EllieSleepGoal extends Goal {
                 claimed = ellie.occupyBed(bedPos);
             }
 
-            if (claimed) {
-                if (!ellie.isSleeping()) {
-                    ellie.setBedSleepPos(bedPos);
-                }
+            if (claimed && !ellie.isSleeping()) {
+                ellie.setBedSleepPos(bedPos);
+            }
+
+            if (ellie.isSleeping()) {
                 sleepTimer++;
             }
         } else {
@@ -83,7 +80,6 @@ public class EllieSleepGoal extends Goal {
     }
 
     private void tryOpenDoor() {
-        BlockPos inFront = ellie.blockPosition().relative(ellie.getDirection());
         for (int i = 0; i < 3; i++) {
             BlockPos checkPos = ellie.blockPosition().relative(ellie.getDirection(), i);
             BlockState state = ellie.level().getBlockState(checkPos);
@@ -108,14 +104,16 @@ public class EllieSleepGoal extends Goal {
 
     @Override
     public boolean canContinueToUse() {
-        if (ellie.hurtTime > 0) return false;
         if (ellie.isSleeping()) {
             if (sleepTimer >= MAX_SLEEP_TICKS) return false;
-            if (bedPos != null && !ellie.level().getBlockState(bedPos).isBed(ellie.level(), bedPos, null)) {
-                return false;
+            if (bedPos != null) {
+                BlockState state = ellie.level().getBlockState(bedPos);
+                if (!state.isBed(ellie.level(), bedPos, null)) return false;
             }
             return true;
         }
+        if (bedPos == null) return false;
+        if (ellie.hurtTime > 10) return false;
         if (!ellie.level().isNight() && !ellie.isTired()) return false;
         return true;
     }
@@ -145,8 +143,8 @@ public class EllieSleepGoal extends Goal {
 
     private boolean isFreeBed(BlockPos pos) {
         BlockState state = ellie.level().getBlockState(pos);
-        if (!state.isBed(ellie.level(), pos, null)) return false;
-        if (state.hasProperty(DoorBlock.OPEN) && state.getValue(DoorBlock.OPEN)) return false;
-        return !state.getValue(net.minecraft.world.level.block.BedBlock.OCCUPIED);
+        if (!(state.getBlock() instanceof BedBlock)) return false;
+        if (state.getValue(BedBlock.OCCUPIED)) return false;
+        return true;
     }
 }
diff --git a/src/main/java/me/sashegdev/fabled_hearts/ai/IdleAnimationGoal.java b/src/main/java/me/sashegdev/fabled_hearts/ai/IdleAnimationGoal.java
index db2f9bd..cf37787 100644
--- a/src/main/java/me/sashegdev/fabled_hearts/ai/IdleAnimationGoal.java
+++ b/src/main/java/me/sashegdev/fabled_hearts/ai/IdleAnimationGoal.java
@@ -1,7 +1,6 @@
 package me.sashegdev.fabled_hearts.ai;
 
 import me.sashegdev.fabled_hearts.entity.ellie.EllieEntity;
-import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.ai.goal.Goal;
 
 import java.util.EnumSet;
@@ -39,7 +38,6 @@ public class IdleAnimationGoal extends Goal {
             default -> 100;
         };
         ellie.triggerRandomIdle(animId);
-        ellie.getNavigation().stop();
     }
 
     @Override
diff --git a/src/main/java/me/sashegdev/fabled_hearts/entity/ellie/EllieEntity.java b/src/main/java/me/sashegdev/fabled_hearts/entity/ellie/EllieEntity.java
index e179ef0..d4747e9 100644
--- a/src/main/java/me/sashegdev/fabled_hearts/entity/ellie/EllieEntity.java
+++ b/src/main/java/me/sashegdev/fabled_hearts/entity/ellie/EllieEntity.java
@@ -199,29 +199,7 @@ public class EllieEntity extends Animal implements GeoEntity {
     }
 
     private boolean checkLowCeiling() {
-        if (isSpaceLow(blockPosition())) return true;
-
-        for (Direction dir : Direction.Plane.HORIZONTAL) {
-            for (int i = 2; i <= 4; i++) {
-                if (isSpaceLow(blockPosition().relative(dir, i))) return true;
-            }
-        }
-
-        if (navigation.isInProgress()) {
-            var path = navigation.getPath();
-            if (path != null) {
-                for (int i = 0; i < path.getNodeCount(); i++) {
-                    BlockPos nodePos = path.getNodePos(i);
-                    double dist = distanceToSqr(
-                        nodePos.getX() + 0.5, nodePos.getY(), nodePos.getZ() + 0.5);
-                    if (dist < 3 * 3 && isSpaceLow(nodePos)) {
-                        return true;
-                    }
-                }
-            }
-        }
-
-        return false;
+        return isSpaceLow(blockPosition());
     }
 
     public boolean isSpaceLow(BlockPos pos) {
@@ -231,7 +209,7 @@ public class EllieEntity extends Animal implements GeoEntity {
     @Override
     public EntityDimensions getDimensions(Pose pose) {
         if (pose == Pose.SLEEPING) return EntityDimensions.fixed(0.4f, 0.3f);
-        if (pose == Pose.CROUCHING) return EntityDimensions.fixed(0.6f, 1.5f);
+        if (pose == Pose.CROUCHING) return EntityDimensions.fixed(0.6f, 1.0f);
         return super.getDimensions(pose);
     }