From 2f9c60c033a00be933bcb32f3faba0c60d834fdb Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Fri, 18 Mar 2022 09:56:47 +0000
Subject: [PATCH] Addition of conquest monster stats (Part 2). Contributed by
 CostyKiller.

---
 .../dist/game/data/stats/npcs/19800-19899.xml | 442 ++++++++++++++----
 .../dist/game/data/stats/npcs/19800-19899.xml | 430 +++++++++++++----
 2 files changed, 672 insertions(+), 200 deletions(-)

diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/19800-19899.xml b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/19800-19899.xml
index ae0a89eaa1..d41d4953ff 100644
--- a/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/19800-19899.xml
+++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/stats/npcs/19800-19899.xml
@@ -228,9 +228,8 @@
 			<height normal="46.5" />
 		</collision>
 	</npc>
-	<npc id="19812" level="85" type="Folk" name="Conquest Spirits' Flower">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
+	<npc id="19812" level="112" type="Monster" name="Conquest Spirits' Flower">
+		<race>PLANT</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="266491" hpRegen="10.5" mp="2862" mpRegen="3.6" />
@@ -247,9 +246,8 @@
 			<height normal="27.8" />
 		</collision>
 	</npc>
-	<npc id="19813" level="85" type="Folk" name="Conquest Spirits' Tree">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
+	<npc id="19813" level="112" type="Monster" name="Conquest Spirits' Tree">
+		<race>PLANT</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="266491" hpRegen="10.5" mp="2862" mpRegen="3.6" />
@@ -266,8 +264,7 @@
 			<height normal="118.1" />
 		</collision>
 	</npc>
-	<npc id="19814" level="85" type="Folk" name="Conquest Spirits' Light">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="19814" level="116" type="Monster" name="Conquest Spirits' Light">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -285,9 +282,8 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="19815" level="85" type="Folk" name="Conquest Mutant">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
+	<npc id="19815" level="112" type="Monster" name="Conquest Mutant">
+		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="266491" hpRegen="10.5" mp="2862" mpRegen="3.6" />
@@ -304,328 +300,568 @@
 			<height normal="27.5" />
 		</collision>
 	</npc>
-	<npc id="19816" level="85" type="Folk" name="Soul Flower">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
+	<npc id="19816" level="112" type="Monster" name="Soul Flower">
+		<race>PLANT</race>
 		<sex>FEMALE</sex>
+		<acquire exp="3678020512" sp="3490501" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="36" hpRegen="10.5" mp="2862" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attack physical="521192.934242167" magical="1212.14097575999" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4447.31707317073" magical="1705.54616437254" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="14" />
 			<height normal="27.8" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="5" /> <!-- Plants -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="34234" level="1" /> <!-- Soul Flower -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="129399" max="173621" chance="100" /> <!-- Adena -->
+				<item id="82081" min="1" max="1" chance="8" /> <!-- Memory Shard -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="19817" level="85" type="Folk" name="Soul Flower">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="19817" level="116" type="Monster" name="Soul Flower">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
+		<acquire exp="4678020512" sp="4490501" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="36" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attack physical="521192.934242167" magical="1212.14097575999" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4447.31707317073" magical="1705.54616437254" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="14" />
 			<height normal="27.8" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="5" /> <!-- Plants -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="34234" level="1" /> <!-- Soul Flower -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="264341" max="345433" chance="100" /> <!-- Adena -->
+				<item id="82081" min="1" max="1" chance="8" /> <!-- Memory Shard -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="19818" level="85" type="Folk" name="Soul Flower">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="19818" level="116" type="Monster" name="Soul Flower">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
+		<acquire exp="7678020512" sp="6910194" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="9" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attack physical="521192.934242167" magical="1212.14097575999" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4447.31707317073" magical="1705.54616437254" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="14" />
 			<height normal="27.8" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="5" /> <!-- Plants -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="34236" level="1" /> <!-- Conquest Party Bonus -->
+			<skill id="34234" level="1" /> <!-- Soul Flower -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="264341" max="345433" chance="100" /> <!-- Adena -->
+				<item id="82081" min="1" max="1" chance="8" /> <!-- Memory Shard -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="19819" level="85" type="Folk" name="Soul Flower">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="19819" level="120" type="Monster" name="Soul Flower">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
+		<acquire exp="10770336000" sp="9693216" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="9" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attack physical="617815.429469286" magical="1368.16567732246" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5043.54066985646" magical="1934.40396671246" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="14" />
 			<height normal="27.8" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="5" /> <!-- Plants -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="34236" level="1" /> <!-- Conquest Party Bonus -->
+			<skill id="34234" level="1" /> <!-- Soul Flower -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="264341" max="345433" chance="100" /> <!-- Adena -->
+				<item id="82081" min="1" max="1" chance="8" /> <!-- Memory Shard -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="19820" level="85" type="Folk" name="Soul Flower">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="19820" level="124" type="Monster" name="Soul Flower">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
+		<acquire exp="15074599648" sp="13567014" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="9" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5757.47663551402" magical="2208.44514357978" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="14" />
 			<height normal="27.8" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="5" /> <!-- Plants -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="34236" level="1" /> <!-- Conquest Party Bonus -->
+			<skill id="34234" level="1" /> <!-- Soul Flower -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="436322" max="503727" chance="100" /> <!-- Adena -->
+				<item id="82081" min="1" max="1" chance="8" /> <!-- Memory Shard -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="19821" level="85" type="Folk" name="Soul Flower">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="19821" level="116" type="Monster" name="Soul Flower">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
+		<acquire exp="7678020512" sp="6910194" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="9" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attack physical="521192.934242167" magical="1212.14097575999" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4447.31707317073" magical="1705.54616437254" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="14" />
 			<height normal="27.8" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="5" /> <!-- Plants -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="34236" level="1" /> <!-- Conquest Party Bonus -->
+			<skill id="34234" level="1" /> <!-- Soul Flower -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="129399" max="173621" chance="100" /> <!-- Adena -->
+				<item id="82081" min="1" max="1" chance="8" /> <!-- Memory Shard -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="19822" level="85" type="Folk" name="Soul Flower">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="19822" level="120" type="Monster" name="Soul Flower">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
+		<acquire exp="10770336000" sp="9693216" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="9" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attack physical="617815.429469286" magical="1368.16567732246" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5043.54066985646" magical="1934.40396671246" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="14" />
 			<height normal="27.8" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="5" /> <!-- Plants -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="34236" level="1" /> <!-- Conquest Party Bonus -->
+			<skill id="34234" level="1" /> <!-- Soul Flower -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="264341" max="345433" chance="100" /> <!-- Adena -->
+				<item id="82081" min="1" max="1" chance="8" /> <!-- Memory Shard -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="19823" level="85" type="Folk" name="Soul Flower">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="19823" level="124" type="Monster" name="Soul Flower">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
+		<acquire exp="15074599648" sp="13567014" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="9" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5757.47663551402" magical="2208.44514357978" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="14" />
 			<height normal="27.8" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="5" /> <!-- Plants -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="34236" level="1" /> <!-- Conquest Party Bonus -->
+			<skill id="34234" level="1" /> <!-- Soul Flower -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="436322" max="503727" chance="100" /> <!-- Adena -->
+				<item id="82081" min="1" max="1" chance="8" /> <!-- Memory Shard -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="19824" level="85" type="Folk" name="Soul Flower">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="19824" level="116" type="Monster" name="Soul Flower">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
+		<acquire exp="7678020512" sp="6910194" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="9" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attack physical="521192.934242167" magical="1212.14097575999" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4447.31707317073" magical="1705.54616437254" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="14" />
 			<height normal="27.8" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="5" /> <!-- Plants -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="34236" level="1" /> <!-- Conquest Party Bonus -->
+			<skill id="34234" level="1" /> <!-- Soul Flower -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="129399" max="173621" chance="100" /> <!-- Adena -->
+				<item id="82081" min="1" max="1" chance="8" /> <!-- Memory Shard -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="19825" level="85" type="Folk" name="Soul Flower">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="19825" level="120" type="Monster" name="Soul Flower">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
+		<acquire exp="10770336000" sp="9693216" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="9" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attack physical="617815.429469286" magical="1368.16567732246" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5043.54066985646" magical="1934.40396671246" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="14" />
 			<height normal="27.8" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="5" /> <!-- Plants -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="34236" level="1" /> <!-- Conquest Party Bonus -->
+			<skill id="34234" level="1" /> <!-- Soul Flower -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="264341" max="345433" chance="100" /> <!-- Adena -->
+				<item id="82081" min="1" max="1" chance="8" /> <!-- Memory Shard -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="19826" level="85" type="Folk" name="Soul Flower">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="19826" level="124" type="Monster" name="Soul Flower">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
+		<acquire exp="15074599648" sp="13567014" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="9" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5757.47663551402" magical="2208.44514357978" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="14" />
 			<height normal="27.8" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="5" /> <!-- Plants -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="34236" level="1" /> <!-- Conquest Party Bonus -->
+			<skill id="34234" level="1" /> <!-- Soul Flower -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="436322" max="503727" chance="100" /> <!-- Adena -->
+				<item id="82081" min="1" max="1" chance="8" /> <!-- Memory Shard -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="19827" level="85" type="Folk" name="Soul Tree">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="19827" level="124" type="Monster" name="Soul Tree">
+		<parameters>
+			<minions name="Privates">
+				<npc id="27776" count="1" respawnTime="360" weightPoint="1" /><!-- Catshi Trickster Asa Guardian -->
+				<npc id="27777" count="1" respawnTime="360" weightPoint="1" /><!-- Catshi Muse Asa Guardian -->
+				<npc id="27778" count="1" respawnTime="360" weightPoint="1" /><!-- Catshi Ripper Asa Guardian -->
+			</minions>
+		</parameters>
 		<race>ETC</race>
 		<sex>FEMALE</sex>
+		<acquire exp="135671396832" sp="122104199" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1287" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="1964" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5757.47663551402" magical="2208.44514357978" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="77" />
 			<height normal="118.1" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="5" /> <!-- Plants -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="34232" level="1" /> <!-- Soul Tree -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="264341" max="345433" chance="100" /> <!-- Adena -->
+				<item id="82081" min="1" max="1" chance="8" /> <!-- Memory Shard -->
+				<item id="82083" min="1" max="1" chance="0.9" /> <!-- Eigis Armor Fragment -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="19828" level="85" type="Folk" name="Soul Tree">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="19828" level="124" type="Monster" name="Soul Tree">
+		<parameters>
+			<minions name="Privates">
+				<npc id="27779" count="1" respawnTime="360" weightPoint="1" /><!-- Catshi Trickster Asa Guardian -->
+				<npc id="27780" count="1" respawnTime="360" weightPoint="1" /><!-- Catshi Muse Asa Guardian -->
+				<npc id="27781" count="1" respawnTime="360" weightPoint="1" /><!-- Catshi Ripper Asa Guardian -->
+			</minions>
+		</parameters>
 		<race>ETC</race>
 		<sex>FEMALE</sex>
+		<acquire exp="135671396832" sp="122104199" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1287" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="1964" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5757.47663551402" magical="2208.44514357978" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="77" />
 			<height normal="118.1" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="5" /> <!-- Plants -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="34232" level="1" /> <!-- Soul Tree -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="264341" max="345433" chance="100" /> <!-- Adena -->
+				<item id="82081" min="1" max="1" chance="8" /> <!-- Memory Shard -->
+				<item id="82083" min="1" max="1" chance="0.9" /> <!-- Eigis Armor Fragment -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="19829" level="85" type="Folk" name="Soul Tree">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="19829" level="124" type="Monster" name="Soul Tree">
+		<parameters>
+			<minions name="Privates">
+				<npc id="27782" count="1" respawnTime="360" weightPoint="1" /><!-- Catshi Trickster Anima Guardian -->
+				<npc id="27783" count="1" respawnTime="360" weightPoint="1" /><!-- Catshi Muse Anima Guardian -->
+				<npc id="27784" count="1" respawnTime="360" weightPoint="1" /><!-- Catshi Ripper Anima Guardian -->
+			</minions>
+		</parameters>
 		<race>ETC</race>
 		<sex>FEMALE</sex>
+		<acquire exp="135671396832" sp="122104199" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1287" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="1964" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5757.47663551402" magical="2208.44514357978" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="77" />
 			<height normal="118.1" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="5" /> <!-- Plants -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="34232" level="1" /> <!-- Soul Tree -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="264341" max="345433" chance="100" /> <!-- Adena -->
+				<item id="82081" min="1" max="1" chance="8" /> <!-- Memory Shard -->
+				<item id="82083" min="1" max="1" chance="0.9" /> <!-- Eigis Armor Fragment -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="19830" level="85" type="Folk" name="Soul Light">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="19830" level="116" type="Monster" name="Soul Light">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
+		<acquire exp="6910207696" sp="6219094" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="67" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<vitals hp="90" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<speed>
 				<walk ground="1" />
 				<run ground="1" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attack physical="521192.934242167" magical="1212.14097575999" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4447.31707317073" magical="1705.54616437254" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="7" />
 			<height normal="25" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="34233" level="1" /> <!-- Luminous Soul -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="129399" max="173621" chance="100" /> <!-- Adena -->
+				<item id="82081" min="1" max="1" chance="8" /> <!-- Memory Shard -->
+				<item id="82083" min="1" max="1" chance="0.9" /> <!-- Eigis Armor Fragment -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="19831" level="85" type="Folk" name="Soul Light">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="19831" level="116" type="Monster" name="Soul Light">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
+		<acquire exp="6910207696" sp="6219094" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="67" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<vitals hp="90" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<speed>
 				<walk ground="1" />
 				<run ground="1" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attack physical="521192.934242167" magical="1212.14097575999" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4447.31707317073" magical="1705.54616437254" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="7" />
 			<height normal="25" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="34233" level="1" /> <!-- Luminous Soul -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="129399" max="173621" chance="100" /> <!-- Adena -->
+				<item id="82081" min="1" max="1" chance="8" /> <!-- Memory Shard -->
+				<item id="82083" min="1" max="1" chance="0.9" /> <!-- Eigis Armor Fragment -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="19832" level="85" type="Folk" name="Soul Light">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="19832" level="116" type="Monster" name="Soul Light">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
+		<acquire exp="6910207696" sp="6219094" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="67" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<vitals hp="90" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<speed>
 				<walk ground="1" />
 				<run ground="1" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attack physical="521192.934242167" magical="1212.14097575999" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4447.31707317073" magical="1705.54616437254" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="7" />
 			<height normal="25" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="34233" level="1" /> <!-- Luminous Soul -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="129399" max="173621" chance="100" /> <!-- Adena -->
+				<item id="82081" min="1" max="1" chance="8" /> <!-- Memory Shard -->
+				<item id="82083" min="1" max="1" chance="0.9" /> <!-- Eigis Armor Fragment -->
+			</drop>
+		</dropLists>
 	</npc>
 	<npc id="19833" level="85" type="Folk" name="">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/19800-19899.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/19800-19899.xml
index 5b3e2d90cf..eb13071e36 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/19800-19899.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/19800-19899.xml
@@ -228,9 +228,8 @@
 			<height normal="46.5" />
 		</collision>
 	</npc>
-	<npc id="19812" level="85" type="Folk" name="Conquest Spirits' Flower">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
+	<npc id="19812" level="112" type="Monster" name="Conquest Spirits' Flower">
+		<race>PLANT</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="266491" hpRegen="10.5" mp="2862" mpRegen="3.6" />
@@ -247,9 +246,8 @@
 			<height normal="27.8" />
 		</collision>
 	</npc>
-	<npc id="19813" level="85" type="Folk" name="Conquest Spirits' Tree">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
+	<npc id="19813" level="112" type="Monster" name="Conquest Spirits' Tree">
+		<race>PLANT</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="266491" hpRegen="10.5" mp="2862" mpRegen="3.6" />
@@ -266,8 +264,7 @@
 			<height normal="118.1" />
 		</collision>
 	</npc>
-	<npc id="19814" level="85" type="Folk" name="Conquest Spirits' Light">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="19814" level="116" type="Monster" name="Conquest Spirits' Light">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -285,9 +282,8 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="19815" level="85" type="Folk" name="Conquest Mutant">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
+	<npc id="19815" level="112" type="Monster" name="Conquest Mutant">
+		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="266491" hpRegen="10.5" mp="2862" mpRegen="3.6" />
@@ -304,328 +300,568 @@
 			<height normal="27.5" />
 		</collision>
 	</npc>
-	<npc id="19816" level="85" type="Folk" name="Soul Flower">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
+	<npc id="19816" level="112" type="Monster" name="Soul Flower">
+		<race>PLANT</race>
 		<sex>FEMALE</sex>
+		<acquire exp="3678020512" sp="3490501" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="36" hpRegen="10.5" mp="2862" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attack physical="521192.934242167" magical="1212.14097575999" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4447.31707317073" magical="1705.54616437254" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="14" />
 			<height normal="27.8" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="5" /> <!-- Plants -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="34234" level="1" /> <!-- Soul Flower -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="129399" max="173621" chance="100" /> <!-- Adena -->
+				<item id="82081" min="1" max="1" chance="8" /> <!-- Memory Shard -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="19817" level="85" type="Folk" name="Soul Flower">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="19817" level="116" type="Monster" name="Soul Flower">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
+		<acquire exp="4678020512" sp="4490501" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="36" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attack physical="521192.934242167" magical="1212.14097575999" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4447.31707317073" magical="1705.54616437254" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="14" />
 			<height normal="27.8" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="5" /> <!-- Plants -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="34234" level="1" /> <!-- Soul Flower -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="264341" max="345433" chance="100" /> <!-- Adena -->
+				<item id="82081" min="1" max="1" chance="8" /> <!-- Memory Shard -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="19818" level="85" type="Folk" name="Soul Flower">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="19818" level="116" type="Monster" name="Soul Flower">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
+		<acquire exp="7678020512" sp="6910194" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="9" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attack physical="521192.934242167" magical="1212.14097575999" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4447.31707317073" magical="1705.54616437254" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="14" />
 			<height normal="27.8" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="5" /> <!-- Plants -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="34236" level="1" /> <!-- Conquest Party Bonus -->
+			<skill id="34234" level="1" /> <!-- Soul Flower -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="264341" max="345433" chance="100" /> <!-- Adena -->
+				<item id="82081" min="1" max="1" chance="8" /> <!-- Memory Shard -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="19819" level="85" type="Folk" name="Soul Flower">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="19819" level="120" type="Monster" name="Soul Flower">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
+		<acquire exp="10770336000" sp="9693216" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="9" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attack physical="617815.429469286" magical="1368.16567732246" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5043.54066985646" magical="1934.40396671246" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="14" />
 			<height normal="27.8" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="5" /> <!-- Plants -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="34236" level="1" /> <!-- Conquest Party Bonus -->
+			<skill id="34234" level="1" /> <!-- Soul Flower -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="264341" max="345433" chance="100" /> <!-- Adena -->
+				<item id="82081" min="1" max="1" chance="8" /> <!-- Memory Shard -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="19820" level="85" type="Folk" name="Soul Flower">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="19820" level="124" type="Monster" name="Soul Flower">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
+		<acquire exp="15074599648" sp="13567014" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="9" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5757.47663551402" magical="2208.44514357978" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="14" />
 			<height normal="27.8" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="5" /> <!-- Plants -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="34236" level="1" /> <!-- Conquest Party Bonus -->
+			<skill id="34234" level="1" /> <!-- Soul Flower -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="436322" max="503727" chance="100" /> <!-- Adena -->
+				<item id="82081" min="1" max="1" chance="8" /> <!-- Memory Shard -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="19821" level="85" type="Folk" name="Soul Flower">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="19821" level="116" type="Monster" name="Soul Flower">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
+		<acquire exp="7678020512" sp="6910194" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="9" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attack physical="521192.934242167" magical="1212.14097575999" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4447.31707317073" magical="1705.54616437254" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="14" />
 			<height normal="27.8" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="5" /> <!-- Plants -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="34236" level="1" /> <!-- Conquest Party Bonus -->
+			<skill id="34234" level="1" /> <!-- Soul Flower -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="129399" max="173621" chance="100" /> <!-- Adena -->
+				<item id="82081" min="1" max="1" chance="8" /> <!-- Memory Shard -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="19822" level="85" type="Folk" name="Soul Flower">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="19822" level="120" type="Monster" name="Soul Flower">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
+		<acquire exp="10770336000" sp="9693216" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="9" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attack physical="617815.429469286" magical="1368.16567732246" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5043.54066985646" magical="1934.40396671246" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="14" />
 			<height normal="27.8" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="5" /> <!-- Plants -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="34236" level="1" /> <!-- Conquest Party Bonus -->
+			<skill id="34234" level="1" /> <!-- Soul Flower -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="264341" max="345433" chance="100" /> <!-- Adena -->
+				<item id="82081" min="1" max="1" chance="8" /> <!-- Memory Shard -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="19823" level="85" type="Folk" name="Soul Flower">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="19823" level="124" type="Monster" name="Soul Flower">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
+		<acquire exp="15074599648" sp="13567014" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="9" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5757.47663551402" magical="2208.44514357978" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="14" />
 			<height normal="27.8" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="5" /> <!-- Plants -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="34236" level="1" /> <!-- Conquest Party Bonus -->
+			<skill id="34234" level="1" /> <!-- Soul Flower -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="436322" max="503727" chance="100" /> <!-- Adena -->
+				<item id="82081" min="1" max="1" chance="8" /> <!-- Memory Shard -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="19824" level="85" type="Folk" name="Soul Flower">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="19824" level="116" type="Monster" name="Soul Flower">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
+		<acquire exp="7678020512" sp="6910194" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="9" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attack physical="521192.934242167" magical="1212.14097575999" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4447.31707317073" magical="1705.54616437254" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="14" />
 			<height normal="27.8" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="5" /> <!-- Plants -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="34236" level="1" /> <!-- Conquest Party Bonus -->
+			<skill id="34234" level="1" /> <!-- Soul Flower -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="129399" max="173621" chance="100" /> <!-- Adena -->
+				<item id="82081" min="1" max="1" chance="8" /> <!-- Memory Shard -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="19825" level="85" type="Folk" name="Soul Flower">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="19825" level="120" type="Monster" name="Soul Flower">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
+		<acquire exp="10770336000" sp="9693216" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="9" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attack physical="617815.429469286" magical="1368.16567732246" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5043.54066985646" magical="1934.40396671246" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="14" />
 			<height normal="27.8" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="5" /> <!-- Plants -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="34236" level="1" /> <!-- Conquest Party Bonus -->
+			<skill id="34234" level="1" /> <!-- Soul Flower -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="264341" max="345433" chance="100" /> <!-- Adena -->
+				<item id="82081" min="1" max="1" chance="8" /> <!-- Memory Shard -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="19826" level="85" type="Folk" name="Soul Flower">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="19826" level="124" type="Monster" name="Soul Flower">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
+		<acquire exp="15074599648" sp="13567014" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="9" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5757.47663551402" magical="2208.44514357978" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="14" />
 			<height normal="27.8" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="5" /> <!-- Plants -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="34236" level="1" /> <!-- Conquest Party Bonus -->
+			<skill id="34234" level="1" /> <!-- Soul Flower -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="436322" max="503727" chance="100" /> <!-- Adena -->
+				<item id="82081" min="1" max="1" chance="8" /> <!-- Memory Shard -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="19827" level="85" type="Folk" name="Soul Tree">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="19827" level="124" type="Monster" name="Soul Tree">
+		<parameters>
+			<minions name="Privates">
+				<npc id="27776" count="1" respawnTime="360" weightPoint="1" /><!-- Catshi Trickster Asa Guardian -->
+				<npc id="27777" count="1" respawnTime="360" weightPoint="1" /><!-- Catshi Muse Asa Guardian -->
+				<npc id="27778" count="1" respawnTime="360" weightPoint="1" /><!-- Catshi Ripper Asa Guardian -->
+			</minions>
+		</parameters>
 		<race>ETC</race>
 		<sex>FEMALE</sex>
+		<acquire exp="135671396832" sp="122104199" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="1964" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5757.47663551402" magical="2208.44514357978" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="77" />
 			<height normal="118.1" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="5" /> <!-- Plants -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="34232" level="1" /> <!-- Soul Tree -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="264341" max="345433" chance="100" /> <!-- Adena -->
+				<item id="82081" min="1" max="1" chance="8" /> <!-- Memory Shard -->
+				<item id="82083" min="1" max="1" chance="0.9" /> <!-- Eigis Armor Fragment -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="19828" level="85" type="Folk" name="Soul Tree">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="19828" level="124" type="Monster" name="Soul Tree">
+		<parameters>
+			<minions name="Privates">
+				<npc id="27779" count="1" respawnTime="360" weightPoint="1" /><!-- Catshi Trickster Asa Guardian -->
+				<npc id="27780" count="1" respawnTime="360" weightPoint="1" /><!-- Catshi Muse Asa Guardian -->
+				<npc id="27781" count="1" respawnTime="360" weightPoint="1" /><!-- Catshi Ripper Asa Guardian -->
+			</minions>
+		</parameters>
 		<race>ETC</race>
 		<sex>FEMALE</sex>
+		<acquire exp="135671396832" sp="122104199" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="1964" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5757.47663551402" magical="2208.44514357978" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="77" />
 			<height normal="118.1" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="5" /> <!-- Plants -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="34232" level="1" /> <!-- Soul Tree -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="264341" max="345433" chance="100" /> <!-- Adena -->
+				<item id="82081" min="1" max="1" chance="8" /> <!-- Memory Shard -->
+				<item id="82083" min="1" max="1" chance="0.9" /> <!-- Eigis Armor Fragment -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="19829" level="85" type="Folk" name="Soul Tree">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="19829" level="124" type="Monster" name="Soul Tree">
+		<parameters>
+			<minions name="Privates">
+				<npc id="27782" count="1" respawnTime="360" weightPoint="1" /><!-- Catshi Trickster Anima Guardian -->
+				<npc id="27783" count="1" respawnTime="360" weightPoint="1" /><!-- Catshi Muse Anima Guardian -->
+				<npc id="27784" count="1" respawnTime="360" weightPoint="1" /><!-- Catshi Ripper Anima Guardian -->
+			</minions>
+		</parameters>
 		<race>ETC</race>
 		<sex>FEMALE</sex>
+		<acquire exp="135671396832" sp="122104199" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="1964" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attack physical="733514.268097518" magical="1543.76790583647" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5757.47663551402" magical="2208.44514357978" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="77" />
 			<height normal="118.1" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="5" /> <!-- Plants -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="34232" level="1" /> <!-- Soul Tree -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="264341" max="345433" chance="100" /> <!-- Adena -->
+				<item id="82081" min="1" max="1" chance="8" /> <!-- Memory Shard -->
+				<item id="82083" min="1" max="1" chance="0.9" /> <!-- Eigis Armor Fragment -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="19830" level="85" type="Folk" name="Luminous Soul">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="19830" level="116" type="Monster" name="Luminous Soul">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
+		<acquire exp="6910207696" sp="6219094" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="90" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<speed>
 				<walk ground="1" />
 				<run ground="1" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attack physical="521192.934242167" magical="1212.14097575999" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4447.31707317073" magical="1705.54616437254" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="7" />
 			<height normal="25" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="34233" level="1" /> <!-- Luminous Soul -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="129399" max="173621" chance="100" /> <!-- Adena -->
+				<item id="82081" min="1" max="1" chance="8" /> <!-- Memory Shard -->
+				<item id="82083" min="1" max="1" chance="0.9" /> <!-- Eigis Armor Fragment -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="19831" level="85" type="Folk" name="Luminous Soul">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="19831" level="116" type="Monster" name="Luminous Soul">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
+		<acquire exp="6910207696" sp="6219094" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="90" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<speed>
 				<walk ground="1" />
 				<run ground="1" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attack physical="521192.934242167" magical="1212.14097575999" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4447.31707317073" magical="1705.54616437254" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="7" />
 			<height normal="25" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="34233" level="1" /> <!-- Luminous Soul -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="129399" max="173621" chance="100" /> <!-- Adena -->
+				<item id="82081" min="1" max="1" chance="8" /> <!-- Memory Shard -->
+				<item id="82083" min="1" max="1" chance="0.9" /> <!-- Eigis Armor Fragment -->
+			</drop>
+		</dropLists>
 	</npc>
-	<npc id="19832" level="85" type="Folk" name="Luminous Soul">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="19832" level="116" type="Monster" name="Luminous Soul">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
+		<acquire exp="6910207696" sp="6219094" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="90" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<speed>
 				<walk ground="1" />
 				<run ground="1" />
 			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
+			<attack physical="521192.934242167" magical="1212.14097575999" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="4447.31707317073" magical="1705.54616437254" />
 		</stats>
-		<status attackable="false" />
+		<status attackable="true" />
 		<collision>
 			<radius normal="7" />
 			<height normal="25" />
 		</collision>
+		<skillList>
+			<skill id="4416" level="2" /> <!-- Magical Creatures -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="32675" level="1" /> <!-- Improved Immunity -->
+			<skill id="34233" level="1" /> <!-- Luminous Soul -->
+		</skillList>
+		<dropLists>
+			<drop>
+				<item id="57" min="129399" max="173621" chance="100" /> <!-- Adena -->
+				<item id="82081" min="1" max="1" chance="8" /> <!-- Memory Shard -->
+				<item id="82083" min="1" max="1" chance="0.9" /> <!-- Eigis Armor Fragment -->
+			</drop>
+		</dropLists>
 	</npc>
 	<npc id="19833" level="85" type="Folk" name="">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->