diff --git a/src/strategy/actions/MovementActions.cpp b/src/strategy/actions/MovementActions.cpp
index 0b068b56..09c0dddb 100644
--- a/src/strategy/actions/MovementActions.cpp
+++ b/src/strategy/actions/MovementActions.cpp
@@ -166,11 +166,11 @@ bool MovementAction::MoveTo(uint32 mapId, float x, float y, float z, bool idle,
                 !bot->IsFlying() && !bot->HasUnitMovementFlag(MOVEMENTFLAG_SWIMMING) && !bot->IsInWater();
         MotionMaster &mm = *bot->GetMotionMaster();
         
-        mm.Clear();
-        float modifiedZ = SearchBestGroundZForPath(x, y, z, generatePath, normal_only);
+        float modifiedZ = SearchBestGroundZForPath(x, y, z, generatePath, 20.0f, normal_only);
         if (modifiedZ == INVALID_HEIGHT) {
             return false;
         }
+        // mm.Clear();
         mm.MovePoint(mapId, x, y, modifiedZ, generatePath);
         AI_VALUE(LastMovement&, "last movement").Set(mapId, x, y, z, bot->GetOrientation());
         return true;
@@ -1294,36 +1294,54 @@ float MovementAction::SearchBestGroundZForPath(float x, float y, float z, bool g
     if (!generatePath) {
         return z;
     }
+    float min_length = MAX_PATH_LENGTH;
+    float current_z = INVALID_HEIGHT;
     float modified_z;
     float delta;
-    for (delta = 0.0f; delta <= range / 2; delta++) {
+    for (delta = 0.0f; delta <= range / 2; delta += 2) {
         modified_z = bot->GetMapWaterOrGroundLevel(x, y, z + delta);
         PathGenerator gen(bot);
         gen.CalculatePath(x, y, modified_z);
-        if (gen.GetPathType() == PATHFIND_NORMAL) {
-            return modified_z;
+        
+        if (gen.GetPathType() == PATHFIND_NORMAL && gen.getPathLength() < min_length) {
+            min_length = gen.getPathLength();
+            current_z = modified_z;
+            // if (abs(current_z - z) < 0.1f) {
+            //     return current_z;
+            // }
         }
     }
-    for (delta = -1.0f; delta >= -range / 2; delta--) {
+    for (delta = -1.0f; delta >= -range / 2; delta -= 2) {
         modified_z = bot->GetMapWaterOrGroundLevel(x, y, z + delta);
         PathGenerator gen(bot);
         gen.CalculatePath(x, y, modified_z);
-        if (gen.GetPathType() == PATHFIND_NORMAL) {
-            return modified_z;
+        if (gen.GetPathType() == PATHFIND_NORMAL && gen.getPathLength() < min_length) {
+            min_length = gen.getPathLength();
+            current_z = modified_z;
+            // if (abs(current_z - z) < 0.1f) {
+            //     return current_z;
+            // }
         }
     }
-    for (delta = range / 2 + 1.0f; delta <= range; delta++) {
+    for (delta = range / 2 + 1.0f; delta <= range; delta += 2) {
         modified_z = bot->GetMapWaterOrGroundLevel(x, y, z + delta);
         PathGenerator gen(bot);
         gen.CalculatePath(x, y, modified_z);
-        if (gen.GetPathType() == PATHFIND_NORMAL) {
-            return modified_z;
+        if (gen.GetPathType() == PATHFIND_NORMAL && gen.getPathLength() < min_length) {
+            min_length = gen.getPathLength();
+            current_z = modified_z;
+            // if (abs(current_z - z) < 0.1f) {
+            //     return current_z;
+            // }
         }
     }
-    if (normal_only) {
+    if (current_z == INVALID_HEIGHT && normal_only) {
         return INVALID_HEIGHT;
     }
-    return z;
+    if (current_z == INVALID_HEIGHT && !normal_only) {
+        return z;
+    }
+    return current_z;
 }
     
 
@@ -1395,7 +1413,7 @@ bool SetFacingTargetAction::Execute(Event event)
         return true;
 
     sServerFacade->SetFacingTo(bot, target);
-    botAI->SetNextCheckDelay(sPlayerbotAIConfig->globalCoolDown);
+    botAI->SetNextCheckDelay(sPlayerbotAIConfig->reactDelay);
     return true;
 }
 
diff --git a/src/strategy/actions/MovementActions.h b/src/strategy/actions/MovementActions.h
index ce437e9c..3b183fe7 100644
--- a/src/strategy/actions/MovementActions.h
+++ b/src/strategy/actions/MovementActions.h
@@ -41,7 +41,7 @@ class MovementAction : public Action
         bool MoveInside(uint32 mapId, float x, float y, float z, float distance = sPlayerbotAIConfig->followDistance);
         void CreateWp(Player* wpOwner, float x, float y, float z, float o, uint32 entry, bool important = false);
     private:
-        float SearchBestGroundZForPath(float x, float y, float z, bool generatePath, float range = 10.0f, bool normal_only = false);
+        float SearchBestGroundZForPath(float x, float y, float z, bool generatePath, float range = 20.0f, bool normal_only = false);
 };
 
 class FleeAction : public MovementAction