diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/spawns/Goddard/ImperialTomb.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/spawns/Goddard/ImperialTomb.xml
index 01d7871840..f87399c893 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/spawns/Goddard/ImperialTomb.xml
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/spawns/Goddard/ImperialTomb.xml
@@ -6,7 +6,7 @@
 	
 		<group name="godard14_2515_03">
 			<territories>
-				<territory name="godard14_2515_03" minZ="-2484" maxZ="-2784">
+				<territory name="godard14_2515_03" minZ="-2784" maxZ="-2484">
 					<node x="183025" y="-78004" />
 					<node x="182081" y="-77103" />
 					<node x="180769" y="-77070" />
@@ -23,7 +23,7 @@
 		</group>
 		<group name="godard14_2515_04">
 			<territories>
-				<territory name="godard14_2515_04" minZ="-2478" maxZ="-2778">
+				<territory name="godard14_2515_04" minZ="-2778" maxZ="-2478">
 					<node x="179362" y="-75558" />
 					<node x="181659" y="-75562" />
 					<node x="181570" y="-75066" />
@@ -35,71 +35,71 @@
 		</group>
 		<group name="godard14_2515_05">
 			<territories>
-				<territory name="godard14_2515_05" minZ="-2478" maxZ="-2778">
+				<territory name="godard14_2515_05" minZ="-2778" maxZ="-2478">
 					<node x="177505" y="-75734" />
 					<node x="178286" y="-75713" />
 					<node x="178278" y="-74915" />
 					<node x="177532" y="-74910" />
 				</territory>
 			</territories>
+			<npc id="21397" count="3" respawnTime="30sec" respawnRandom="15sec" /> <!-- Carrion Scarab -->
 			<npc id="21398" count="2" respawnTime="30sec" respawnRandom="15sec" /> <!-- Soldier Scarab -->
-			<npc id="21399" count="2" respawnTime="180sec" respawnRandom="40sec" /> <!-- Soldier Scarab -->
-			<npc id="21402" count="1" respawnTime="40sec" respawnRandom="15sec" /> <!-- Katraxis -->
-			<npc id="21403" count="5" respawnTime="90sec" respawnRandom="25sec" /> <!-- Katraxis -->
+			<npc id="21399" count="1" respawnTime="180sec" respawnRandom="40sec" /> <!-- Soldier Scarab -->
+			<npc id="21402" count="1" respawnTime="45sec" respawnRandom="15sec" /> <!-- Katraxis -->
+			<npc id="21403" count="3" respawnTime="90sec" respawnRandom="25sec" /> <!-- Katraxis -->
 			<npc id="21405" count="2" respawnTime="40sec" respawnRandom="15sec" /> <!-- Tera Beetle -->
-			<npc id="21397" count="3" respawnTime="60sec" respawnRandom="15sec" /> <!-- Carrion Scarab -->
 		</group>
 		<group name="godard14_2515_06">
 			<territories>
-				<territory name="godard14_2515_06" minZ="-2475" maxZ="-2775">
+				<territory name="godard14_2515_06" minZ="-2775" maxZ="-2475">
 					<node x="174676" y="-75761" />
 					<node x="175457" y="-75739" />
 					<node x="175449" y="-74942" />
 					<node x="174703" y="-74937" />
 				</territory>
 			</territories>
+			<npc id="21396" count="3" respawnTime="30sec" respawnRandom="15sec" /> <!-- Carrion Scarab -->
 			<npc id="21398" count="2" respawnTime="30sec" respawnRandom="15sec" /> <!-- Soldier Scarab -->
-			<npc id="21399" count="2" respawnTime="180sec" respawnRandom="40sec" /> <!-- Soldier Scarab -->
+			<npc id="21399" count="1" respawnTime="180sec" respawnRandom="40sec" /> <!-- Soldier Scarab -->
 			<npc id="21402" count="1" respawnTime="40sec" respawnRandom="15sec" /> <!-- Katraxis -->
-			<npc id="21403" count="5" respawnTime="90sec" respawnRandom="25sec" /> <!-- Katraxis -->
+			<npc id="21403" count="3" respawnTime="90sec" respawnRandom="25sec" /> <!-- Katraxis -->
 			<npc id="21404" count="2" respawnTime="40sec" respawnRandom="15sec" /> <!-- Tera Beetle -->
-			<npc id="21396" count="3" respawnTime="60sec" respawnRandom="15sec" /> <!-- Carrion Scarab -->
 		</group>
 		<group name="godard14_2515_07">
 			<territories>
-				<territory name="godard14_2515_07" minZ="-3122" maxZ="-3422">
+				<territory name="godard14_2515_07" minZ="-3422" maxZ="-3122">
 					<node x="177556" y="-78584" />
 					<node x="178370" y="-78567" />
 					<node x="178368" y="-77809" />
 					<node x="177552" y="-77791" />
 				</territory>
 			</territories>
+			<npc id="21397" count="3" respawnTime="30sec" respawnRandom="15sec" /> <!-- Carrion Scarab -->
 			<npc id="21398" count="2" respawnTime="30sec" respawnRandom="15sec" /> <!-- Soldier Scarab -->
 			<npc id="21399" count="2" respawnTime="180sec" respawnRandom="40sec" /> <!-- Soldier Scarab -->
 			<npc id="21402" count="1" respawnTime="40sec" respawnRandom="15sec" /> <!-- Katraxis -->
-			<npc id="21403" count="5" respawnTime="90sec" respawnRandom="25sec" /> <!-- Katraxis -->
+			<npc id="21403" count="3" respawnTime="90sec" respawnRandom="25sec" /> <!-- Katraxis -->
 			<npc id="21405" count="2" respawnTime="40sec" respawnRandom="15sec" /> <!-- Tera Beetle -->
-			<npc id="21397" count="3" respawnTime="60sec" respawnRandom="15sec" /> <!-- Carrion Scarab -->
 		</group>
 		<group name="godard14_2515_08">
 			<territories>
-				<territory name="godard14_2515_08" minZ="-2470" maxZ="-2770">
+				<territory name="godard14_2515_08" minZ="-2770" maxZ="-2470">
 					<node x="174679" y="-78607" />
 					<node x="175464" y="-78600" />
 					<node x="175477" y="-77837" />
 					<node x="174673" y="-77829" />
 				</territory>
 			</territories>
+			<npc id="21396" count="3" respawnTime="30sec" respawnRandom="15sec" /> <!-- Carrion Scarab -->
 			<npc id="21398" count="2" respawnTime="30sec" respawnRandom="15sec" /> <!-- Soldier Scarab -->
-			<npc id="21399" count="2" respawnTime="180sec" respawnRandom="40sec" /> <!-- Soldier Scarab -->
+			<npc id="21399" count="1" respawnTime="180sec" respawnRandom="40sec" /> <!-- Soldier Scarab -->
 			<npc id="21402" count="1" respawnTime="40sec" respawnRandom="15sec" /> <!-- Katraxis -->
-			<npc id="21403" count="5" respawnTime="90sec" respawnRandom="25sec" /> <!-- Katraxis -->
+			<npc id="21403" count="3" respawnTime="90sec" respawnRandom="25sec" /> <!-- Katraxis -->
 			<npc id="21404" count="2" respawnTime="40sec" respawnRandom="15sec" /> <!-- Tera Beetle -->
-			<npc id="21396" count="3" respawnTime="60sec" respawnRandom="15sec" /> <!-- Carrion Scarab -->
 		</group>
 		<group name="godard14_2515_09">
 			<territories>
-				<territory name="godard14_2515_09" minZ="-3123" maxZ="-3423">
+				<territory name="godard14_2515_09" minZ="-3423" maxZ="-3123">
 					<node x="174736" y="-81498" />
 					<node x="175468" y="-81493" />
 					<node x="175512" y="-80681" />
@@ -114,7 +114,7 @@
 		</group>
 		<group name="godard14_2515_10">
 			<territories>
-				<territory name="godard14_2515_10" minZ="-3772" maxZ="-4072">
+				<territory name="godard14_2515_10" minZ="-4072" maxZ="-3772">
 					<node x="177583" y="-81446" />
 					<node x="178337" y="-81443" />
 					<node x="178350" y="-80638" />
@@ -129,7 +129,7 @@
 		</group>
 		<group name="godard14_2515_11">
 			<territories>
-				<territory name="godard14_2515_11" minZ="-4415" maxZ="-4715">
+				<territory name="godard14_2515_11" minZ="-4715" maxZ="-4415">
 					<node x="180439" y="-81438" />
 					<node x="181196" y="-81441" />
 					<node x="181202" y="-80595" />
@@ -144,7 +144,7 @@
 		</group>
 		<group name="godard14_2515_12">
 			<territories>
-				<territory name="godard14_2515_12" minZ="-5712" maxZ="-6012">
+				<territory name="godard14_2515_12" minZ="-6012" maxZ="-5712">
 					<node x="183282" y="-78507" />
 					<node x="184060" y="-78506" />
 					<node x="184047" y="-77708" />
@@ -160,7 +160,7 @@
 		</group>
 		<group name="godard14_2515_13">
 			<territories>
-				<territory name="godard14_2515_13" minZ="-6347" maxZ="-6647">
+				<territory name="godard14_2515_13" minZ="-6647" maxZ="-6347">
 					<node x="186143" y="-78512" />
 					<node x="186962" y="-78497" />
 					<node x="186952" y="-77690" />
@@ -168,15 +168,14 @@
 				</territory>
 			</territories>
 			<npc id="21401" count="3" respawnTime="40sec" respawnRandom="0sec" /> <!-- Hexa Beetle -->
-			<npc id="21406" count="2" respawnTime="40sec" respawnRandom="0sec" /> <!-- Knight of Empire -->
-			<npc id="21407" count="2" respawnTime="40sec" respawnRandom="0sec" /> <!-- Knight of Empire -->
+			<npc id="21407" count="3" respawnTime="40sec" respawnRandom="0sec" /> <!-- Knight of Empire -->
 			<npc id="21416" count="4" respawnTime="40sec" respawnRandom="0sec" /> <!-- Imperial Commander -->
 			<npc id="21432" count="3" respawnTime="40sec" respawnRandom="0sec" /> <!-- Chakram Beetle -->
 			<npc id="21424" count="2" respawnTime="40sec" respawnRandom="0sec" /> <!-- Ashkenas -->
 		</group>
 		<group name="godard14_2515_14">
 			<territories>
-				<territory name="godard14_2515_14" minZ="-7013" maxZ="-7313">
+				<territory name="godard14_2515_14" minZ="-7313" maxZ="-7013">
 					<node x="189041" y="-78487" />
 					<node x="189856" y="-78476" />
 					<node x="189845" y="-77747" />
@@ -184,60 +183,65 @@
 				</territory>
 			</territories>
 			<npc id="21401" count="3" respawnTime="40sec" respawnRandom="0sec" /> <!-- Hexa Beetle -->
-			<npc id="21406" count="2" respawnTime="40sec" respawnRandom="0sec" /> <!-- Knight of Empire -->
-			<npc id="21407" count="2" respawnTime="40sec" respawnRandom="0sec" /> <!-- Knight of Empire -->
+			<npc id="21406" count="3" respawnTime="40sec" respawnRandom="0sec" /> <!-- Knight of Empire -->
 			<npc id="21417" count="4" respawnTime="40sec" respawnRandom="0sec" /> <!-- Imperial Commander -->
 			<npc id="21432" count="3" respawnTime="40sec" respawnRandom="0sec" /> <!-- Chakram Beetle -->
 			<npc id="21424" count="2" respawnTime="40sec" respawnRandom="0sec" /> <!-- Ashkenas -->
 		</group>
 		<group name="godard14_2515_15">
 			<territories>
-				<territory name="godard14_2515_15" minZ="-5067" maxZ="-5367">
+				<territory name="godard14_2515_15" minZ="-5367" maxZ="-5067">
 					<node x="183286" y="-81378" />
 					<node x="184046" y="-81378" />
 					<node x="184034" y="-80596" />
 					<node x="183293" y="-80595" />
 				</territory>
 			</territories>
-			<npc id="21407" count="8" respawnTime="45sec" respawnRandom="20sec" /> <!-- Knight of Empire -->
-			<npc id="21414" count="5" respawnTime="45sec" respawnRandom="20sec" /> <!-- Assassin of Empire -->
-			<npc id="21418" count="3" respawnTime="45sec" respawnRandom="20sec" /> <!-- Imperial Royal Guard -->
+			<npc id="21407" count="2" respawnTime="45sec" respawnRandom="20sec" /> <!-- Knight of Empire -->
+			<npc id="21414" count="2" respawnTime="45sec" respawnRandom="20sec" /> <!-- Assassin of Empire -->
+			<npc id="21418" count="2" respawnTime="45sec" respawnRandom="20sec" /> <!-- Imperial Royal Guard -->
 			<npc id="21422" count="2" respawnTime="45sec" respawnRandom="20sec" /> <!-- Dancer of Empire -->
 			<npc id="21423" count="2" respawnTime="45sec" respawnRandom="20sec" /> <!-- Dancer of Empire -->
+			<npc id="21424" count="2" respawnTime="45sec" respawnRandom="20sec" /> <!-- Ashkenas -->
+			<npc id="21425" count="2" respawnTime="45sec" respawnRandom="20sec" /> <!-- Ashkenas -->
 		</group>
 		<group name="godard14_2515_16">
 			<territories>
-				<territory name="godard14_2515_16" minZ="-5715" maxZ="-6015">
+				<territory name="godard14_2515_16" minZ="-6015" maxZ="-5715">
 					<node x="186142" y="-81378" />
 					<node x="186961" y="-81360" />
 					<node x="186957" y="-80639" />
 					<node x="186164" y="-80573" />
 				</territory>
 			</territories>
-			<npc id="21407" count="8" respawnTime="45sec" respawnRandom="20sec" /> <!-- Knight of Empire -->
-			<npc id="21414" count="5" respawnTime="45sec" respawnRandom="20sec" /> <!-- Assassin of Empire -->
+			<npc id="21407" count="2" respawnTime="45sec" respawnRandom="20sec" /> <!-- Knight of Empire -->
+			<npc id="21414" count="2" respawnTime="45sec" respawnRandom="20sec" /> <!-- Assassin of Empire -->
 			<npc id="21418" count="2" respawnTime="45sec" respawnRandom="20sec" /> <!-- Imperial Royal Guard -->
 			<npc id="21422" count="2" respawnTime="45sec" respawnRandom="20sec" /> <!-- Dancer of Empire -->
-			<npc id="21423" count="3" respawnTime="45sec" respawnRandom="20sec" /> <!-- Dancer of Empire -->
+			<npc id="21423" count="2" respawnTime="45sec" respawnRandom="20sec" /> <!-- Dancer of Empire -->
+			<npc id="21424" count="2" respawnTime="45sec" respawnRandom="20sec" /> <!-- Ashkenas -->
+			<npc id="21425" count="2" respawnTime="45sec" respawnRandom="20sec" /> <!-- Ashkenas -->
 		</group>
 		<group name="godard14_2515_17">
 			<territories>
-				<territory name="godard14_2515_17" minZ="-6368" maxZ="-6668">
+				<territory name="godard14_2515_17" minZ="-6668" maxZ="-6368">
 					<node x="189032" y="-81361" />
 					<node x="189850" y="-81343" />
 					<node x="189847" y="-80621" />
 					<node x="189054" y="-80555" />
 				</territory>
 			</territories>
-			<npc id="21406" count="8" respawnTime="45sec" respawnRandom="20sec" /> <!-- Knight of Empire -->
-			<npc id="21415" count="5" respawnTime="45sec" respawnRandom="20sec" /> <!-- Assassin of Empire -->
+			<npc id="21406" count="2" respawnTime="45sec" respawnRandom="20sec" /> <!-- Knight of Empire -->
+			<npc id="21415" count="2" respawnTime="45sec" respawnRandom="20sec" /> <!-- Assassin of Empire -->
 			<npc id="21418" count="2" respawnTime="45sec" respawnRandom="20sec" /> <!-- Imperial Royal Guard -->
-			<npc id="21422" count="3" respawnTime="45sec" respawnRandom="20sec" /> <!-- Dancer of Empire -->
+			<npc id="21422" count="2" respawnTime="45sec" respawnRandom="20sec" /> <!-- Dancer of Empire -->
 			<npc id="21423" count="2" respawnTime="45sec" respawnRandom="20sec" /> <!-- Dancer of Empire -->
+			<npc id="21424" count="2" respawnTime="45sec" respawnRandom="20sec" /> <!-- Ashkenas -->
+			<npc id="21425" count="2" respawnTime="45sec" respawnRandom="20sec" /> <!-- Ashkenas -->
 		</group>
 		<group name="godard14_2515_18">
 			<territories>
-				<territory name="godard14_2515_18" minZ="-5705" maxZ="-6005">
+				<territory name="godard14_2515_18" minZ="-6005" maxZ="-5705">
 					<node x="189047" y="-84252" />
 					<node x="189801" y="-84247" />
 					<node x="189857" y="-83452" />
@@ -247,18 +251,18 @@
 			<npc id="21426" count="2" respawnTime="30sec" respawnRandom="15sec" /> <!-- Abraxion -->
 			<npc id="21428" count="2" respawnTime="60sec" respawnRandom="20sec" /> <!-- Hasturan -->
 			<npc id="21430" count="2" respawnTime="90sec" respawnRandom="30sec" /> <!-- Arimanes -->
-			<npc id="21427" count="1" respawnTime="60sec" respawnRandom="20sec" /> <!-- Abraxion -->
+			<npc id="21427" count="2" respawnTime="60sec" respawnRandom="20sec" /> <!-- Abraxion -->
 			<npc id="21429" count="2" respawnTime="90sec" respawnRandom="30sec" /> <!-- Hasturan -->
-			<npc id="21431" count="2" respawnTime="120sec" respawnRandom="30sec" /> <!-- Arimanes -->
+			<npc id="21430" count="2" respawnTime="120sec" respawnRandom="30sec" /> <!-- Arimanes -->
 			<npc id="21434" count="1" respawnTime="720sec" respawnRandom="120sec" /> <!-- Seer of Blood -->
-			<npc id="21412" count="2" respawnTime="80sec" respawnRandom="20sec" /> <!-- Ustralith -->
-			<npc id="21420" count="2" respawnTime="80sec" respawnRandom="20sec" /> <!-- Ashuras -->
+			<npc id="21412" count="1" respawnTime="80sec" respawnRandom="20sec" /> <!-- Ustralith -->
+			<npc id="21420" count="1" respawnTime="80sec" respawnRandom="20sec" /> <!-- Ashuras -->
 			<npc id="21413" count="1" respawnTime="80sec" respawnRandom="20sec" /> <!-- Ustralith -->
 			<npc id="21421" count="1" respawnTime="80sec" respawnRandom="20sec" /> <!-- Ashuras -->
 		</group>
 		<group name="godard14_2515_19">
 			<territories>
-				<territory name="godard14_2515_19" minZ="-5072" maxZ="-5372">
+				<territory name="godard14_2515_19" minZ="-5372" maxZ="-5072">
 					<node x="186151" y="-84243" />
 					<node x="186911" y="-84241" />
 					<node x="186965" y="-83467" />
@@ -270,16 +274,16 @@
 			<npc id="21430" count="2" respawnTime="90sec" respawnRandom="30sec" /> <!-- Arimanes -->
 			<npc id="21427" count="2" respawnTime="60sec" respawnRandom="20sec" /> <!-- Abraxion -->
 			<npc id="21429" count="2" respawnTime="90sec" respawnRandom="30sec" /> <!-- Hasturan -->
-			<npc id="21431" count="1" respawnTime="120sec" respawnRandom="30sec" /> <!-- Arimanes -->
+			<npc id="21431" count="2" respawnTime="120sec" respawnRandom="30sec" /> <!-- Arimanes -->
 			<npc id="21434" count="1" respawnTime="720sec" respawnRandom="120sec" /> <!-- Seer of Blood -->
-			<npc id="21412" count="2" respawnTime="80sec" respawnRandom="20sec" /> <!-- Ustralith -->
-			<npc id="21420" count="2" respawnTime="80sec" respawnRandom="20sec" /> <!-- Ashuras -->
+			<npc id="21412" count="1" respawnTime="80sec" respawnRandom="20sec" /> <!-- Ustralith -->
+			<npc id="21420" count="1" respawnTime="80sec" respawnRandom="20sec" /> <!-- Ashuras -->
 			<npc id="21413" count="1" respawnTime="80sec" respawnRandom="20sec" /> <!-- Ustralith -->
 			<npc id="21421" count="1" respawnTime="80sec" respawnRandom="20sec" /> <!-- Ashuras -->
 		</group>
 		<group name="godard14_2515_20">
 			<territories>
-				<territory name="godard14_2515_20" minZ="-5711" maxZ="-6011">
+				<territory name="godard14_2515_20" minZ="-6011" maxZ="-5711">
 					<node x="183299" y="-84273" />
 					<node x="184050" y="-84275" />
 					<node x="184080" y="-83473" />
@@ -290,17 +294,17 @@
 			<npc id="21428" count="2" respawnTime="60sec" respawnRandom="20sec" /> <!-- Hasturan -->
 			<npc id="21430" count="2" respawnTime="90sec" respawnRandom="30sec" /> <!-- Arimanes -->
 			<npc id="21427" count="2" respawnTime="60sec" respawnRandom="20sec" /> <!-- Abraxion -->
-			<npc id="21429" count="1" respawnTime="90sec" respawnRandom="30sec" /> <!-- Hasturan -->
+			<npc id="21429" count="2" respawnTime="90sec" respawnRandom="30sec" /> <!-- Hasturan -->
 			<npc id="21431" count="2" respawnTime="120sec" respawnRandom="30sec" /> <!-- Arimanes -->
 			<npc id="21434" count="1" respawnTime="720sec" respawnRandom="120sec" /> <!-- Seer of Blood -->
-			<npc id="21412" count="2" respawnTime="80sec" respawnRandom="20sec" /> <!-- Ustralith -->
-			<npc id="21420" count="2" respawnTime="80sec" respawnRandom="20sec" /> <!-- Ashuras -->
+			<npc id="21412" count="1" respawnTime="80sec" respawnRandom="20sec" /> <!-- Ustralith -->
+			<npc id="21420" count="1" respawnTime="80sec" respawnRandom="20sec" /> <!-- Ashuras -->
 			<npc id="21413" count="1" respawnTime="80sec" respawnRandom="20sec" /> <!-- Ustralith -->
 			<npc id="21421" count="1" respawnTime="80sec" respawnRandom="20sec" /> <!-- Ashuras -->
 		</group>
 		<group name="godard14_2515_21">
 			<territories>
-				<territory name="godard14_2515_21" minZ="-6341" maxZ="-6641">
+				<territory name="godard14_2515_21" minZ="-6641" maxZ="-6341">
 					<node x="180806" y="-84051" />
 					<node x="181277" y="-84137" />
 					<node x="181323" y="-82707" />
@@ -312,7 +316,7 @@
 		</group>
 		<group name="godard14_2515_22">
 			<territories>
-				<territory name="godard14_2515_22" minZ="-6331" maxZ="-6631">
+				<territory name="godard14_2515_22" minZ="-6631" maxZ="-6331">
 					<node x="179922" y="-82573" />
 					<node x="181354" y="-82571" />
 					<node x="181280" y="-82101" />