diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/SeeThroughSilentMove.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/SeeThroughSilentMove.java
index 95b83e8c69..c5b64709af 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/SeeThroughSilentMove.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/SeeThroughSilentMove.java
@@ -30,7 +30,7 @@ public class SeeThroughSilentMove extends AbstractNpcAI
 	//@formatter:off
 	private static final int[] MONSTERS =
 	{
-		18001, 18002, 29009, 29010, 29011, 29012, 29013
+		20142, 18002, 29009, 29010, 29011, 29012, 29013
 	};
 	//@formatter:on
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
index 39189d452e..80e6bcc742 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
@@ -69,7 +69,7 @@ public final class Q00662_AGameOfCards extends Quest
 		MONSTERS.put(21112, 552); // Hames Orc Footman
 		MONSTERS.put(21114, 587); // Cursed Guardian
 		MONSTERS.put(21116, 812); // Hames Orc Overlord
-		MONSTERS.put(18001, 232); // Blood Queen
+		MONSTERS.put(20142, 232); // Blood Queen
 	}
 	
 	public Q00662_AGameOfCards()
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/spawns/Aden/AdenMonsterSpawns.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/spawns/Aden/AdenMonsterSpawns.xml
index 6564375328..8d8db3ed69 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/spawns/Aden/AdenMonsterSpawns.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/spawns/Aden/AdenMonsterSpawns.xml
@@ -2868,13 +2868,12 @@
 			<npc id="20669" x="183448" y="21643" z="-3170" heading="64529" respawnTime="30sec"/>
 			<npc id="20669" x="182504" y="21694" z="-3170" heading="17299" respawnTime="30sec"/>
 			<npc id="20669" x="182263" y="22346" z="-3170" heading="19922" respawnTime="30sec"/>
-			<npc id="20669" x="180255" y="24779" z="-3170" heading="21714" respawnTime="30sec"/>
 			<npc id="20669" x="181449" y="23980" z="-3170" heading="25180" respawnTime="30sec"/>
 			<npc id="20669" x="182887" y="23749" z="-3170" heading="31976" respawnTime="30sec"/>
 			<npc id="20669" x="182050" y="24534" z="-3204" heading="0" respawnTime="30sec"/>
 			<npc id="20669" x="181748" y="24712" z="-3204" heading="0" respawnTime="30sec"/>
-			<npc id="18001" x="178328" y="6640" z="-2729" heading="56227" respawnTime="36sec"/>
-			<npc id="18001" x="178673" y="7666" z="-2725" heading="42721" respawnTime="36sec"/>
+			<npc id="20142" x="178328" y="6640" z="-2729" heading="56227" respawnTime="36sec"/>
+			<npc id="20142" x="178673" y="7666" z="-2725" heading="42721" respawnTime="36sec"/>
 			<npc id="20670" x="179179" y="8483" z="-2729" heading="18439" respawnTime="25sec"/>
 			<npc id="20671" x="178891" y="6238" z="-2729" heading="47313" respawnTime="25sec"/>
 			<npc id="20671" x="178237" y="4814" z="-2708" heading="59086" respawnTime="25sec"/>
@@ -2883,8 +2882,8 @@
 			<npc id="20673" x="181305" y="6897" z="-2729" heading="64692" respawnTime="25sec"/>
 			<npc id="20674" x="181374" y="8094" z="-2729" heading="13776" respawnTime="75sec"/>
 			<npc id="20674" x="180887" y="8047" z="-2729" heading="47997" respawnTime="75sec"/>
-			<npc id="18001" x="178367" y="10178" z="-2719" heading="37575" respawnTime="36sec"/>
-			<npc id="18001" x="178239" y="12334" z="-2729" heading="25681" respawnTime="36sec"/>
+			<npc id="20142" x="178367" y="10178" z="-2719" heading="37575" respawnTime="36sec"/>
+			<npc id="20142" x="178239" y="12334" z="-2729" heading="25681" respawnTime="36sec"/>
 			<npc id="20670" x="178899" y="10637" z="-2729" heading="59684" respawnTime="25sec"/>
 			<npc id="20670" x="177872" y="11318" z="-2729" heading="16944" respawnTime="25sec"/>
 			<npc id="20671" x="178000" y="9651" z="-2727" heading="46574" respawnTime="25sec"/>
@@ -2918,10 +2917,10 @@
 			<npc id="20674" x="188238" y="22057" z="-3678" heading="35844" respawnTime="75sec"/>
 			<npc id="20674" x="193201" y="22163" z="-3610" heading="61968" respawnTime="75sec"/>
 			<npc id="20674" x="189403" y="18903" z="-3696" heading="33767" respawnTime="75sec"/>
-			<npc id="18001" x="185766" y="14106" z="-3660" heading="0" respawnTime="36sec"/>
-			<npc id="18001" x="185750" y="17695" z="-3307" heading="10728" respawnTime="36sec"/>
-			<npc id="18001" x="185385" y="16941" z="-3285" heading="44093" respawnTime="36sec"/>
-			<npc id="18001" x="185002" y="15430" z="-3283" heading="5846" respawnTime="36sec"/>
+			<npc id="20142" x="185766" y="14106" z="-3660" heading="0" respawnTime="36sec"/>
+			<npc id="20142" x="185750" y="17695" z="-3307" heading="10728" respawnTime="36sec"/>
+			<npc id="20142" x="185385" y="16941" z="-3285" heading="44093" respawnTime="36sec"/>
+			<npc id="20142" x="185002" y="15430" z="-3283" heading="5846" respawnTime="36sec"/>
 			<npc id="20670" x="184768" y="17072" z="-3299" heading="19259" respawnTime="25sec"/>
 			<npc id="20670" x="183851" y="15055" z="-3327" heading="41373" respawnTime="25sec"/>
 			<npc id="20670" x="185006" y="15200" z="-3275" heading="59390" respawnTime="25sec"/>
@@ -2931,9 +2930,9 @@
 			<npc id="20671" x="186269" y="14284" z="-3660" heading="0" respawnTime="25sec"/>
 			<npc id="20671" x="185116" y="14807" z="-3294" heading="44145" respawnTime="25sec"/>
 			<npc id="20671" x="185957" y="16258" z="-3291" heading="59610" respawnTime="25sec"/>
-			<npc id="18001" x="185919" y="18716" z="-3326" heading="40009" respawnTime="36sec"/>
-			<npc id="18001" x="185058" y="21916" z="-3764" heading="0" respawnTime="36sec"/>
-			<npc id="18001" x="186546" y="24148" z="-3550" heading="48328" respawnTime="36sec"/>
+			<npc id="20142" x="185919" y="18716" z="-3326" heading="40009" respawnTime="36sec"/>
+			<npc id="20142" x="185058" y="21916" z="-3764" heading="0" respawnTime="36sec"/>
+			<npc id="20142" x="186546" y="24148" z="-3550" heading="48328" respawnTime="36sec"/>
 			<npc id="20670" x="185159" y="21738" z="-3764" heading="0" respawnTime="25sec"/>
 			<npc id="20670" x="186400" y="25456" z="-3530" heading="43580" respawnTime="25sec"/>
 			<npc id="20670" x="184958" y="21382" z="-3764" heading="0" respawnTime="25sec"/>
@@ -2943,34 +2942,27 @@
 			<npc id="20671" x="186912" y="19108" z="-3472" heading="3512" respawnTime="25sec"/>
 			<npc id="20671" x="185310" y="23150" z="-3303" heading="16077" respawnTime="25sec"/>
 			<npc id="20671" x="185807" y="22413" z="-3307" heading="59658" respawnTime="25sec"/>
-			<npc id="18001" x="181706" y="25320" z="-3808" heading="0" respawnTime="36sec"/>
-			<npc id="18001" x="182209" y="25498" z="-3808" heading="0" respawnTime="36sec"/>
-			<npc id="18001" x="182512" y="24964" z="-3808" heading="0" respawnTime="36sec"/>
-			<npc id="18001" x="182127" y="28291" z="-3693" heading="63400" respawnTime="36sec"/>
-			<npc id="18001" x="185270" y="24294" z="-3321" heading="45371" respawnTime="36sec"/>
-			<npc id="18001" x="182813" y="26210" z="-3808" heading="0" respawnTime="36sec"/>
-			<npc id="18001" x="182612" y="25854" z="-3808" heading="0" respawnTime="36sec"/>
-			<npc id="18001" x="182109" y="24964" z="-3808" heading="0" respawnTime="36sec"/>
-			<npc id="20670" x="182008" y="25498" z="-3808" heading="0" respawnTime="25sec"/>
-			<npc id="20670" x="182411" y="24786" z="-3808" heading="0" respawnTime="25sec"/>
-			<npc id="20670" x="182612" y="25142" z="-3808" heading="0" respawnTime="25sec"/>
+			<npc id="20142" x="181706" y="25320" z="-3808" heading="0" respawnTime="36sec"/>
+			<npc id="20142" x="182209" y="25498" z="-3808" heading="0" respawnTime="36sec"/>
+			<npc id="20142" x="182512" y="24964" z="-3808" heading="0" respawnTime="36sec"/>
+			<npc id="20142" x="182127" y="28291" z="-3693" heading="63400" respawnTime="36sec"/>
+			<npc id="20142" x="185270" y="24294" z="-3321" heading="45371" respawnTime="36sec"/>
+			<npc id="20142" x="182813" y="26210" z="-3808" heading="0" respawnTime="36sec"/>
+			<npc id="20142" x="182612" y="25854" z="-3808" heading="0" respawnTime="36sec"/>
+			<npc id="20142" x="182109" y="24964" z="-3808" heading="0" respawnTime="36sec"/>
 			<npc id="20670" x="183014" y="25142" z="-3808" heading="0" respawnTime="25sec"/>
 			<npc id="20670" x="185922" y="29120" z="-3635" heading="19615" respawnTime="25sec"/>
-			<npc id="20670" x="181605" y="25498" z="-3808" heading="0" respawnTime="25sec"/>
 			<npc id="20670" x="183977" y="27316" z="-3696" heading="63211" respawnTime="25sec"/>
-			<npc id="20670" x="182511" y="25320" z="-3808" heading="0" respawnTime="25sec"/>
 			<npc id="20671" x="181248" y="28533" z="-3721" heading="56790" respawnTime="25sec"/>
-			<npc id="20671" x="182612" y="25498" z="-3808" heading="0" respawnTime="25sec"/>
 			<npc id="20671" x="184406" y="25563" z="-3313" heading="25444" respawnTime="25sec"/>
 			<npc id="20671" x="184667" y="24843" z="-3319" heading="21138" respawnTime="25sec"/>
 			<npc id="20671" x="186823" y="28369" z="-3675" heading="10943" respawnTime="25sec"/>
 			<npc id="20671" x="184814" y="23692" z="-3316" heading="45386" respawnTime="25sec"/>
-			<npc id="20671" x="182008" y="25142" z="-3808" heading="0" respawnTime="25sec"/>
 			<npc id="20671" x="183262" y="28035" z="-3704" heading="1723" respawnTime="25sec"/>
-			<npc id="18001" x="184088" y="8499" z="-2685" heading="57204" respawnTime="36sec"/>
-			<npc id="18001" x="184065" y="10385" z="-2703" heading="48563" respawnTime="36sec"/>
-			<npc id="18001" x="183797" y="7678" z="-2725" heading="46899" respawnTime="36sec"/>
-			<npc id="18001" x="183535" y="9578" z="-2848" heading="0" respawnTime="36sec"/>
+			<npc id="20142" x="184088" y="8499" z="-2685" heading="57204" respawnTime="36sec"/>
+			<npc id="20142" x="184065" y="10385" z="-2703" heading="48563" respawnTime="36sec"/>
+			<npc id="20142" x="183797" y="7678" z="-2725" heading="46899" respawnTime="36sec"/>
+			<npc id="20142" x="183535" y="9578" z="-2848" heading="0" respawnTime="36sec"/>
 			<npc id="20670" x="184220" y="12273" z="-2707" heading="31627" respawnTime="25sec"/>
 			<npc id="20670" x="185620" y="12205" z="-2713" heading="27384" respawnTime="25sec"/>
 			<npc id="20670" x="183133" y="10646" z="-2848" heading="0" respawnTime="25sec"/>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/spawns/Giran/GiranMonsterSpawns.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/spawns/Giran/GiranMonsterSpawns.xml
index 77601b5285..0007e70c70 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/spawns/Giran/GiranMonsterSpawns.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/spawns/Giran/GiranMonsterSpawns.xml
@@ -547,33 +547,33 @@
 			<npc id="20134" x="122251" y="112680" z="-3840" heading="11531" respawnTime="36sec"/>
 			<npc id="20134" x="119647" y="112701" z="-3696" heading="34029" respawnTime="36sec"/>
 			<npc id="20134" x="124739" y="115092" z="-3712" heading="3818" respawnTime="36sec"/>
-			<npc id="18001" x="120155" y="113611" z="-3688" heading="50367" respawnTime="36sec"/>
-			<npc id="18001" x="122099" y="115207" z="-3712" heading="4635" respawnTime="36sec"/>
-			<npc id="18001" x="118881" y="116196" z="-3768" heading="22878" respawnTime="36sec"/>
-			<npc id="18001" x="123040" y="114492" z="-3760" heading="10293" respawnTime="36sec"/>
+			<npc id="20142" x="120155" y="113611" z="-3688" heading="50367" respawnTime="36sec"/>
+			<npc id="20142" x="122099" y="115207" z="-3712" heading="4635" respawnTime="36sec"/>
+			<npc id="20142" x="118881" y="116196" z="-3768" heading="22878" respawnTime="36sec"/>
+			<npc id="20142" x="123040" y="114492" z="-3760" heading="10293" respawnTime="36sec"/>
 			<npc id="20137" x="119677" y="113254" z="-3696" heading="47537" respawnTime="36sec"/>
 			<npc id="20137" x="121059" y="112117" z="-3784" heading="0" respawnTime="36sec"/>
 			<npc id="20246" x="120669" y="112778" z="-3696" heading="35199" respawnTime="36sec"/>
 			<npc id="20134" x="122703" y="113755" z="-3824" heading="7828" respawnTime="36sec"/>
 			<npc id="20246" x="121238" y="114987" z="-3656" heading="32522" respawnTime="36sec"/>
-			<npc id="18001" x="125163" y="114739" z="-3720" heading="24165" respawnTime="36sec"/>
+			<npc id="20142" x="125163" y="114739" z="-3720" heading="24165" respawnTime="36sec"/>
 			<npc id="20246" x="127052" y="113045" z="-3616" heading="28246" respawnTime="36sec"/>
 			<npc id="20246" x="126516" y="114417" z="-3624" heading="59905" respawnTime="36sec"/>
 			<npc id="20246" x="128664" y="115789" z="-3760" heading="11642" respawnTime="36sec"/>
 			<npc id="20134" x="129885" y="114126" z="-3760" heading="62198" respawnTime="36sec"/>
 			<npc id="20134" x="130288" y="114751" z="-3784" heading="6274" respawnTime="36sec"/>
 			<npc id="20134" x="128246" y="114645" z="-3600" heading="60229" respawnTime="36sec"/>
-			<npc id="18001" x="125920" y="115302" z="-3728" heading="27078" respawnTime="36sec"/>
-			<npc id="18001" x="128609" y="113759" z="-3680" heading="38062" respawnTime="36sec"/>
-			<npc id="18001" x="127543" y="113377" z="-3664" heading="55217" respawnTime="36sec"/>
+			<npc id="20142" x="125920" y="115302" z="-3728" heading="27078" respawnTime="36sec"/>
+			<npc id="20142" x="128609" y="113759" z="-3680" heading="38062" respawnTime="36sec"/>
+			<npc id="20142" x="127543" y="113377" z="-3664" heading="55217" respawnTime="36sec"/>
 			<npc id="20246" x="125016" y="110216" z="-3104" heading="0" respawnTime="36sec"/>
 			<npc id="20246" x="125307" y="111303" z="-3144" heading="59478" respawnTime="36sec"/>
 			<npc id="20246" x="125720" y="110394" z="-3056" heading="0" respawnTime="36sec"/>
 			<npc id="20134" x="126259" y="112403" z="-3368" heading="10817" respawnTime="36sec"/>
 			<npc id="20134" x="124842" y="110635" z="-3120" heading="40920" respawnTime="36sec"/>
-			<npc id="18001" x="126400" y="113125" z="-3512" heading="11118" respawnTime="36sec"/>
-			<npc id="18001" x="125561" y="111901" z="-3191" heading="3200" respawnTime="36sec"/>
-			<npc id="18001" x="124280" y="111555" z="-3056" heading="19834" respawnTime="36sec"/>
+			<npc id="20142" x="126400" y="113125" z="-3512" heading="11118" respawnTime="36sec"/>
+			<npc id="20142" x="125561" y="111901" z="-3191" heading="3200" respawnTime="36sec"/>
+			<npc id="20142" x="124280" y="111555" z="-3056" heading="19834" respawnTime="36sec"/>
 			<npc id="20137" x="124445" y="109320" z="-3112" heading="7210" respawnTime="36sec"/>
 			<npc id="20246" x="122994" y="108930" z="-2976" heading="28870" respawnTime="36sec"/>
 			<npc id="20134" x="123703" y="108271" z="-2968" heading="62388" respawnTime="36sec"/>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/20100-20199.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/20100-20199.xml
index d38c2b7404..72bcfaabc5 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/20100-20199.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/npcs/20100-20199.xml
@@ -2004,12 +2004,15 @@
 	</npc>
 	<npc id="20142" level="60" type="L2Monster" name="Blood Queen">
 		<parameters>
-			<param name="MoveAroundSocial" value="0" />
-			<param name="MoveAroundSocial1" value="0" />
-			<param name="MoveAroundSocial2" value="0" />
+			<param name="MoveAroundSocial" value="60" />
+			<param name="MoveAroundSocial1" value="60" />
+			<param name="MoveAroundSocial2" value="60" />
+			<skill name="DDMagic1" id="4039" level="6" />
+			<skill name="DDMagic2" id="4002" level="6" />
+			<skill name="DeBuff" id="4035" level="6" />
 		</parameters>
 		<race>DEMONIC</race>
-		<sex>MALE</sex>
+		<sex>FEMALE</sex>
 		<acquire exp="30672" sp="920" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
 			<vitals hp="1933" hpRegen="2.5" mp="1036" mpRegen="1.2" />
@@ -2033,6 +2036,9 @@
 			<skill id="4414" level="2" /> <!-- Standard Type -->
 			<skill id="4415" level="3" /> <!-- One-handed Sword -->
 			<skill id="4416" level="3" /> <!-- Beasts -->
+			<skill id="4002" level="6" /> <!-- NPC HP Drain -->
+			<skill id="4035" level="6" /> <!-- Poison -->
+			<skill id="4039" level="6" /> <!-- NPC MP Drain -->
 		</skill_list>
 		<shots shotChance="30" spiritChance="30" />
 		<ex_crt_effect>false</ex_crt_effect>