diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/spawns/old/23_17.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/spawns/old/23_17.xml
index b36c2fbab2..fd9de82188 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/spawns/old/23_17.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/spawns/old/23_17.xml
@@ -31,19 +31,17 @@
 			<npc id="31675" x="113824" y="-17936" z="-1773" heading="26000" respawnTime="60sec" /> <!-- Viktor Van Dake -->
 			<npc id="31677" x="113504" y="-17856" z="-1776" heading="20000" respawnTime="60sec" /> <!-- Border Patrol -->
 			<npc id="31677" x="113760" y="-17456" z="-1724" heading="31000" respawnTime="60sec" /> <!-- Border Patrol -->
-			<npc id="31677" x="110916" y="-10560" z="-1896" heading="22500" respawnTime="60sec" /> <!-- Border Patrol -->
+			<npc id="31677" x="110727" y="-10623" z="-1900" heading="22500" respawnTime="60sec" /> <!-- Border Patrol -->
 			<npc id="31677" x="109799" y="-10906" z="-1464" heading="19000" respawnTime="60sec" /> <!-- Border Patrol -->
 			<npc id="31677" x="110400" y="-10700" z="-1792" heading="19500" respawnTime="60sec" /> <!-- Border Patrol -->
 			<npc id="31677" x="111328" y="-10236" z="-1648" heading="23000" respawnTime="60sec" /> <!-- Border Patrol -->
-			<npc id="31677" x="111396" y="-11396" z="-1728" heading="21500" respawnTime="60sec" /> <!-- Border Patrol -->
-			<npc id="31677" x="110560" y="-11520" z="-1744" heading="12288" respawnTime="60sec" /> <!-- Border Patrol -->
+			<npc id="31677" x="111453" y="-11349" z="-1735" heading="21500" respawnTime="60sec" /> <!-- Border Patrol -->
+			<npc id="31677" x="110767" y="-11693" z="-1742" heading="12288" respawnTime="60sec" /> <!-- Border Patrol -->
 			<npc id="31677" x="112132" y="-14560" z="-1772" heading="28672" respawnTime="60sec" /> <!-- Border Patrol -->
 			<npc id="31677" x="112032" y="-15788" z="-1772" respawnTime="60sec" /> <!-- Border Patrol -->
-			<npc id="31677" x="111888" y="-17792" z="-1705" heading="16384" respawnTime="60sec" /> <!-- Border Patrol -->
-			<npc id="31677" x="112816" y="-17856" z="-1772" heading="26000" respawnTime="60sec" /> <!-- Border Patrol -->
-			<npc id="31677" x="112740" y="-17944" z="-1772" heading="20480" respawnTime="60sec" /> <!-- Border Patrol -->
+			<npc id="31677" x="111246" y="-18055" z="-1703" heading="16384" respawnTime="60sec" /> <!-- Border Patrol -->
 			<npc id="31677" x="112668" y="-17960" z="-1768" heading="20480" respawnTime="60sec" /> <!-- Border Patrol -->
-			<npc id="31677" x="111468" y="-12224" z="-1756" heading="20480" respawnTime="60sec" /> <!-- Border Patrol -->
+			<npc id="31677" x="111544" y="-12163" z="-1721" heading="20480" respawnTime="60sec" /> <!-- Border Patrol -->
 			<npc id="31679" x="114276" y="-17964" z="-1755" heading="60000" respawnTime="60sec" /> <!-- Eustace Van Essen -->
 			<npc id="30886" x="111468" y="-12224" z="-1712" heading="20480" respawnTime="60sec" /> <!-- Border Patrol -->
 			<npc id="20959" x="126163" y="-1353" z="-2376" heading="18529" respawnTime="37sec" /> <!-- Dark Guard -->
@@ -59,7 +57,7 @@
 			<npc id="20959" x="124862" y="-10414" z="-3808" respawnTime="37sec" /> <!-- Dark Guard -->
 			<npc id="31681" x="114656" y="-17824" z="-1756" heading="53000" respawnTime="60sec" /> <!-- Border Outpost Guard -->
 			<npc id="31681" x="114432" y="-18272" z="-1776" heading="2000" respawnTime="60sec" /> <!-- Border Outpost Guard -->
-			<npc id="31681" x="118964" y="-19340" z="-2715" heading="60000" respawnTime="60sec" /> <!-- Border Outpost Guard -->
+			<npc id="31681" x="119011" y="-19518" z="-2647" heading="60000" respawnTime="60sec" /> <!-- Border Outpost Guard -->
 			<npc id="31681" x="118604" y="-20412" z="-2752" respawnTime="60sec" /> <!-- Border Outpost Guard -->
 			<npc id="31681" x="116942" y="-19646" z="-2376" heading="60000" respawnTime="60sec" /> <!-- Border Outpost Guard -->
 			<npc id="31681" x="118912" y="-19584" z="-2924" heading="50000" respawnTime="60sec" /> <!-- Border Outpost Guard -->
@@ -68,7 +66,6 @@
 			<npc id="31681" x="118704" y="-20048" z="-2916" heading="3000" respawnTime="60sec" /> <!-- Border Outpost Guard -->
 			<npc id="30880" x="112816" y="-17856" z="-1697" heading="26000" respawnTime="60sec" /> <!-- Viktor Van Dake -->
 			<npc id="30881" x="112740" y="-17944" z="-1697" heading="20480" respawnTime="60sec" /> <!-- Sanders -->
-			<npc id="30882" x="112668" y="-17960" z="-1696" heading="20480" respawnTime="60sec" /> <!-- Border Patrol -->
 			<npc id="30889" x="110916" y="-10560" z="-1896" heading="22500" respawnTime="60sec" /> <!-- Border Patrol -->
 			<npc id="20963" x="120717" y="-4774" z="-4000" respawnTime="37sec" /> <!-- Bloody Lord -->
 			<npc id="20963" x="119084" y="-3184" z="-3872" respawnTime="37sec" /> <!-- Bloody Lord -->
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/spawns/old/23_17.xml b/L2J_Mobius_2.5_Underground/dist/game/data/spawns/old/23_17.xml
index b36c2fbab2..fd9de82188 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/spawns/old/23_17.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/spawns/old/23_17.xml
@@ -31,19 +31,17 @@
 			<npc id="31675" x="113824" y="-17936" z="-1773" heading="26000" respawnTime="60sec" /> <!-- Viktor Van Dake -->
 			<npc id="31677" x="113504" y="-17856" z="-1776" heading="20000" respawnTime="60sec" /> <!-- Border Patrol -->
 			<npc id="31677" x="113760" y="-17456" z="-1724" heading="31000" respawnTime="60sec" /> <!-- Border Patrol -->
-			<npc id="31677" x="110916" y="-10560" z="-1896" heading="22500" respawnTime="60sec" /> <!-- Border Patrol -->
+			<npc id="31677" x="110727" y="-10623" z="-1900" heading="22500" respawnTime="60sec" /> <!-- Border Patrol -->
 			<npc id="31677" x="109799" y="-10906" z="-1464" heading="19000" respawnTime="60sec" /> <!-- Border Patrol -->
 			<npc id="31677" x="110400" y="-10700" z="-1792" heading="19500" respawnTime="60sec" /> <!-- Border Patrol -->
 			<npc id="31677" x="111328" y="-10236" z="-1648" heading="23000" respawnTime="60sec" /> <!-- Border Patrol -->
-			<npc id="31677" x="111396" y="-11396" z="-1728" heading="21500" respawnTime="60sec" /> <!-- Border Patrol -->
-			<npc id="31677" x="110560" y="-11520" z="-1744" heading="12288" respawnTime="60sec" /> <!-- Border Patrol -->
+			<npc id="31677" x="111453" y="-11349" z="-1735" heading="21500" respawnTime="60sec" /> <!-- Border Patrol -->
+			<npc id="31677" x="110767" y="-11693" z="-1742" heading="12288" respawnTime="60sec" /> <!-- Border Patrol -->
 			<npc id="31677" x="112132" y="-14560" z="-1772" heading="28672" respawnTime="60sec" /> <!-- Border Patrol -->
 			<npc id="31677" x="112032" y="-15788" z="-1772" respawnTime="60sec" /> <!-- Border Patrol -->
-			<npc id="31677" x="111888" y="-17792" z="-1705" heading="16384" respawnTime="60sec" /> <!-- Border Patrol -->
-			<npc id="31677" x="112816" y="-17856" z="-1772" heading="26000" respawnTime="60sec" /> <!-- Border Patrol -->
-			<npc id="31677" x="112740" y="-17944" z="-1772" heading="20480" respawnTime="60sec" /> <!-- Border Patrol -->
+			<npc id="31677" x="111246" y="-18055" z="-1703" heading="16384" respawnTime="60sec" /> <!-- Border Patrol -->
 			<npc id="31677" x="112668" y="-17960" z="-1768" heading="20480" respawnTime="60sec" /> <!-- Border Patrol -->
-			<npc id="31677" x="111468" y="-12224" z="-1756" heading="20480" respawnTime="60sec" /> <!-- Border Patrol -->
+			<npc id="31677" x="111544" y="-12163" z="-1721" heading="20480" respawnTime="60sec" /> <!-- Border Patrol -->
 			<npc id="31679" x="114276" y="-17964" z="-1755" heading="60000" respawnTime="60sec" /> <!-- Eustace Van Essen -->
 			<npc id="30886" x="111468" y="-12224" z="-1712" heading="20480" respawnTime="60sec" /> <!-- Border Patrol -->
 			<npc id="20959" x="126163" y="-1353" z="-2376" heading="18529" respawnTime="37sec" /> <!-- Dark Guard -->
@@ -59,7 +57,7 @@
 			<npc id="20959" x="124862" y="-10414" z="-3808" respawnTime="37sec" /> <!-- Dark Guard -->
 			<npc id="31681" x="114656" y="-17824" z="-1756" heading="53000" respawnTime="60sec" /> <!-- Border Outpost Guard -->
 			<npc id="31681" x="114432" y="-18272" z="-1776" heading="2000" respawnTime="60sec" /> <!-- Border Outpost Guard -->
-			<npc id="31681" x="118964" y="-19340" z="-2715" heading="60000" respawnTime="60sec" /> <!-- Border Outpost Guard -->
+			<npc id="31681" x="119011" y="-19518" z="-2647" heading="60000" respawnTime="60sec" /> <!-- Border Outpost Guard -->
 			<npc id="31681" x="118604" y="-20412" z="-2752" respawnTime="60sec" /> <!-- Border Outpost Guard -->
 			<npc id="31681" x="116942" y="-19646" z="-2376" heading="60000" respawnTime="60sec" /> <!-- Border Outpost Guard -->
 			<npc id="31681" x="118912" y="-19584" z="-2924" heading="50000" respawnTime="60sec" /> <!-- Border Outpost Guard -->
@@ -68,7 +66,6 @@
 			<npc id="31681" x="118704" y="-20048" z="-2916" heading="3000" respawnTime="60sec" /> <!-- Border Outpost Guard -->
 			<npc id="30880" x="112816" y="-17856" z="-1697" heading="26000" respawnTime="60sec" /> <!-- Viktor Van Dake -->
 			<npc id="30881" x="112740" y="-17944" z="-1697" heading="20480" respawnTime="60sec" /> <!-- Sanders -->
-			<npc id="30882" x="112668" y="-17960" z="-1696" heading="20480" respawnTime="60sec" /> <!-- Border Patrol -->
 			<npc id="30889" x="110916" y="-10560" z="-1896" heading="22500" respawnTime="60sec" /> <!-- Border Patrol -->
 			<npc id="20963" x="120717" y="-4774" z="-4000" respawnTime="37sec" /> <!-- Bloody Lord -->
 			<npc id="20963" x="119084" y="-3184" z="-3872" respawnTime="37sec" /> <!-- Bloody Lord -->
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/spawns/old/23_17.xml b/L2J_Mobius_3.0_Helios/dist/game/data/spawns/old/23_17.xml
index b36c2fbab2..fd9de82188 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/spawns/old/23_17.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/spawns/old/23_17.xml
@@ -31,19 +31,17 @@
 			<npc id="31675" x="113824" y="-17936" z="-1773" heading="26000" respawnTime="60sec" /> <!-- Viktor Van Dake -->
 			<npc id="31677" x="113504" y="-17856" z="-1776" heading="20000" respawnTime="60sec" /> <!-- Border Patrol -->
 			<npc id="31677" x="113760" y="-17456" z="-1724" heading="31000" respawnTime="60sec" /> <!-- Border Patrol -->
-			<npc id="31677" x="110916" y="-10560" z="-1896" heading="22500" respawnTime="60sec" /> <!-- Border Patrol -->
+			<npc id="31677" x="110727" y="-10623" z="-1900" heading="22500" respawnTime="60sec" /> <!-- Border Patrol -->
 			<npc id="31677" x="109799" y="-10906" z="-1464" heading="19000" respawnTime="60sec" /> <!-- Border Patrol -->
 			<npc id="31677" x="110400" y="-10700" z="-1792" heading="19500" respawnTime="60sec" /> <!-- Border Patrol -->
 			<npc id="31677" x="111328" y="-10236" z="-1648" heading="23000" respawnTime="60sec" /> <!-- Border Patrol -->
-			<npc id="31677" x="111396" y="-11396" z="-1728" heading="21500" respawnTime="60sec" /> <!-- Border Patrol -->
-			<npc id="31677" x="110560" y="-11520" z="-1744" heading="12288" respawnTime="60sec" /> <!-- Border Patrol -->
+			<npc id="31677" x="111453" y="-11349" z="-1735" heading="21500" respawnTime="60sec" /> <!-- Border Patrol -->
+			<npc id="31677" x="110767" y="-11693" z="-1742" heading="12288" respawnTime="60sec" /> <!-- Border Patrol -->
 			<npc id="31677" x="112132" y="-14560" z="-1772" heading="28672" respawnTime="60sec" /> <!-- Border Patrol -->
 			<npc id="31677" x="112032" y="-15788" z="-1772" respawnTime="60sec" /> <!-- Border Patrol -->
-			<npc id="31677" x="111888" y="-17792" z="-1705" heading="16384" respawnTime="60sec" /> <!-- Border Patrol -->
-			<npc id="31677" x="112816" y="-17856" z="-1772" heading="26000" respawnTime="60sec" /> <!-- Border Patrol -->
-			<npc id="31677" x="112740" y="-17944" z="-1772" heading="20480" respawnTime="60sec" /> <!-- Border Patrol -->
+			<npc id="31677" x="111246" y="-18055" z="-1703" heading="16384" respawnTime="60sec" /> <!-- Border Patrol -->
 			<npc id="31677" x="112668" y="-17960" z="-1768" heading="20480" respawnTime="60sec" /> <!-- Border Patrol -->
-			<npc id="31677" x="111468" y="-12224" z="-1756" heading="20480" respawnTime="60sec" /> <!-- Border Patrol -->
+			<npc id="31677" x="111544" y="-12163" z="-1721" heading="20480" respawnTime="60sec" /> <!-- Border Patrol -->
 			<npc id="31679" x="114276" y="-17964" z="-1755" heading="60000" respawnTime="60sec" /> <!-- Eustace Van Essen -->
 			<npc id="30886" x="111468" y="-12224" z="-1712" heading="20480" respawnTime="60sec" /> <!-- Border Patrol -->
 			<npc id="20959" x="126163" y="-1353" z="-2376" heading="18529" respawnTime="37sec" /> <!-- Dark Guard -->
@@ -59,7 +57,7 @@
 			<npc id="20959" x="124862" y="-10414" z="-3808" respawnTime="37sec" /> <!-- Dark Guard -->
 			<npc id="31681" x="114656" y="-17824" z="-1756" heading="53000" respawnTime="60sec" /> <!-- Border Outpost Guard -->
 			<npc id="31681" x="114432" y="-18272" z="-1776" heading="2000" respawnTime="60sec" /> <!-- Border Outpost Guard -->
-			<npc id="31681" x="118964" y="-19340" z="-2715" heading="60000" respawnTime="60sec" /> <!-- Border Outpost Guard -->
+			<npc id="31681" x="119011" y="-19518" z="-2647" heading="60000" respawnTime="60sec" /> <!-- Border Outpost Guard -->
 			<npc id="31681" x="118604" y="-20412" z="-2752" respawnTime="60sec" /> <!-- Border Outpost Guard -->
 			<npc id="31681" x="116942" y="-19646" z="-2376" heading="60000" respawnTime="60sec" /> <!-- Border Outpost Guard -->
 			<npc id="31681" x="118912" y="-19584" z="-2924" heading="50000" respawnTime="60sec" /> <!-- Border Outpost Guard -->
@@ -68,7 +66,6 @@
 			<npc id="31681" x="118704" y="-20048" z="-2916" heading="3000" respawnTime="60sec" /> <!-- Border Outpost Guard -->
 			<npc id="30880" x="112816" y="-17856" z="-1697" heading="26000" respawnTime="60sec" /> <!-- Viktor Van Dake -->
 			<npc id="30881" x="112740" y="-17944" z="-1697" heading="20480" respawnTime="60sec" /> <!-- Sanders -->
-			<npc id="30882" x="112668" y="-17960" z="-1696" heading="20480" respawnTime="60sec" /> <!-- Border Patrol -->
 			<npc id="30889" x="110916" y="-10560" z="-1896" heading="22500" respawnTime="60sec" /> <!-- Border Patrol -->
 			<npc id="20963" x="120717" y="-4774" z="-4000" respawnTime="37sec" /> <!-- Bloody Lord -->
 			<npc id="20963" x="119084" y="-3184" z="-3872" respawnTime="37sec" /> <!-- Bloody Lord -->
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/spawns/old/23_17.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/spawns/old/23_17.xml
index b36c2fbab2..fd9de82188 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/spawns/old/23_17.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/spawns/old/23_17.xml
@@ -31,19 +31,17 @@
 			<npc id="31675" x="113824" y="-17936" z="-1773" heading="26000" respawnTime="60sec" /> <!-- Viktor Van Dake -->
 			<npc id="31677" x="113504" y="-17856" z="-1776" heading="20000" respawnTime="60sec" /> <!-- Border Patrol -->
 			<npc id="31677" x="113760" y="-17456" z="-1724" heading="31000" respawnTime="60sec" /> <!-- Border Patrol -->
-			<npc id="31677" x="110916" y="-10560" z="-1896" heading="22500" respawnTime="60sec" /> <!-- Border Patrol -->
+			<npc id="31677" x="110727" y="-10623" z="-1900" heading="22500" respawnTime="60sec" /> <!-- Border Patrol -->
 			<npc id="31677" x="109799" y="-10906" z="-1464" heading="19000" respawnTime="60sec" /> <!-- Border Patrol -->
 			<npc id="31677" x="110400" y="-10700" z="-1792" heading="19500" respawnTime="60sec" /> <!-- Border Patrol -->
 			<npc id="31677" x="111328" y="-10236" z="-1648" heading="23000" respawnTime="60sec" /> <!-- Border Patrol -->
-			<npc id="31677" x="111396" y="-11396" z="-1728" heading="21500" respawnTime="60sec" /> <!-- Border Patrol -->
-			<npc id="31677" x="110560" y="-11520" z="-1744" heading="12288" respawnTime="60sec" /> <!-- Border Patrol -->
+			<npc id="31677" x="111453" y="-11349" z="-1735" heading="21500" respawnTime="60sec" /> <!-- Border Patrol -->
+			<npc id="31677" x="110767" y="-11693" z="-1742" heading="12288" respawnTime="60sec" /> <!-- Border Patrol -->
 			<npc id="31677" x="112132" y="-14560" z="-1772" heading="28672" respawnTime="60sec" /> <!-- Border Patrol -->
 			<npc id="31677" x="112032" y="-15788" z="-1772" respawnTime="60sec" /> <!-- Border Patrol -->
-			<npc id="31677" x="111888" y="-17792" z="-1705" heading="16384" respawnTime="60sec" /> <!-- Border Patrol -->
-			<npc id="31677" x="112816" y="-17856" z="-1772" heading="26000" respawnTime="60sec" /> <!-- Border Patrol -->
-			<npc id="31677" x="112740" y="-17944" z="-1772" heading="20480" respawnTime="60sec" /> <!-- Border Patrol -->
+			<npc id="31677" x="111246" y="-18055" z="-1703" heading="16384" respawnTime="60sec" /> <!-- Border Patrol -->
 			<npc id="31677" x="112668" y="-17960" z="-1768" heading="20480" respawnTime="60sec" /> <!-- Border Patrol -->
-			<npc id="31677" x="111468" y="-12224" z="-1756" heading="20480" respawnTime="60sec" /> <!-- Border Patrol -->
+			<npc id="31677" x="111544" y="-12163" z="-1721" heading="20480" respawnTime="60sec" /> <!-- Border Patrol -->
 			<npc id="31679" x="114276" y="-17964" z="-1755" heading="60000" respawnTime="60sec" /> <!-- Eustace Van Essen -->
 			<npc id="30886" x="111468" y="-12224" z="-1712" heading="20480" respawnTime="60sec" /> <!-- Border Patrol -->
 			<npc id="20959" x="126163" y="-1353" z="-2376" heading="18529" respawnTime="37sec" /> <!-- Dark Guard -->
@@ -59,7 +57,7 @@
 			<npc id="20959" x="124862" y="-10414" z="-3808" respawnTime="37sec" /> <!-- Dark Guard -->
 			<npc id="31681" x="114656" y="-17824" z="-1756" heading="53000" respawnTime="60sec" /> <!-- Border Outpost Guard -->
 			<npc id="31681" x="114432" y="-18272" z="-1776" heading="2000" respawnTime="60sec" /> <!-- Border Outpost Guard -->
-			<npc id="31681" x="118964" y="-19340" z="-2715" heading="60000" respawnTime="60sec" /> <!-- Border Outpost Guard -->
+			<npc id="31681" x="119011" y="-19518" z="-2647" heading="60000" respawnTime="60sec" /> <!-- Border Outpost Guard -->
 			<npc id="31681" x="118604" y="-20412" z="-2752" respawnTime="60sec" /> <!-- Border Outpost Guard -->
 			<npc id="31681" x="116942" y="-19646" z="-2376" heading="60000" respawnTime="60sec" /> <!-- Border Outpost Guard -->
 			<npc id="31681" x="118912" y="-19584" z="-2924" heading="50000" respawnTime="60sec" /> <!-- Border Outpost Guard -->
@@ -68,7 +66,6 @@
 			<npc id="31681" x="118704" y="-20048" z="-2916" heading="3000" respawnTime="60sec" /> <!-- Border Outpost Guard -->
 			<npc id="30880" x="112816" y="-17856" z="-1697" heading="26000" respawnTime="60sec" /> <!-- Viktor Van Dake -->
 			<npc id="30881" x="112740" y="-17944" z="-1697" heading="20480" respawnTime="60sec" /> <!-- Sanders -->
-			<npc id="30882" x="112668" y="-17960" z="-1696" heading="20480" respawnTime="60sec" /> <!-- Border Patrol -->
 			<npc id="30889" x="110916" y="-10560" z="-1896" heading="22500" respawnTime="60sec" /> <!-- Border Patrol -->
 			<npc id="20963" x="120717" y="-4774" z="-4000" respawnTime="37sec" /> <!-- Bloody Lord -->
 			<npc id="20963" x="119084" y="-3184" z="-3872" respawnTime="37sec" /> <!-- Bloody Lord -->
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/spawnlist.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/spawnlist.sql
index 0431d0232f..62cc833936 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/spawnlist.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/spawnlist.sql
@@ -29811,26 +29811,24 @@ INSERT INTO `spawnlist` VALUES
 (58615,'aden17_npc2317_03',1,'31677',113760,-17456,-1824,0,0,31000,60,0,0),
 (58616,'aden17_npc2317_04',1,'31681',114656,-17824,-1856,0,0,53000,60,0,0),
 (58617,'aden17_npc2317_04',1,'31681',114432,-18272,-1840,0,0,2000,60,0,0),
-(58618,'aden17_npc2317_04',1,'31681',118964,-19340,-2815,0,0,60000,60,0,0),
+(58618,'aden17_npc2317_04',1,'31681',119011,-19518,-2647,0,0,60000,60,0,0),
 (58619,'aden17_npc2317_04',1,'31681',118604,-20412,-2832,0,0,0,60,0,0),
 (58620,'aden17_npc2317_04',1,'31681',116942,-19646,-2451,0,0,60000,60,0,0),
 (58621,'aden17_npc2317_04',1,'31681',118912,-19584,-3024,0,0,50000,60,0,0),
 (58622,'aden17_npc2317_04',1,'31681',118816,-19536,-2992,0,0,50000,60,0,0),
 (58623,'aden17_npc2317_04',1,'31681',118800,-20096,-3036,0,0,3000,60,0,0),
 (58624,'aden17_npc2317_04',1,'31681',118704,-20048,-3016,0,0,3000,60,0,0),
-(58625,'aden17_npc2317_03',1,'31677',110916,-10560,-1996,0,0,22500,60,0,0),
+(58625,'aden17_npc2317_03',1,'31677',110727,-10623,-1900,0,0,22500,60,0,0),
 (58626,'aden17_npc2317_03',1,'31677',109799,-10906,-1464,0,0,19000,60,0,0),
 (58627,'aden17_npc2317_03',1,'31677',110400,-10700,-1771,0,0,19500,60,0,0),
 (58628,'aden17_npc2317_03',1,'31677',111328,-10236,-1696,0,0,23000,60,0,0),
-(58629,'aden17_npc2317_03',1,'31677',111396,-11396,-1824,0,0,21500,60,0,0),
-(58630,'aden17_npc2317_03',1,'31677',110560,-11520,-1824,0,0,12288,60,0,0),
+(58629,'aden17_npc2317_03',1,'31677',111453,-11349,-1735,0,0,21500,60,0,0),
+(58630,'aden17_npc2317_03',1,'31677',110767,-11693,-1742,0,0,12288,60,0,0),
 (58631,'aden17_npc2317_03',1,'31677',112132,-14560,-1872,0,0,28672,60,0,0),
 (58632,'aden17_npc2317_03',1,'31677',112032,-15788,-1872,0,0,0,60,0,0),
-(58633,'aden17_npc2317_03',1,'31677',111888,-17792,-1805,0,0,16384,60,0,0),
-(58634,'aden17_npc2317_03',1,'31677',112816,-17856,-1872,0,0,26000,60,0,0),
-(58635,'aden17_npc2317_03',1,'31677',112740,-17944,-1872,0,0,20480,60,0,0),
+(58633,'aden17_npc2317_03',1,'31677',111246,-18055,-1703,0,0,16384,60,0,0),
 (58636,'aden17_npc2317_03',1,'31677',112668,-17960,-1868,0,0,20480,60,0,0),
-(58637,'aden17_npc2317_03',1,'31677',111468,-12224,-1856,0,0,20480,60,0,0),
+(58637,'aden17_npc2317_03',1,'31677',111544,-12163,-1721,0,0,20480,60,0,0),
 (58638,'aden02_npc2318_01',1,'30949',110831,15973,-4368,0,0,412,60,0,0),
 (58639,'aden02_npc2318_01',1,'30952',110828,15934,-4384,0,0,228,60,0,0),
 (58640,'aden02_npc2318_02',1,'30950',114112,20042,944,0,0,50148,60,0,0),
@@ -30417,7 +30415,6 @@ INSERT INTO `spawnlist` VALUES
 -- (70012,'ClassChange_DW',1,'31228',115774,-178666,-958,0,0,31430,15,0,0),
 -- (70011,'ClassChange_DE',1,'31228',11283,15951,-4584,0,0,13344,15,0,0),
 (70010,'23_17_NPC_031201_11',1,'30886',111468,-12224,-1781,0,0,20480,60,0,0),
-(70009,'23_17_NPC_031201_10',1,'30882',112668,-17960,-1793,0,0,20480,60,0,0),
 (70008,'23_17_NPC_031201_10',1,'30881',112740,-17944,-1797,0,0,20480,60,0,0),
 (70007,'23_17_NPC_031201_10',1,'30880',112816,-17856,-1797,0,0,26000,60,0,0),
 (70006,'23_17_NPC_031201_09',1,'30883',111888,-17792,-1730,0,0,16384,60,0,0),
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawns/HighFiveSpawns.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawns/HighFiveSpawns.xml
index 2091f30674..3df4de5b94 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawns/HighFiveSpawns.xml
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawns/HighFiveSpawns.xml
@@ -26163,7 +26163,7 @@
 		<npc id="22824" x="110559" y="112834" z="-2832" heading="35412" respawnDelay="60" />
 		<npc id="18913" x="110560" y="-82415" z="-1584" heading="23222" respawnDelay="60" />
 		<npc id="30887" x="110560" y="-11520" z="-1749" heading="12288" respawnDelay="60" />
-		<npc id="31677" x="110560" y="-11520" z="-1824" heading="12288" respawnDelay="60" />
+		<npc id="31677" x="110767" y="-11693" z="-1742" heading="12288" respawnDelay="60" />
 		<npc id="20804" x="110565" y="181665" z="-3692" heading="8818" respawnDelay="60" />
 		<npc id="18913" x="110566" y="-82250" z="-1584" heading="26213" respawnDelay="60" />
 		<npc id="18913" x="110568" y="-82092" z="-1584" heading="20745" respawnDelay="60" />
@@ -26222,7 +26222,7 @@
 		<npc id="20594" x="110899" y="39555" z="-3819" heading="0" respawnDelay="80" />
 		<npc id="21368" x="110900" y="-56948" z="-2884" heading="0" respawnDelay="109" />
 		<npc id="30889" x="110916" y="-10560" z="-1921" heading="22500" respawnDelay="60" />
-		<npc id="31677" x="110916" y="-10560" z="-1996" heading="22500" respawnDelay="60" />
+		<npc id="31677" x="110727" y="-10623" z="-1900" heading="22500" respawnDelay="60" />
 		<npc id="20135" x="110926" y="186004" z="-3860" heading="0" respawnDelay="30" />
 		<npc id="20135" x="110926" y="187072" z="-3860" heading="0" respawnDelay="30" />
 		<npc id="21366" x="110933" y="-54906" z="-2845" heading="26464" respawnDelay="109" />
@@ -26287,7 +26287,7 @@
 		<npc id="21148" x="111387" y="178642" z="-5432" heading="0" respawnDelay="60" />
 		<npc id="20806" x="111391" y="181323" z="-3759" heading="39432" respawnDelay="60" />
 		<npc id="30888" x="111396" y="-11396" z="-1749" heading="21500" respawnDelay="60" />
-		<npc id="31677" x="111396" y="-11396" z="-1824" heading="21500" respawnDelay="60" />
+		<npc id="31677" x="111453" y="-11349" z="-1735" heading="21500" respawnDelay="60" />
 		<npc id="22018" x="111397" y="-157324" z="-1911" heading="11535" respawnDelay="60" />
 		<npc id="20805" x="111404" y="168021" z="-3352" heading="58053" respawnDelay="60" />
 		<npc id="21148" x="111411" y="178384" z="-5432" heading="0" respawnDelay="60" />
@@ -26296,7 +26296,7 @@
 		<npc id="21195" x="111427" y="178856" z="-5432" heading="0" respawnDelay="60" />
 		<npc id="21368" x="111465" y="-43874" z="-2610" heading="64009" respawnDelay="109" />
 		<npc id="30886" x="111468" y="-12224" z="-1781" heading="20480" respawnDelay="60" />
-		<npc id="31677" x="111468" y="-12224" z="-1856" heading="20480" respawnDelay="60" />
+		<npc id="31677" x="111544" y="-12163" z="-1721" heading="20480" respawnDelay="60" />
 		<npc id="20597" x="111478" y="52956" z="-3784" heading="0" respawnDelay="80" />
 		<npc id="18910" x="111482" y="-80295" z="-3520" heading="60558" respawnDelay="60" />
 		<npc id="30925" x="111487" y="224587" z="-3549" heading="46320" respawnDelay="60" />
@@ -26360,7 +26360,7 @@
 		<npc id="22798" x="111884" y="-79712" z="-1632" heading="55594" respawnDelay="60" />
 		<npc id="22799" x="111885" y="-79273" z="-1600" heading="29845" respawnDelay="60" />
 		<npc id="30883" x="111888" y="-17792" z="-1730" heading="16384" respawnDelay="60" />
-		<npc id="31677" x="111888" y="-17792" z="-1805" heading="16384" respawnDelay="60" />
+		<npc id="31677" x="111246" y="-18055" z="-1703" heading="16384" respawnDelay="60" />
 		<npc id="21365" x="111894" y="-54302" z="-2802" heading="10041" respawnDelay="109" />
 		<npc id="22824" x="111897" y="117845" z="-3008" heading="9231" respawnDelay="60" />
 		<npc id="20804" x="111899" y="188668" z="-3761" heading="26374" respawnDelay="60" />
@@ -26511,7 +26511,6 @@
 		<npc id="35180" x="112661" y="144757" z="-2817" heading="32768" respawnDelay="10800" />
 		<npc id="22822" x="112662" y="109861" z="-2976" heading="27873" respawnDelay="60" />
 		<npc id="21148" x="112664" y="177339" z="-5432" heading="0" respawnDelay="60" />
-		<npc id="30882" x="112668" y="-17960" z="-1793" heading="20480" respawnDelay="60" />
 		<npc id="31677" x="112668" y="-17960" z="-1868" heading="20480" respawnDelay="60" />
 		<npc id="22082" x="112670" y="-101938" z="-3646" heading="62837" respawnDelay="60" />
 		<npc id="21350" x="112675" y="-37481" z="-3384" heading="39681" respawnDelay="109" />
@@ -26534,7 +26533,6 @@
 		<npc id="21217" x="112736" y="176795" z="-5432" heading="0" respawnDelay="60" />
 		<npc id="20821" x="112737" y="15570" z="-641" heading="0" respawnDelay="165" />
 		<npc id="30881" x="112740" y="-17944" z="-1797" heading="20480" respawnDelay="60" />
-		<npc id="31677" x="112740" y="-17944" z="-1872" heading="20480" respawnDelay="60" />
 		<npc id="22084" x="112741" y="-101203" z="-3646" heading="62692" respawnDelay="60" />
 		<npc id="22824" x="112748" y="115406" z="-3224" heading="57680" respawnDelay="60" />
 		<npc id="20593" x="112749" y="36772" z="-3569" heading="0" respawnDelay="80" />
@@ -26551,7 +26549,6 @@
 		<npc id="32028" x="112801" y="-76510" z="85" heading="0" respawnDelay="60" />
 		<npc id="22824" x="112813" y="115325" z="-3224" heading="59413" respawnDelay="60" />
 		<npc id="30880" x="112816" y="-17856" z="-1797" heading="26000" respawnDelay="60" />
-		<npc id="31677" x="112816" y="-17856" z="-1872" heading="26000" respawnDelay="60" />
 		<npc id="20595" x="112817" y="55472" z="-3722" heading="57407" respawnDelay="80" />
 		<npc id="20592" x="112820" y="38454" z="-3562" heading="0" respawnDelay="80" />
 		<npc id="22824" x="112820" y="111620" z="-2728" heading="49953" respawnDelay="60" />
@@ -28188,7 +28185,7 @@
 		<npc id="20592" x="118961" y="53801" z="-3736" heading="0" respawnDelay="80" />
 		<npc id="22085" x="118964" y="-120531" z="-2889" heading="13907" respawnDelay="60" />
 		<npc id="22789" x="118964" y="-76428" z="-3392" heading="50324" respawnDelay="60" />
-		<npc id="31681" x="118964" y="-19340" z="-2815" heading="60000" respawnDelay="60" />
+		<npc id="31681" x="119011" y="-19518" z="-2647" heading="60000" respawnDelay="60" />
 		<npc id="20605" x="118965" y="86339" z="-2899" heading="36684" respawnDelay="25" />
 		<npc id="21363" x="118984" y="-57688" z="-2568" heading="0" respawnDelay="109" />
 		<npc id="20596" x="118993" y="46743" z="-3357" heading="57641" respawnDelay="80" />