diff --git a/L2J_DataPack_BETA/dist/game/data/html/warehouse/4315-1.htm b/L2J_DataPack_BETA/dist/game/data/html/warehouse/4315-1.htm
new file mode 100644
index 0000000000000000000000000000000000000000..caeb914e947f18ab653e773a617c9d455dd2f46f
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/html/warehouse/4315-1.htm
@@ -0,0 +1,6 @@
+<html><body>Fantasy Isle Warehouse Keeper:<br>
+<font color="LEVEL">[ Private Warehouse ]</font><br>
+<a action="bypass -h npc_%objectId%_DepositP">Deposit an item - Private Warehouse</a><br>
+<a action="bypass -h npc_%objectId%_WithdrawP">Withdraw up an item - Private Warehouse</a><br>
+<a action="bypass -h npc_%objectId%_Chat 0">Back</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/warehouse/4315-2.htm b/L2J_DataPack_BETA/dist/game/data/html/warehouse/4315-2.htm
new file mode 100644
index 0000000000000000000000000000000000000000..28744d917040e72e4f91d5866167b8b8c7f7beb2
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/html/warehouse/4315-2.htm
@@ -0,0 +1,6 @@
+<html><body>Fantasy Isle Warehouse Keeper:<br>
+<font color="LEVEL">[ Clan Warehouse ]</font><br>
+<a action="bypass -h npc_%objectId%_DepositC">Deposit an item - Clan Warehouse</a><br>
+<a action="bypass -h npc_%objectId%_WithdrawC">Withdraw up an item - Clan Warehouse</a><br>
+<a action="bypass -h npc_%objectId%_Chat 0">Back</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/warehouse/4315.htm b/L2J_DataPack_BETA/dist/game/data/html/warehouse/4315.htm
new file mode 100644
index 0000000000000000000000000000000000000000..ba7682b7b180dcb4e2439d7b9e02a4529cca14f4
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/html/warehouse/4315.htm
@@ -0,0 +1,3 @@
+<html><body>Fantasy Isle Warehouse Keeper:<br>For the last century, Fantasy Isle's warehouse has never had any lost accidents. Not even one! How about that? The Iron Guild's management resulted in this great pride. So please leave your items here without any worry.<br>
+<a action="bypass -h npc_%objectId%_Chat 1">Use private Warehouse.</a><br>
+<a action="bypass -h npc_%objectId%_Chat 2">Use clan Warehouse.</a><br></body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/22300-22399.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/22300-22399.xml
index 63294a5e7a1bc51936382129d37da854a0106138..a05fb28a794f90b7e4adf9e2be7ff25980f64548 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/22300-22399.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/22300-22399.xml
@@ -1,9 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skills.xsd">
 	<skill id="22300" levels="1" name="Fantasy Isle Magic">
-		<!-- "Magic obtained from Fantasy Isle. Increases Speed by 30%, and decreases fall damage when falling from a high place." -->
-		<set name="operateType" val="P" />
-		<set name="targetType" val="NONE" />
+		<set name="abnormalTime" val="300" />
+		<set name="icon" val="icon.skill22300" />
+		<set name="operateType" val="A2" />
+		<set name="targetType" val="ONE" />
+		<for>
+			<effect name="Buff">
+				<mul order="0x30" stat="runSpd" val="1.30" /> <!--Increases Speed by 30% -->
+				<mul order="0x30" stat="fall" val="0.7" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="22301" levels="1" name="Party Cake">
 		<!-- none -->
diff --git a/L2J_DataPack_BETA/dist/game/data/zones/custom_town.xml b/L2J_DataPack_BETA/dist/game/data/zones/custom_town.xml
index 44790c6dbfae73f1ca7637082770e15e7842843e..5ddfdb78b4561c1caa89f8383f2778c55ed49cc3 100644
--- a/L2J_DataPack_BETA/dist/game/data/zones/custom_town.xml
+++ b/L2J_DataPack_BETA/dist/game/data/zones/custom_town.xml
@@ -608,6 +608,16 @@
 		<node X="-88871" Y="-77664" />
 		<node X="-43060" Y="-43491" />
 	</zone>
+	<zone name="Fantasy Isle Magic Zone" type="EffectZone" shape="Cuboid" minZ="-4324" maxZ="3097">
+		<stat name="chance" val="100" />
+		<stat name="default_enabled" val="true" />
+		<stat name="initialDelay" val="1000" />
+		<stat name="reuse" val="3000" />
+		<stat name="showDangerIcon" val="false" />
+		<stat name="skillIdLvl" val="22300-1;" />
+		<node X="-88871" Y="-77664" />
+		<node X="-43060" Y="-43491" />
+	</zone>
 	<zone name="Keucereus" id="11040" type="TownZone" shape="Cuboid" minZ="1080" maxZ="3210">
 		<stat name="townId" val="33" />
 		<node X="-187342" Y="238059" />
diff --git a/L2J_DataPack_BETA/dist/sql/game/spawnlist.sql b/L2J_DataPack_BETA/dist/sql/game/spawnlist.sql
index 66b1dcaf8588ec026232ca02492953b04172ea91..d5e0a708ca3a126a006f1318e8ea5ccedd426a37 100644
--- a/L2J_DataPack_BETA/dist/sql/game/spawnlist.sql
+++ b/L2J_DataPack_BETA/dist/sql/game/spawnlist.sql
@@ -4823,6 +4823,8 @@ INSERT INTO `spawnlist` VALUES
 ("FantasyIsle", 1, 4323, -61155, -57755, -2008, 0, 0, 0, 60, 0, 0, 0),
 -- Fantasy Isle Paddies
 ("FantasyIsle", 1, 32378, -59234, -56897, -2032, 0, 0, 0, 60, 0, 0, 0),
+-- Fantasy Isle Warehouse
+("FantasyIsle", 1, 4315, -59234, -56825, -2039, 0, 0, 65275, 60, 0, 0, 0),
 -- Entrance Manager
 ("unset", 1, 32521, -57712, -61490, -2376, 0, 0, 16384, 60, 0, 0, 0),
 -- Entrance Manager