diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/residences/clanHalls/Goddard/EmeraldHall.xml b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/residences/clanHalls/Goddard/EmeraldHall.xml
new file mode 100644
index 0000000000..e6edf5712e
--- /dev/null
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/residences/clanHalls/Goddard/EmeraldHall.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../xsd/clanHall.xsd">
+	<clanHall id="49" name="Emerald Hall" grade="GRADE_S" type="AUCTIONABLE">
+	 	<auction minBid="10000000" lease="1000000" deposit="1000000" />
+	 	<npcs>
+	 	   	<npc id="35466" /> <!-- Gerard -->
+   			<npc id="35465" /> <!-- Millicent -->
+	 	</npcs>
+	 	<doorlist>
+	 		<door id="24160005" />
+	 		<door id="24160006" />
+	 	</doorlist>
+	 	<ownerRestartPoint x="148480" y="-56848" z="-2765" />
+		<banishPoint x="147712" y="-58432" z="-2979" />
+	</clanHall>
+</list>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/residences/clanHalls/Goddard/MoonstoneHall.xml b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/residences/clanHalls/Goddard/MoonstoneHall.xml
new file mode 100644
index 0000000000..7a40ad43ea
--- /dev/null
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/residences/clanHalls/Goddard/MoonstoneHall.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../xsd/clanHall.xsd">
+	<clanHall id="47" name="Moonstone Hall" grade="GRADE_S" type="AUCTIONABLE">
+	 	<auction minBid="10000000" lease="1000000" deposit="1000000" />
+	 	<npcs>
+	 	   	<npc id="35462" /> <!-- Kalmer -->
+   			<npc id="35461" /> <!-- Aida -->
+	 	</npcs>
+	 	<doorlist>
+	 		<door id="24160001" />
+	 		<door id="24160002" />
+	 	</doorlist>
+	 	<ownerRestartPoint x="146022" y="-55560" z="-2765" />
+		<banishPoint x="147712" y="-58432" z="-2979" />
+	</clanHall>
+</list>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/residences/clanHalls/Goddard/OnyxHall.xml b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/residences/clanHalls/Goddard/OnyxHall.xml
new file mode 100644
index 0000000000..283fb8afbe
--- /dev/null
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/residences/clanHalls/Goddard/OnyxHall.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../xsd/clanHall.xsd">
+	<clanHall id="48" name="Onyx Hall" grade="GRADE_S" type="AUCTIONABLE">
+	 	<auction minBid="10000000" lease="1000000" deposit="1000000" />
+	 	<npcs>
+	 	   	<npc id="35464" /> <!-- Volfrem -->
+   			<npc id="35463" /> <!-- Helga -->
+	 	</npcs>
+	 	<doorlist>
+	 		<door id="24160003" />
+	 		<door id="24160004" />
+	 	</doorlist>
+	 	<ownerRestartPoint x="146960" y="-56768" z="-2765" />
+		<banishPoint x="147712" y="-58432" z="-2979" />
+	</clanHall>
+</list>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/residences/clanHalls/Goddard/SapphireHall.xml b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/residences/clanHalls/Goddard/SapphireHall.xml
new file mode 100644
index 0000000000..c3ed5b69ed
--- /dev/null
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/residences/clanHalls/Goddard/SapphireHall.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../xsd/clanHall.xsd">
+	<clanHall id="50" name="Sapphire Hall" grade="GRADE_S" type="AUCTIONABLE">
+	 	<auction minBid="10000000" lease="1000000" deposit="1000000" />
+	 	<npcs>
+	 	   	<npc id="35468" /> <!-- Lambert -->
+   			<npc id="35467" /> <!-- Branhillde -->
+	 	</npcs>
+	 	<doorlist>
+	 		<door id="24160007" />
+	 		<door id="24160008" />
+	 	</doorlist>
+	 	<ownerRestartPoint x="149376" y="-55568" z="-2765" />
+		<banishPoint x="147712" y="-58432" z="-2979" />
+	</clanHall>
+</list>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager-funcTeleport.html b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager-funcTeleport.html
deleted file mode 100644
index e781aab4a3..0000000000
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager-funcTeleport.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>&$556;<br>
-<br>
-%teleportList%
-<br>
-</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager-manageFuncRecovery.html b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager-manageFuncRecovery.html
deleted file mode 100644
index 87f981d0c5..0000000000
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager-manageFuncRecovery.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<html><body><br>
-<font color="LEVEL">[Clan Hall Facility Management]</font><br>
-<table width=100% cellspacing=2 cellpadding=0>
-<tr>
-<td width=60><font color="999999">Function</font></td>
-<td width=220><font color="LEVEL">HP Recovery</font> <font color="00FFFF">%HPrecovery%</font> %HPprice%</td>
-</tr>
-<tr>
-<td><font color="999999">Period</font></td>
-<td>%HPexpire%</td>
-</tr>
-<tr>
-<td><font color="999999">Change</font><br></td>
-<td>%HPdeactive%[<a action="bypass -h Quest ClanHallManager manageFunctions selectFunction 1 1">200%</a>][<a action="bypass -h Quest ClanHallManager manageFunctions selectFunction 1 2">300%</a>][<a action="bypass -h Quest ClanHallManager manageFunctions selectFunction 1 3">500%</a>][<a action="bypass -h Quest ClanHallManager manageFunctions selectFunction 1 4">700%</a>][<a action="bypass -h Quest ClanHallManager manageFunctions selectFunction 1 5">1000%</a>]<br></td>
-</tr>
-
-<tr>
-<td><font color="999999">Function</font></td>
-<td><font color="LEVEL">MP Recovery</font> <font color="00FFFF">%MPrecovery%</font> %MPprice%</td>
-</tr>
-<tr>
-<td><font color="999999">Period</font></td>
-<td>%MPexpire%</td>
-</tr>
-<tr>
-<td><font color="999999">Change</font><br></td>
-<td>%MPdeactive%[<a action="bypass -h Quest ClanHallManager manageFunctions selectFunction 2 1">500%</a>][<a action="bypass -h Quest ClanHallManager manageFunctions selectFunction 2 2">1000%</a>][<a action="bypass -h Quest ClanHallManager manageFunctions selectFunction 2 3">2000%</a>][<a action="bypass -h Quest ClanHallManager manageFunctions selectFunction 2 4">3000%]</a><br></td>
-</tr>
-
-<tr>
-<td><font color="999999">Function</font></td>
-<td><font color="LEVEL">XP Recovery</font> <font color="00FFFF">%XPrecovery%</font> %XPprice%</td>
-</tr>
-<tr>
-<td><font color="999999">Period</font></td>
-<td>%XPexpire%</td>
-</tr>
-<tr>
-<td><font color="999999">Change</font><br></td>
-<td>%XPdeactive%[<a action="bypass -h Quest ClanHallManager manageFunctions selectFunction 3 1">35%</a>][<a action="bypass -h Quest ClanHallManager manageFunctions selectFunction 3 2">45%</a>][<a action="bypass -h Quest ClanHallManager manageFunctions selectFunction 3 3">55%</a>][<a action="bypass -h Quest ClanHallManager manageFunctions selectFunction 3 4">70%</a>]<br></td>
-</tr>
-</table>
-<br><button action="bypass -h Quest ClanHallManager manageFunctions" value="Back" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF">
-</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
index 6a018c3bd3..54982c4934 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
@@ -48,9 +48,6 @@ import ai.AbstractNpcAI;
 public final class ClanHallManager extends AbstractNpcAI
 {
 	// NPCs
-	//	35461, 35463, 35465, 35467, // Goddard
-	//	35566, 35568, 35570, 35572, 35574, 35576, 35578, // Rune
-	//	35580, 35582, 35584, 35586, // Schuttgart
 	// @formatter:off
 	private static final int[] CLANHALL_MANAGERS =
 	{
@@ -59,6 +56,9 @@ public final class ClanHallManager extends AbstractNpcAI
 		35403, 35405, 35407, // Dion
 		35439, 35441, 35443, 35445, 35447, 35449, // Aden
 		35451, 35453, 35455, 35457, 35459, // Giran
+		35461, 35463, 35465, 35467, // Goddard
+		35566, 35568, 35570, 35572, 35574, 35576, 35578, // Rune
+		35580, 35582, 35584, 35586, // Schuttgart
 		36721, 36723, 36725, 36727, // Gludio Outskirts
 		36729, 36731, 36733, 36735, // Dion Outskirts
 		36737, 36739, // Floran Village
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/spawns/Goddard/Goddard.xml b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/spawns/Goddard/Goddard.xml
deleted file mode 100644
index c6b32d6881..0000000000
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/spawns/Goddard/Goddard.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
-	<spawn name="Goddard">
-		<group>
-			<npc id="31651" x="65976" y="29864" z="-3744" heading="0" respawnTime="360sec" />
-		</group>
-	</spawn>
-</list>
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/spawns/Goddard/Goddard_24_16.xml b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/spawns/Goddard/Goddard_24_16.xml
index 1f7a7f7169..5bbd2aa1d9 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/spawns/Goddard/Goddard_24_16.xml
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/spawns/Goddard/Goddard_24_16.xml
@@ -1,54 +1,5 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
-	<spawn name="TownofGoddard">
-    <group>	
-		    <npc id="30012" x="149352" y="-57452" z="-2968" heading="38184" respawnTime="60sec" />
-		    <npc id="31257" x="148975" y="-58919" z="-2960" heading="22000" respawnTime="60sec" />
-		    <npc id="31258" x="149012" y="-58894" z="-2960" heading="22000" respawnTime="60sec" />
-		    <npc id="31260" x="149380" y="-57590" z="-2968" heading="32000" respawnTime="60sec" />
-		    <npc id="31263" x="149312" y="-57360" z="-2966" heading="40000" respawnTime="60sec" />
-		    <npc id="31264" x="149008" y="-57696" z="-2968" heading="5000" respawnTime="60sec" />
-		    <npc id="31267" x="146440" y="-57500" z="-2960" heading="43000" respawnTime="60sec" />
-		    <npc id="31268" x="146412" y="-57484" z="-2960" heading="43000" respawnTime="60sec" />
-		    <npc id="31269" x="146528" y="-57936" z="-2960" heading="22000" respawnTime="60sec" />
-		    <npc id="31270" x="146172" y="-57380" z="-2960" heading="54000" respawnTime="60sec" />
-		    <npc id="31271" x="146396" y="-58696" z="-2968" heading="60000" respawnTime="60sec" />
-		    <npc id="31272" x="146432" y="-58784" z="-2968" heading="0" respawnTime="60sec" />
-		    <npc id="31275" x="147966" y="-55228" z="-2712" heading="48000" respawnTime="60sec" />
-		    <npc id="31276" x="148880" y="-52608" z="-2728" heading="49500" respawnTime="60sec" />
-		    <npc id="31277" x="149008" y="-52560" z="-2728" heading="49500" respawnTime="60sec" />
-		    <npc id="31278" x="148736" y="-52560" z="-2728" heading="49500" respawnTime="60sec" />
-		    <npc id="31279" x="147712" y="-52688" z="-2728" heading="49000" respawnTime="60sec" />
-		    <npc id="31280" x="148048" y="-52416" z="-2728" heading="49000" respawnTime="60sec" />
-		    <npc id="31281" x="147376" y="-52416" z="-2728" heading="49000" respawnTime="60sec" />
-		    <npc id="31282" x="146688" y="-52576" z="-2728" heading="49500" respawnTime="60sec" />
-		    <npc id="31283" x="146416" y="-52564" z="-2728" heading="49500" respawnTime="60sec" />
-		    <npc id="31285" x="145080" y="-54592" z="-2960" heading="45000" respawnTime="60sec" />
-		    <npc id="31286" x="144808" y="-54732" z="-2960" heading="62000" respawnTime="60sec" />
-		    <npc id="31287" x="145168" y="-54880" z="-2960" heading="28000" respawnTime="60sec" />
-		    <npc id="31288" x="144204" y="-55780" z="-2960" heading="2000" respawnTime="60sec" />
-		    <npc id="31289" x="144228" y="-55720" z="-2960" heading="60000" respawnTime="60sec" />
-		    <npc id="31290" x="144256" y="-55824" z="-2960" heading="8000" respawnTime="60sec" />
-		    <npc id="31292" x="149216" y="-56544" z="-2776" heading="27000" respawnTime="60sec" />
-		    <npc id="31293" x="149360" y="-56336" z="-2776" heading="27000" respawnTime="60sec" />
-		    <npc id="31294" x="144584" y="-57904" z="-2976" heading="32000" respawnTime="60sec" />
-		    <npc id="31295" x="144364" y="-57580" z="-2976" heading="44000" respawnTime="60sec" />
-		    <npc id="31296" x="147920" y="-59424" z="-2976" heading="45000" respawnTime="60sec" />
-		    <npc id="31297" x="147504" y="-59424" z="-2976" heading="53000" respawnTime="60sec" />
-		    <npc id="31298" x="151060" y="-57576" z="-2976" heading="53000" respawnTime="60sec" />
-		    <npc id="31299" x="150832" y="-57904" z="-2976" heading="0" respawnTime="60sec" />
-		    <npc id="31583" x="146428" y="-58880" z="-2968" heading="28000" respawnTime="60sec" />
-		    <npc id="31585" x="146688" y="-52592" z="-2728" heading="16000" respawnTime="60sec" />
-		    <npc id="31587" x="146553" y="-52608" z="-2728" heading="49500" respawnTime="60sec" />
-		    <npc id="31589" x="144340" y="-55752" z="-2960" heading="35000" respawnTime="60sec" />
-		    <npc id="31673" x="147900" y="-61196" z="-3504" heading="49000" respawnTime="60sec" />
-		    <npc id="31674" x="145464" y="-56776" z="-2976" heading="39000" respawnTime="60sec" />
-		    <npc id="31688" x="147472" y="-55232" z="-2728" heading="49000" respawnTime="60sec" />
-		    <npc id="31690" x="147408" y="-55232" z="-2728" heading="49000" respawnTime="60sec" />
-		    <npc id="32478" x="146119" y="-57898" z="-2976" heading="44000" respawnTime="60sec" />
-		    <npc id="34053" x="148118" y="-56556" z="-2776" heading="21641" respawnTime="60sec" />
-         </group>
-         </spawn>
-		 <spawn>
+	<spawn>
 		<territories>
 			<territory name="godard04_2416_87" minZ="-3209" maxZ="-3009">							
 				<node x="136364" y="-48115" />
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/spawns/Goddard/TownOfGoddard.xml b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/spawns/Goddard/TownOfGoddard.xml
new file mode 100644
index 0000000000..9e81ff4754
--- /dev/null
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/spawns/Goddard/TownOfGoddard.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="TownOfGoddard">
+		<group>
+			<npc id="30767" x="149272" y="-55888" z="-2760" heading="48000" respawnTime="60sec" > <!-- Auctioneer -->
+				<parameters>
+					<param name="fnAgitMap" value="godard"/>
+				</parameters>
+			</npc>
+			<npc id="35461" x="146416" y="-55568" z="-2760" heading="32000" respawnTime="60sec" /> <!-- Aida -->
+			<npc id="35462" x="146488" y="-55432" z="-2776" heading="1000" respawnTime="60sec" /> <!-- Kalmer -->
+			<npc id="35463" x="147134" y="-56576" z="-2760" heading="44000" respawnTime="60sec" /> <!-- Helga -->
+			<npc id="35464" x="147072" y="-56416" z="-2776" heading="11500" respawnTime="60sec" /> <!-- Volfrem -->
+			<npc id="35465" x="148381" y="-56525" z="-2760" heading="54000" respawnTime="60sec" /> <!-- Millicent -->
+			<npc id="35466" x="148224" y="-56496" z="-2760" heading="21000" respawnTime="60sec" /> <!-- Gerard -->
+			<npc id="35467" x="149024" y="-55456" z="-2760" respawnTime="60sec" /> <!-- Branhillde -->
+			<npc id="35468" x="148912" y="-55568" z="-2760" heading="32000" respawnTime="60sec" /> <!-- Lambert -->
+			<npc id="30012" x="149352" y="-57452" z="-2968" heading="38184" respawnTime="60sec" />
+			<npc id="31257" x="148975" y="-58919" z="-2960" heading="22000" respawnTime="60sec" />
+			<npc id="31258" x="149012" y="-58894" z="-2960" heading="22000" respawnTime="60sec" />
+			<npc id="31260" x="149380" y="-57590" z="-2968" heading="32000" respawnTime="60sec" />
+			<npc id="31263" x="149312" y="-57360" z="-2966" heading="40000" respawnTime="60sec" />
+			<npc id="31264" x="149008" y="-57696" z="-2968" heading="5000" respawnTime="60sec" />
+			<npc id="31267" x="146440" y="-57500" z="-2960" heading="43000" respawnTime="60sec" />
+			<npc id="31268" x="146412" y="-57484" z="-2960" heading="43000" respawnTime="60sec" />
+			<npc id="31269" x="146528" y="-57936" z="-2960" heading="22000" respawnTime="60sec" />
+			<npc id="31270" x="146172" y="-57380" z="-2960" heading="54000" respawnTime="60sec" />
+			<npc id="31271" x="146396" y="-58696" z="-2968" heading="60000" respawnTime="60sec" />
+			<npc id="31272" x="146432" y="-58784" z="-2968" heading="0" respawnTime="60sec" />
+			<npc id="31275" x="147966" y="-55228" z="-2712" heading="48000" respawnTime="60sec" />
+			<npc id="31276" x="148880" y="-52608" z="-2728" heading="49500" respawnTime="60sec" />
+			<npc id="31277" x="149008" y="-52560" z="-2728" heading="49500" respawnTime="60sec" />
+			<npc id="31278" x="148736" y="-52560" z="-2728" heading="49500" respawnTime="60sec" />
+			<npc id="31279" x="147712" y="-52688" z="-2728" heading="49000" respawnTime="60sec" />
+			<npc id="31280" x="148048" y="-52416" z="-2728" heading="49000" respawnTime="60sec" />
+			<npc id="31281" x="147376" y="-52416" z="-2728" heading="49000" respawnTime="60sec" />
+			<npc id="31282" x="146688" y="-52576" z="-2728" heading="49500" respawnTime="60sec" />
+			<npc id="31283" x="146416" y="-52564" z="-2728" heading="49500" respawnTime="60sec" />
+			<npc id="31285" x="145080" y="-54592" z="-2960" heading="45000" respawnTime="60sec" />
+			<npc id="31286" x="144808" y="-54732" z="-2960" heading="62000" respawnTime="60sec" />
+			<npc id="31287" x="145168" y="-54880" z="-2960" heading="28000" respawnTime="60sec" />
+			<npc id="31288" x="144204" y="-55780" z="-2960" heading="2000" respawnTime="60sec" />
+			<npc id="31289" x="144228" y="-55720" z="-2960" heading="60000" respawnTime="60sec" />
+			<npc id="31290" x="144256" y="-55824" z="-2960" heading="8000" respawnTime="60sec" />
+			<npc id="31292" x="149216" y="-56544" z="-2776" heading="27000" respawnTime="60sec" />
+			<npc id="31293" x="149360" y="-56336" z="-2776" heading="27000" respawnTime="60sec" />
+			<npc id="31294" x="144584" y="-57904" z="-2976" heading="32000" respawnTime="60sec" />
+			<npc id="31295" x="144364" y="-57580" z="-2976" heading="44000" respawnTime="60sec" />
+			<npc id="31296" x="147920" y="-59424" z="-2976" heading="45000" respawnTime="60sec" />
+			<npc id="31297" x="147504" y="-59424" z="-2976" heading="53000" respawnTime="60sec" />
+			<npc id="31298" x="151060" y="-57576" z="-2976" heading="53000" respawnTime="60sec" />
+			<npc id="31299" x="150832" y="-57904" z="-2976" heading="0" respawnTime="60sec" />
+			<npc id="31583" x="146428" y="-58880" z="-2968" heading="28000" respawnTime="60sec" />
+			<npc id="31585" x="146688" y="-52592" z="-2728" heading="16000" respawnTime="60sec" />
+			<npc id="31587" x="146553" y="-52608" z="-2728" heading="49500" respawnTime="60sec" />
+			<npc id="31589" x="144340" y="-55752" z="-2960" heading="35000" respawnTime="60sec" />
+			<npc id="31673" x="147900" y="-61196" z="-3504" heading="49000" respawnTime="60sec" />
+			<npc id="31674" x="145464" y="-56776" z="-2976" heading="39000" respawnTime="60sec" />
+			<npc id="31688" x="147472" y="-55232" z="-2728" heading="49000" respawnTime="60sec" />
+			<npc id="31690" x="147408" y="-55232" z="-2728" heading="49000" respawnTime="60sec" />
+			<npc id="32478" x="146119" y="-57898" z="-2976" heading="44000" respawnTime="60sec" />
+			<npc id="34053" x="148118" y="-56556" z="-2776" heading="21641" respawnTime="60sec" />
+		</group>
+	</spawn>
+</list>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/spawns/Goddard/Wall of Argos.xml b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/spawns/Goddard/WallOfArgos.xml
similarity index 100%
rename from L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/spawns/Goddard/Wall of Argos.xml
rename to L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/spawns/Goddard/WallOfArgos.xml
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/spawns/Oren/Oren.xml b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/spawns/Oren/Oren.xml
index 86142e07b1..1334332e22 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/spawns/Oren/Oren.xml
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/spawns/Oren/Oren.xml
@@ -411,6 +411,7 @@
 			<npc id="30133" x="27921" y="12991" z="-3728" heading="16500" respawnTime="60sec" />
 			<npc id="30130" x="25856" y="10832" z="-3724" heading="24576" respawnTime="60sec" />
 			<npc id="35189" x="84026" y="37191" z="-2272" heading="32768" respawnTime="60sec"/>
+			<npc id="31651" x="65976" y="29864" z="-3744" heading="0" respawnTime="360sec" />
 		</group>
 	</spawn>
 </list>

Function	HP Recovery %HPrecovery% %HPprice%
Period	%HPexpire%
Change	%HPdeactive%[200%][300%][500%][700%][1000%]
Function	MP Recovery %MPrecovery% %MPprice%
Period	%MPexpire%
Change	%MPdeactive%[500%][1000%][2000%][3000%]
Function	XP Recovery %XPrecovery% %XPprice%
Period	%XPexpire%
Change	%XPdeactive%[35%][45%][55%][70%]