diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/RuinsOfYeSagira.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/RuinsOfYeSagira.java
deleted file mode 100644
index af20ebd1a3..0000000000
--- a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/RuinsOfYeSagira.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package ai.areas.TalkingIsland;
-
-import com.l2jmobius.gameserver.instancemanager.WalkingManager;
-import com.l2jmobius.gameserver.model.Location;
-import com.l2jmobius.gameserver.model.actor.L2Npc;
-import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-
-import ai.AbstractNpcAI;
-
-/**
- * Ruins Of Ye Sagira AI.
- * @author St3eT
- */
-public final class RuinsOfYeSagira extends AbstractNpcAI
-{
-	// NPC
-	private static final int GUARD = 33119;
-	// Locations
-	private static final Location GUARD_LOC = new Location(-115201, 237363, -3088);
-	// Misc
-	private static final String ROUTE_NAME1 = "ye_segira_guard1";
-	private static final String ROUTE_NAME2 = "ye_segira_guard2";
-	
-	private RuinsOfYeSagira()
-	{
-		addRouteFinishedId(GUARD);
-		startQuestTimer("SPAWN_FIRST", 15000, null, null, true);
-	}
-	
-	@Override
-	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
-	{
-		switch (event)
-		{
-			case "SPAWN_FIRST":
-			{
-				final L2Npc guard = addSpawn(GUARD, GUARD_LOC);
-				WalkingManager.getInstance().startMoving(guard, ROUTE_NAME1);
-				startQuestTimer("SPAWN_SECOND", 4000, null, null);
-				break;
-			}
-			case "SPAWN_SECOND":
-			{
-				final L2Npc guard = addSpawn(GUARD, GUARD_LOC);
-				WalkingManager.getInstance().startMoving(guard, ROUTE_NAME2);
-				break;
-			}
-		}
-		return super.onAdvEvent(event, npc, player);
-	}
-	
-	@Override
-	public void onRouteFinished(L2Npc npc)
-	{
-		npc.deleteMe();
-	}
-	
-	public static void main(String[] args)
-	{
-		new RuinsOfYeSagira();
-	}
-}
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
new file mode 100644
index 0000000000..cb7162536f
--- /dev/null
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/YeSagiraGuards.java
@@ -0,0 +1,79 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package ai.areas.TalkingIsland;
+
+import com.l2jmobius.gameserver.model.L2World;
+import com.l2jmobius.gameserver.model.actor.L2Npc;
+import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+
+import ai.AbstractNpcAI;
+
+/**
+ * Ye Sagira Guards AI.
+ * @author Mobius
+ */
+public final class YeSagiraGuards extends AbstractNpcAI
+{
+	// NPCs
+	private static final int GUARDS[] =
+	{
+		19152,
+		19153
+	};
+	
+	private YeSagiraGuards()
+	{
+		addSpawnId(GUARDS);
+	}
+	
+	@Override
+	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+	{
+		if (event.equals("GUARD_AGGRO") && (npc != null) && !npc.isDead())
+		{
+			if (!npc.isInCombat())
+			{
+				L2World.getInstance().forEachVisibleObjectInRange(npc, L2MonsterInstance.class, 1000, monster ->
+				{
+					if (monster.isScriptValue(0)) // not retail - but looks better
+					{
+						monster.setScriptValue(1);
+						npc.reduceCurrentHp(1, monster, null); // TODO: Find better way for attack
+						// one target only - schedule / return
+						startQuestTimer("GUARD_AGGRO", 5000, npc, null, false);
+						return;
+					}
+				});
+			}
+			startQuestTimer("GUARD_AGGRO", 5000, npc, null, false);
+		}
+		return super.onAdvEvent(event, npc, player);
+	}
+	
+	@Override
+	public String onSpawn(L2Npc npc)
+	{
+		startQuestTimer("GUARD_AGGRO", 5000, npc, null, false);
+		return super.onSpawn(npc);
+	}
+	
+	public static void main(String[] args)
+	{
+		new YeSagiraGuards();
+	}
+}