diff --git a/.gitignore b/.gitignore
index 400a9aba..9be79d14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -113,7 +113,7 @@ src/common/Version\.cpp
 .mtime_cache
 
 # generated script loader files
-src/servers/sapphire_zone/Script/Scripts/*/ScriptLoader.cpp
+src/servers/Scripts/*/ScriptLoader.cpp
 
 # cotire generated files/folders
 cotire/
diff --git a/src/common/Common.h b/src/common/Common.h
index f99a7c77..3ad38e3b 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -481,6 +481,9 @@ namespace Core {
 
          RemoveName = 0xA8,
 
+      SetBGM = 0xA1,
+
+      UnlockAetherCurrentMsg = 0xA4,
          ScreenFadeOut = 0xAA,
 
          ZoneIn = 0xC8,
diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 1e7614bb..d00bf1fd 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -207,6 +207,7 @@ namespace Packets {
       SetSearchInfoHandler     = 0x00D2, // updated 4.2
 
       BlackListHandler         = 0x00E0, // updated 4.2
+      PlayerSearchHandler      = 0x00E2, // updated 4.2
 
       LinkshellListHandler     = 0x00E8, // updated 4.2
 
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index ab4fec84..342aed7c 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -663,7 +663,7 @@ struct FFXIVIpcInitUI : FFXIVIpcBasePacket<InitUI>
    uint32_t unknownC;
    uint32_t charId;
    uint32_t restedExp;
-   uint16_t unknown18;
+   uint16_t currentLevel;
    uint8_t maxLevel;
    uint8_t expansion;
    uint8_t unknown1A;
@@ -779,8 +779,8 @@ struct FFXIVIpcInitUI : FFXIVIpcBasePacket<InitUI>
    uint16_t pvpFrontlineWeekly2nd;
    uint16_t pvpFrontlineWeekly3rd;
    uint8_t unknown61E;
-   uint8_t unknown61F[32];
-   uint8_t unknown63F[22];
+   uint8_t centurioSealHunts[32];
+   uint8_t alliedSealHunts[22];
    uint8_t tripleTriadCards[28];
    uint8_t unknown671[11];
    uint8_t unknownMask67C[22];
@@ -788,12 +788,12 @@ struct FFXIVIpcInitUI : FFXIVIpcBasePacket<InitUI>
    uint8_t orchestrionMask[40];
    uint8_t hallOfNoviceCompleteMask[3];
    uint8_t unknownMask6C0[11];
-   uint8_t unknownMask6CB[16];
+   uint8_t animaRelicMask[16]; // [2] = anima glass key item, [1] = ulan's note key item
    uint8_t unknown6DB[14];
    uint8_t unlockedRaids[28];
    uint8_t unlockedDungeons[18];
    uint8_t unlockedGuildhests[10];
-   uint8_t unlockedTrails[7];
+   uint8_t unlockedTrials[7];
    uint8_t unlockedPvp[5];
    uint8_t unknownMask72D[28];
    uint8_t unknownMask749[18];
@@ -1048,7 +1048,7 @@ struct FFXIVIpcEventStart : FFXIVIpcBasePacket<EventStart>
    /* 000D */ uint8_t param2;
    /* 000E */ uint16_t padding;
    /* 0010 */ uint32_t param3;
-   /* 0014 */ uint32_t contentId;
+   /* 0014 */ uint32_t padding1;
 };
 
 
@@ -1085,7 +1085,8 @@ struct FFXIVIpcDirectorPlayScene : FFXIVIpcBasePacket<DirectorPlayScene>
    uint8_t param4;
    uint8_t padding1[3];
    uint32_t param5;
-   uint8_t unknown[0x40];
+   uint8_t unknown8[0x08];
+   uint8_t unknown[0x38];
 };
 
 /**
diff --git a/src/servers/Scripts/ScriptObject.h b/src/servers/Scripts/ScriptObject.h
index a2ad2f9d..914bfa75 100644
--- a/src/servers/Scripts/ScriptObject.h
+++ b/src/servers/Scripts/ScriptObject.h
@@ -4,88 +4,7 @@
 #include <Forwards.h>
 #include <Script/NativeScriptApi.h>
 
-enum EventFlags
-{
-   NONE = 0,
-   NO_DEFAULT_CAMERA = 0x00000001,
-   FADE_OUT = 0x00000002,
-   INVIS_ENPC = 0x00000004,
-   INVIS_EOBJ = 0x00000008,
-   INVIS_BNPC = 0x00000010,
-   INVIS_OTHER_PC = 0x00000020,
-   INVIS_PARTY_PC = 0x00000040,
-   INVIS_PARTY_BUDDY = 0x10000000,
-   INVIS_GATHERING_POINT = 0x00000080,
-   INVIS_AETHERYTE = 0x00000100,
-   INVIS_TREASURE = 0x00000200,
-   CONDITION_CUTSCENE = 0x00000400,
-   HIDE_UI = 0x00000800,
-   INVIS_ALL = 0xF80003FC,
-   AUTO_LOC_CAMERA = 0x00001000,
-   HIDE_HOTBAR = 0x00002000,
-   INVINCIBLE = 0x00004000,
-   SILENT_ENTER_TERRI_ENV = 0x00008000,
-   SILENT_ENTER_TERRI_BGM = 0x00010000,
-   SILENT_ENTER_TERRI_SE = 0x00020000,
-   SILENT_ENTER_TERRI_ALL = 0x00038000,
-   DISABLE_SKIP = 0x00080000,
-   HIDE_FESTIVAL = 0x00200000,
-   DISABLE_STEALTH = 0x00400000,
-   ROLLBACK_HIDE_UI = 0x00800000,
-   LOCK_HUD = 0x01000000,
-   LOCK_HOTBAR = 0x02000000,
-   DISABLE_CANCEL_EMOTE = 0x04000000,
-   INVIS_AOE = 0x08000000,
-   INVIS_ALLIANCE_PC = 0x20000000,
-   INVIS_ALLIANCE_BUDDY = 0x40000000,
-   INVIS_COMPANION = 0x80000000,
-   SET_BASE = 0xF8400EFB,
-   SET_INVIS_BASE = 0xF8400FFF,
-   SET_EOBJ_BASE = 0xF8400EF3
-};
-
-enum EventTypes
-{
-   EVENT_TALK = 1,
-   EVENT_EMOTE = 2,
-   EVENT_DISTANCE_BELOW = 3,
-   EVENT_DISTANCE_OVER = 4,
-   EVENT_BATTLE_REWARD = 5,
-   EVENT_CRAFT = 6,
-   EVENT_NEST = 7,
-   EVENT_EVENT_ITEM = 8,
-   EVENT_DROP = 9,
-   EVENT_WITHIN_RANGE = 10,
-   EVENT_OUTSIDE_RANGE = 11,
-   EVENT_GAME_START = 12,
-   EVENT_GAME_PROGRESS = 13,
-   EVENT_ENTER_TERRITORY = 15,
-   EVENT_GAME_COME_BACK = 17,
-   EVENT_ACTION_RESULT = 18,
-   EVENT_MATERIA_CRAFT = 19,
-   EVENT_FISHING = 20,
-   EVENT_UI = 21,
-   EVENT_HOUSING = 22,
-   EVENT_SAY = 23,
-   EVENT_TABLE_GAME = 24
-};
-
-enum EventFinishState
-{
-   UNLOCK = 1,
-   KEEPLOCK = 0
-};
-
-enum DamageType
-{
-   STD_DAMAGE = 0X03,
-   STD_HEAL = 0X04,
-   STD_MP_LOSS = 0X0A,
-   STD_MP_GAIN = 0X0B,
-   STD_TP_LOSS = 0X0C,
-   STD_TP_GAIN = 0X0D
-};
-
+#include <Event/EventDefs.h>
 
 
 #endif //SAPPHIRE_SCRIPTOBJECT_H
diff --git a/src/servers/Scripts/action/ScriptLoader.cpp b/src/servers/Scripts/action/ScriptLoader.cpp
deleted file mode 100644
index e7ba87ee..00000000
--- a/src/servers/Scripts/action/ScriptLoader.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <Script/NativeScriptApi.h>
-
-#include "ActionSprint3.cpp"
-
-const ScriptObject* ptrs[] =
-{
-   static_cast< ScriptObject* >( new ActionSprint3 ),
-
-   nullptr
-};
-
-extern "C" EXPORT const ScriptObject** getScripts()
-{
-   return ptrs;
-}
diff --git a/src/servers/Scripts/common/ScriptLoader.cpp b/src/servers/Scripts/common/ScriptLoader.cpp
deleted file mode 100644
index c1871bea..00000000
--- a/src/servers/Scripts/common/ScriptLoader.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-#include <Script/NativeScriptApi.h>
-
-#include "Aethernet.cpp"
-#include "Aetheryte.cpp"
-#include "CmnDefCutSceneReplay.cpp"
-#include "CmnDefInnBed.cpp"
-#include "CmnDefLinkShell.cpp"
-#include "HouFurOrchestrion.cpp"
-
-const ScriptObject* ptrs[] =
-{
-   static_cast< ScriptObject* >( new Aethernet ),
-   static_cast< ScriptObject* >( new Aetheryte ),
-   static_cast< ScriptObject* >( new CmnDefCutSceneReplay ),
-   static_cast< ScriptObject* >( new CmnDefInnBed ),
-   static_cast< ScriptObject* >( new CmnDefLinkShell ),
-   static_cast< ScriptObject* >( new HouFurOrchestrion ),
-
-   nullptr
-};
-
-extern "C" EXPORT const ScriptObject** getScripts()
-{
-   return ptrs;
-}
diff --git a/src/servers/Scripts/instances/AkhAfahAmphitheatreExtreme.cpp b/src/servers/Scripts/instances/AkhAfahAmphitheatreExtreme.cpp
index be319d50..fadf0cf5 100644
--- a/src/servers/Scripts/instances/AkhAfahAmphitheatreExtreme.cpp
+++ b/src/servers/Scripts/instances/AkhAfahAmphitheatreExtreme.cpp
@@ -31,7 +31,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/ScriptLoader.cpp b/src/servers/Scripts/instances/ScriptLoader.cpp
deleted file mode 100644
index 7d8fbf10..00000000
--- a/src/servers/Scripts/instances/ScriptLoader.cpp
+++ /dev/null
@@ -1,547 +0,0 @@
-#include <Script/NativeScriptApi.h>
-
-#include "AkhAfahAmphitheatreExtreme.cpp"
-#include "deepdungeon/ThePalaceoftheDeadFloors101110.cpp"
-#include "deepdungeon/ThePalaceoftheDeadFloors110.cpp"
-#include "deepdungeon/ThePalaceoftheDeadFloors111120.cpp"
-#include "deepdungeon/ThePalaceoftheDeadFloors1120.cpp"
-#include "deepdungeon/ThePalaceoftheDeadFloors121130.cpp"
-#include "deepdungeon/ThePalaceoftheDeadFloors131140.cpp"
-#include "deepdungeon/ThePalaceoftheDeadFloors141150.cpp"
-#include "deepdungeon/ThePalaceoftheDeadFloors151160.cpp"
-#include "deepdungeon/ThePalaceoftheDeadFloors161170.cpp"
-#include "deepdungeon/ThePalaceoftheDeadFloors171180.cpp"
-#include "deepdungeon/ThePalaceoftheDeadFloors181190.cpp"
-#include "deepdungeon/ThePalaceoftheDeadFloors191200.cpp"
-#include "deepdungeon/ThePalaceoftheDeadFloors2130.cpp"
-#include "deepdungeon/ThePalaceoftheDeadFloors3140.cpp"
-#include "deepdungeon/ThePalaceoftheDeadFloors4150.cpp"
-#include "deepdungeon/ThePalaceoftheDeadFloors5160.cpp"
-#include "deepdungeon/ThePalaceoftheDeadFloors6170.cpp"
-#include "deepdungeon/ThePalaceoftheDeadFloors7180.cpp"
-#include "deepdungeon/ThePalaceoftheDeadFloors8190.cpp"
-#include "deepdungeon/ThePalaceoftheDeadFloors91100.cpp"
-#include "dungeons/AlaMhigo.cpp"
-#include "dungeons/AmdaporKeep.cpp"
-#include "dungeons/AmdaporKeepHard.cpp"
-#include "dungeons/BaelsarsWall.cpp"
-#include "dungeons/BardamsMettle.cpp"
-#include "dungeons/BrayfloxsLongstop.cpp"
-#include "dungeons/BrayfloxsLongstopHard.cpp"
-#include "dungeons/CastrumAbania.cpp"
-#include "dungeons/CastrumMeridianum.cpp"
-#include "dungeons/CopperbellMines.cpp"
-#include "dungeons/CopperbellMinesHard.cpp"
-#include "dungeons/CuttersCry.cpp"
-#include "dungeons/DomaCastle.cpp"
-#include "dungeons/DzemaelDarkhold.cpp"
-#include "dungeons/Halatali.cpp"
-#include "dungeons/HalataliHard.cpp"
-#include "dungeons/HaukkeManor.cpp"
-#include "dungeons/HaukkeManorHard.cpp"
-#include "dungeons/HellsLid.cpp"
-#include "dungeons/HullbreakerIsle.cpp"
-#include "dungeons/HullbreakerIsleHard.cpp"
-#include "dungeons/KuganeCastle.cpp"
-#include "dungeons/Neverreap.cpp"
-#include "dungeons/PharosSirius.cpp"
-#include "dungeons/PharosSiriusHard.cpp"
-#include "dungeons/SaintMociannesArboretum.cpp"
-#include "dungeons/Sastasha.cpp"
-#include "dungeons/SastashaHard.cpp"
-#include "dungeons/ShisuioftheVioletTides.cpp"
-#include "dungeons/Snowcloak.cpp"
-#include "dungeons/SohmAl.cpp"
-#include "dungeons/SohmAlHard.cpp"
-#include "dungeons/SohrKhai.cpp"
-#include "dungeons/TheAery.cpp"
-#include "dungeons/TheAetherochemicalResearchFacility.cpp"
-#include "dungeons/TheAntitower.cpp"
-#include "dungeons/TheAurumVale.cpp"
-#include "dungeons/TheDrownedCityofSkalla.cpp"
-#include "dungeons/TheDuskVigil.cpp"
-#include "dungeons/TheFractalContinuum.cpp"
-#include "dungeons/TheFractalContinuumHard.cpp"
-#include "dungeons/TheGreatGubalLibrary.cpp"
-#include "dungeons/TheGreatGubalLibraryHard.cpp"
-#include "dungeons/TheKeeperoftheLake.cpp"
-#include "dungeons/TheLostCityofAmdapor.cpp"
-#include "dungeons/TheLostCityofAmdaporHard.cpp"
-#include "dungeons/ThePraetorium.cpp"
-#include "dungeons/TheSirensongSea.cpp"
-#include "dungeons/TheStoneVigil.cpp"
-#include "dungeons/TheStoneVigilHard.cpp"
-#include "dungeons/TheSunkenTempleofQarn.cpp"
-#include "dungeons/TheSunkenTempleofQarnHard.cpp"
-#include "dungeons/TheTamTaraDeepcroft.cpp"
-#include "dungeons/TheTamTaraDeepcroftHard.cpp"
-#include "dungeons/TheTempleoftheFist.cpp"
-#include "dungeons/TheThousandMawsofTotoRak.cpp"
-#include "dungeons/TheVault.cpp"
-#include "dungeons/TheWanderersPalace.cpp"
-#include "dungeons/TheWanderersPalaceHard.cpp"
-#include "dungeons/Xelphatol.cpp"
-#include "events/TheHauntedManor.cpp"
-#include "events/TheValentionesCeremony.cpp"
-#include "guildhests/AllsWellthatEndsintheWell.cpp"
-#include "guildhests/AnnoytheVoid.cpp"
-#include "guildhests/BasicTrainingEnemyParties.cpp"
-#include "guildhests/BasicTrainingEnemyStrongholds.cpp"
-#include "guildhests/FlickingSticksandTakingNames.cpp"
-#include "guildhests/HeroontheHalfShell.cpp"
-#include "guildhests/LongLivetheQueen.cpp"
-#include "guildhests/MorethanaFeeler.cpp"
-#include "guildhests/PullingPoisonPosies.cpp"
-#include "guildhests/ShadowandClaw.cpp"
-#include "guildhests/SolemnTrinity.cpp"
-#include "guildhests/StingingBack.cpp"
-#include "guildhests/UndertheArmor.cpp"
-#include "guildhests/WardUp.cpp"
-#include "hallofthenovice/AccrueEnmityfromMultipleTargets.cpp"
-#include "hallofthenovice/AssistAlliesinDefeatingaTarget.cpp"
-#include "hallofthenovice/AvoidAreaofEffectAttacks.cpp"
-#include "hallofthenovice/AvoidEngagedTargets.cpp"
-#include "hallofthenovice/DefeatanOccupiedTarget.cpp"
-#include "hallofthenovice/EngageEnemyReinforcements.cpp"
-#include "hallofthenovice/EngageMultipleTargets.cpp"
-#include "hallofthenovice/ExecuteaComboinBattle.cpp"
-#include "hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp"
-#include "hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp"
-#include "hallofthenovice/FinalExercise.cpp"
-#include "hallofthenovice/HealMultipleAllies.cpp"
-#include "hallofthenovice/HealanAlly.cpp"
-#include "hallofthenovice/InteractwiththeBattlefield.cpp"
-#include "pvp/Astragalos.cpp"
-#include "pvp/SealRockSeize.cpp"
-#include "pvp/TheBorderlandRuinsSecure.cpp"
-#include "pvp/TheFeast4on4LightParty.cpp"
-#include "pvp/TheFeast4on4Ranked.cpp"
-#include "pvp/TheFeast4on4Training.cpp"
-#include "pvp/TheFeastCustomMatchCrystalTower.cpp"
-#include "pvp/TheFeastCustomMatchFeastingGrounds.cpp"
-#include "pvp/TheFeastCustomMatchLichenweed.cpp"
-#include "pvp/TheFeastRanked.cpp"
-#include "pvp/TheFeastTeamRanked.cpp"
-#include "pvp/TheFeastTraining.cpp"
-#include "pvp/TheFieldsofGloryShatter.cpp"
-#include "questbattles/ABloodyReunion.cpp"
-#include "questbattles/ASpectaclefortheAges.cpp"
-#include "questbattles/BloodDragoon.cpp"
-#include "questbattles/BloodontheDeck.cpp"
-#include "questbattles/CuriousGorgeMeetsHisMatch.cpp"
-#include "questbattles/DarkwingDragon.cpp"
-#include "questbattles/InThalsName.cpp"
-#include "questbattles/InterdimensionalRift.cpp"
-#include "questbattles/ItsProbablyaTrap.cpp"
-#include "questbattles/MatsubaMayhem.cpp"
-#include "questbattles/Naadam.cpp"
-#include "questbattles/OneLifeforOneWorld.cpp"
-#include "questbattles/OurCompromise.cpp"
-#include "questbattles/OurUnsungHeroes.cpp"
-#include "questbattles/RaisingtheSword.cpp"
-#include "questbattles/ReturnoftheBull.cpp"
-#include "questbattles/TheBattleonBekko.cpp"
-#include "questbattles/TheCarteneauFlatsHeliodrome.cpp"
-#include "questbattles/TheFaceofTrueEvil.cpp"
-#include "questbattles/TheHeartoftheProblem.cpp"
-#include "questbattles/TheOrphansandtheBrokenBlade.cpp"
-#include "questbattles/TheResonant.cpp"
-#include "questbattles/WhenClansCollide.cpp"
-#include "questbattles/WithHeartandSteel.cpp"
-#include "raids/AlexanderTheArmoftheFather.cpp"
-#include "raids/AlexanderTheArmoftheFatherSavage.cpp"
-#include "raids/AlexanderTheArmoftheSon.cpp"
-#include "raids/AlexanderTheArmoftheSonSavage.cpp"
-#include "raids/AlexanderTheBreathoftheCreator.cpp"
-#include "raids/AlexanderTheBreathoftheCreatorSavage.cpp"
-#include "raids/AlexanderTheBurdenoftheFather.cpp"
-#include "raids/AlexanderTheBurdenoftheFatherSavage.cpp"
-#include "raids/AlexanderTheBurdenoftheSon.cpp"
-#include "raids/AlexanderTheBurdenoftheSonSavage.cpp"
-#include "raids/AlexanderTheCuffoftheFather.cpp"
-#include "raids/AlexanderTheCuffoftheFatherSavage.cpp"
-#include "raids/AlexanderTheCuffoftheSon.cpp"
-#include "raids/AlexanderTheCuffoftheSonSavage.cpp"
-#include "raids/AlexanderTheEyesoftheCreator.cpp"
-#include "raids/AlexanderTheEyesoftheCreatorSavage.cpp"
-#include "raids/AlexanderTheFistoftheFather.cpp"
-#include "raids/AlexanderTheFistoftheFatherSavage.cpp"
-#include "raids/AlexanderTheFistoftheSon.cpp"
-#include "raids/AlexanderTheFistoftheSonSavage.cpp"
-#include "raids/AlexanderTheHeartoftheCreator.cpp"
-#include "raids/AlexanderTheHeartoftheCreatorSavage.cpp"
-#include "raids/AlexanderTheSouloftheCreator.cpp"
-#include "raids/AlexanderTheSouloftheCreatorSavage.cpp"
-#include "raids/DeltascapeV10.cpp"
-#include "raids/DeltascapeV10Savage.cpp"
-#include "raids/DeltascapeV20.cpp"
-#include "raids/DeltascapeV20Savage.cpp"
-#include "raids/DeltascapeV30.cpp"
-#include "raids/DeltascapeV30Savage.cpp"
-#include "raids/DeltascapeV40.cpp"
-#include "raids/DeltascapeV40Savage.cpp"
-#include "raids/DunScaith.cpp"
-#include "raids/SigmascapeV10.cpp"
-#include "raids/SigmascapeV10Savage.cpp"
-#include "raids/SigmascapeV20.cpp"
-#include "raids/SigmascapeV20Savage.cpp"
-#include "raids/SigmascapeV30.cpp"
-#include "raids/SigmascapeV30Savage.cpp"
-#include "raids/SigmascapeV40.cpp"
-#include "raids/SigmascapeV40Savage.cpp"
-#include "raids/SyrcusTower.cpp"
-#include "raids/TheBindingCoilofBahamutTurn1.cpp"
-#include "raids/TheBindingCoilofBahamutTurn2.cpp"
-#include "raids/TheBindingCoilofBahamutTurn3.cpp"
-#include "raids/TheBindingCoilofBahamutTurn4.cpp"
-#include "raids/TheBindingCoilofBahamutTurn5.cpp"
-#include "raids/TheFinalCoilofBahamutTurn1.cpp"
-#include "raids/TheFinalCoilofBahamutTurn2.cpp"
-#include "raids/TheFinalCoilofBahamutTurn3.cpp"
-#include "raids/TheFinalCoilofBahamutTurn4.cpp"
-#include "raids/TheLabyrinthoftheAncients.cpp"
-#include "raids/TheRoyalCityofRabanastre.cpp"
-#include "raids/TheSecondCoilofBahamutSavageTurn1.cpp"
-#include "raids/TheSecondCoilofBahamutSavageTurn2.cpp"
-#include "raids/TheSecondCoilofBahamutSavageTurn3.cpp"
-#include "raids/TheSecondCoilofBahamutSavageTurn4.cpp"
-#include "raids/TheSecondCoilofBahamutTurn1.cpp"
-#include "raids/TheSecondCoilofBahamutTurn2.cpp"
-#include "raids/TheSecondCoilofBahamutTurn3.cpp"
-#include "raids/TheSecondCoilofBahamutTurn4.cpp"
-#include "raids/TheUnendingCoilofBahamutUltimate.cpp"
-#include "raids/TheVoidArk.cpp"
-#include "raids/TheWeepingCityofMhach.cpp"
-#include "raids/TheWorldofDarkness.cpp"
-#include "treasurehunt/TheAquapolis.cpp"
-#include "treasurehunt/TheHiddenCanalsofUznair.cpp"
-#include "treasurehunt/TheLostCanalsofUznair.cpp"
-#include "trials/ARelicReborntheChimera.cpp"
-#include "trials/ARelicReborntheHydra.cpp"
-#include "trials/AkhAfahAmphitheatreHard.cpp"
-#include "trials/BattleintheBigKeep.cpp"
-#include "trials/BattleontheBigBridge.cpp"
-#include "trials/CapeWestwind.cpp"
-#include "trials/ContainmentBayP1T6.cpp"
-#include "trials/ContainmentBayP1T6Extreme.cpp"
-#include "trials/ContainmentBayS1T7.cpp"
-#include "trials/ContainmentBayS1T7Extreme.cpp"
-#include "trials/ContainmentBayZ1T9.cpp"
-#include "trials/ContainmentBayZ1T9Extreme.cpp"
-#include "trials/Emanation.cpp"
-#include "trials/EmanationExtreme.cpp"
-#include "trials/SpecialEventI.cpp"
-#include "trials/SpecialEventII.cpp"
-#include "trials/SpecialEventIII.cpp"
-#include "trials/TheBowlofEmbers.cpp"
-#include "trials/TheBowlofEmbersExtreme.cpp"
-#include "trials/TheBowlofEmbersHard.cpp"
-#include "trials/TheChrysalis.cpp"
-#include "trials/TheDragonsNeck.cpp"
-#include "trials/TheFinalStepsofFaith.cpp"
-#include "trials/TheHowlingEye.cpp"
-#include "trials/TheHowlingEyeExtreme.cpp"
-#include "trials/TheHowlingEyeHard.cpp"
-#include "trials/TheJadeStoa.cpp"
-#include "trials/TheJadeStoaExtreme.cpp"
-#include "trials/TheLimitlessBlueExtreme.cpp"
-#include "trials/TheLimitlessBlueHard.cpp"
-#include "trials/TheMinstrelsBalladNidhoggsRage.cpp"
-#include "trials/TheMinstrelsBalladShinryusDomain.cpp"
-#include "trials/TheMinstrelsBalladThordansReign.cpp"
-#include "trials/TheMinstrelsBalladUltimasBane.cpp"
-#include "trials/TheNavel.cpp"
-#include "trials/TheNavelExtreme.cpp"
-#include "trials/TheNavelHard.cpp"
-#include "trials/ThePoolofTribute.cpp"
-#include "trials/ThePoolofTributeExtreme.cpp"
-#include "trials/TheRoyalMenagerie.cpp"
-#include "trials/TheSingularityReactor.cpp"
-#include "trials/TheStepsofFaith.cpp"
-#include "trials/TheStrikingTreeExtreme.cpp"
-#include "trials/TheStrikingTreeHard.cpp"
-#include "trials/TheWhorleaterExtreme.cpp"
-#include "trials/TheWhorleaterHard.cpp"
-#include "trials/ThokastThokExtreme.cpp"
-#include "trials/ThokastThokHard.cpp"
-#include "trials/ThornmarchExtreme.cpp"
-#include "trials/ThornmarchHard.cpp"
-#include "trials/UrthsFount.cpp"
-
-const ScriptObject* ptrs[] =
-{
-   static_cast< ScriptObject* >( new AkhAfahAmphitheatreExtreme ),
-   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors101110 ),
-   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors110 ),
-   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors111120 ),
-   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors1120 ),
-   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors121130 ),
-   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors131140 ),
-   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors141150 ),
-   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors151160 ),
-   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors161170 ),
-   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors171180 ),
-   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors181190 ),
-   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors191200 ),
-   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors2130 ),
-   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors3140 ),
-   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors4150 ),
-   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors5160 ),
-   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors6170 ),
-   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors7180 ),
-   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors8190 ),
-   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors91100 ),
-   static_cast< ScriptObject* >( new AlaMhigo ),
-   static_cast< ScriptObject* >( new AmdaporKeep ),
-   static_cast< ScriptObject* >( new AmdaporKeepHard ),
-   static_cast< ScriptObject* >( new BaelsarsWall ),
-   static_cast< ScriptObject* >( new BardamsMettle ),
-   static_cast< ScriptObject* >( new BrayfloxsLongstop ),
-   static_cast< ScriptObject* >( new BrayfloxsLongstopHard ),
-   static_cast< ScriptObject* >( new CastrumAbania ),
-   static_cast< ScriptObject* >( new CastrumMeridianum ),
-   static_cast< ScriptObject* >( new CopperbellMines ),
-   static_cast< ScriptObject* >( new CopperbellMinesHard ),
-   static_cast< ScriptObject* >( new CuttersCry ),
-   static_cast< ScriptObject* >( new DomaCastle ),
-   static_cast< ScriptObject* >( new DzemaelDarkhold ),
-   static_cast< ScriptObject* >( new Halatali ),
-   static_cast< ScriptObject* >( new HalataliHard ),
-   static_cast< ScriptObject* >( new HaukkeManor ),
-   static_cast< ScriptObject* >( new HaukkeManorHard ),
-   static_cast< ScriptObject* >( new HellsLid ),
-   static_cast< ScriptObject* >( new HullbreakerIsle ),
-   static_cast< ScriptObject* >( new HullbreakerIsleHard ),
-   static_cast< ScriptObject* >( new KuganeCastle ),
-   static_cast< ScriptObject* >( new Neverreap ),
-   static_cast< ScriptObject* >( new PharosSirius ),
-   static_cast< ScriptObject* >( new PharosSiriusHard ),
-   static_cast< ScriptObject* >( new SaintMociannesArboretum ),
-   static_cast< ScriptObject* >( new Sastasha ),
-   static_cast< ScriptObject* >( new SastashaHard ),
-   static_cast< ScriptObject* >( new ShisuioftheVioletTides ),
-   static_cast< ScriptObject* >( new Snowcloak ),
-   static_cast< ScriptObject* >( new SohmAl ),
-   static_cast< ScriptObject* >( new SohmAlHard ),
-   static_cast< ScriptObject* >( new SohrKhai ),
-   static_cast< ScriptObject* >( new TheAery ),
-   static_cast< ScriptObject* >( new TheAetherochemicalResearchFacility ),
-   static_cast< ScriptObject* >( new TheAntitower ),
-   static_cast< ScriptObject* >( new TheAurumVale ),
-   static_cast< ScriptObject* >( new TheDrownedCityofSkalla ),
-   static_cast< ScriptObject* >( new TheDuskVigil ),
-   static_cast< ScriptObject* >( new TheFractalContinuum ),
-   static_cast< ScriptObject* >( new TheFractalContinuumHard ),
-   static_cast< ScriptObject* >( new TheGreatGubalLibrary ),
-   static_cast< ScriptObject* >( new TheGreatGubalLibraryHard ),
-   static_cast< ScriptObject* >( new TheKeeperoftheLake ),
-   static_cast< ScriptObject* >( new TheLostCityofAmdapor ),
-   static_cast< ScriptObject* >( new TheLostCityofAmdaporHard ),
-   static_cast< ScriptObject* >( new ThePraetorium ),
-   static_cast< ScriptObject* >( new TheSirensongSea ),
-   static_cast< ScriptObject* >( new TheStoneVigil ),
-   static_cast< ScriptObject* >( new TheStoneVigilHard ),
-   static_cast< ScriptObject* >( new TheSunkenTempleofQarn ),
-   static_cast< ScriptObject* >( new TheSunkenTempleofQarnHard ),
-   static_cast< ScriptObject* >( new TheTamTaraDeepcroft ),
-   static_cast< ScriptObject* >( new TheTamTaraDeepcroftHard ),
-   static_cast< ScriptObject* >( new TheTempleoftheFist ),
-   static_cast< ScriptObject* >( new TheThousandMawsofTotoRak ),
-   static_cast< ScriptObject* >( new TheVault ),
-   static_cast< ScriptObject* >( new TheWanderersPalace ),
-   static_cast< ScriptObject* >( new TheWanderersPalaceHard ),
-   static_cast< ScriptObject* >( new Xelphatol ),
-   static_cast< ScriptObject* >( new TheHauntedManor ),
-   static_cast< ScriptObject* >( new TheValentionesCeremony ),
-   static_cast< ScriptObject* >( new AllsWellthatEndsintheWell ),
-   static_cast< ScriptObject* >( new AnnoytheVoid ),
-   static_cast< ScriptObject* >( new BasicTrainingEnemyParties ),
-   static_cast< ScriptObject* >( new BasicTrainingEnemyStrongholds ),
-   static_cast< ScriptObject* >( new FlickingSticksandTakingNames ),
-   static_cast< ScriptObject* >( new HeroontheHalfShell ),
-   static_cast< ScriptObject* >( new LongLivetheQueen ),
-   static_cast< ScriptObject* >( new MorethanaFeeler ),
-   static_cast< ScriptObject* >( new PullingPoisonPosies ),
-   static_cast< ScriptObject* >( new ShadowandClaw ),
-   static_cast< ScriptObject* >( new SolemnTrinity ),
-   static_cast< ScriptObject* >( new StingingBack ),
-   static_cast< ScriptObject* >( new UndertheArmor ),
-   static_cast< ScriptObject* >( new WardUp ),
-   static_cast< ScriptObject* >( new AccrueEnmityfromMultipleTargets ),
-   static_cast< ScriptObject* >( new AssistAlliesinDefeatingaTarget ),
-   static_cast< ScriptObject* >( new AvoidAreaofEffectAttacks ),
-   static_cast< ScriptObject* >( new AvoidEngagedTargets ),
-   static_cast< ScriptObject* >( new DefeatanOccupiedTarget ),
-   static_cast< ScriptObject* >( new EngageEnemyReinforcements ),
-   static_cast< ScriptObject* >( new EngageMultipleTargets ),
-   static_cast< ScriptObject* >( new ExecuteaComboinBattle ),
-   static_cast< ScriptObject* >( new ExecuteaCombotoIncreaseEnmity ),
-   static_cast< ScriptObject* >( new ExecuteaRangedAttacktoIncreaseEnmity ),
-   static_cast< ScriptObject* >( new FinalExercise ),
-   static_cast< ScriptObject* >( new HealMultipleAllies ),
-   static_cast< ScriptObject* >( new HealanAlly ),
-   static_cast< ScriptObject* >( new InteractwiththeBattlefield ),
-   static_cast< ScriptObject* >( new Astragalos ),
-   static_cast< ScriptObject* >( new SealRockSeize ),
-   static_cast< ScriptObject* >( new TheBorderlandRuinsSecure ),
-   static_cast< ScriptObject* >( new TheFeast4on4LightParty ),
-   static_cast< ScriptObject* >( new TheFeast4on4Ranked ),
-   static_cast< ScriptObject* >( new TheFeast4on4Training ),
-   static_cast< ScriptObject* >( new TheFeastCustomMatchCrystalTower ),
-   static_cast< ScriptObject* >( new TheFeastCustomMatchFeastingGrounds ),
-   static_cast< ScriptObject* >( new TheFeastCustomMatchLichenweed ),
-   static_cast< ScriptObject* >( new TheFeastRanked ),
-   static_cast< ScriptObject* >( new TheFeastTeamRanked ),
-   static_cast< ScriptObject* >( new TheFeastTraining ),
-   static_cast< ScriptObject* >( new TheFieldsofGloryShatter ),
-   static_cast< ScriptObject* >( new ABloodyReunion ),
-   static_cast< ScriptObject* >( new ASpectaclefortheAges ),
-   static_cast< ScriptObject* >( new BloodDragoon ),
-   static_cast< ScriptObject* >( new BloodontheDeck ),
-   static_cast< ScriptObject* >( new CuriousGorgeMeetsHisMatch ),
-   static_cast< ScriptObject* >( new DarkwingDragon ),
-   static_cast< ScriptObject* >( new InThalsName ),
-   static_cast< ScriptObject* >( new InterdimensionalRift ),
-   static_cast< ScriptObject* >( new ItsProbablyaTrap ),
-   static_cast< ScriptObject* >( new MatsubaMayhem ),
-   static_cast< ScriptObject* >( new Naadam ),
-   static_cast< ScriptObject* >( new OneLifeforOneWorld ),
-   static_cast< ScriptObject* >( new OurCompromise ),
-   static_cast< ScriptObject* >( new OurUnsungHeroes ),
-   static_cast< ScriptObject* >( new RaisingtheSword ),
-   static_cast< ScriptObject* >( new ReturnoftheBull ),
-   static_cast< ScriptObject* >( new TheBattleonBekko ),
-   static_cast< ScriptObject* >( new TheCarteneauFlatsHeliodrome ),
-   static_cast< ScriptObject* >( new TheFaceofTrueEvil ),
-   static_cast< ScriptObject* >( new TheHeartoftheProblem ),
-   static_cast< ScriptObject* >( new TheOrphansandtheBrokenBlade ),
-   static_cast< ScriptObject* >( new TheResonant ),
-   static_cast< ScriptObject* >( new WhenClansCollide ),
-   static_cast< ScriptObject* >( new WithHeartandSteel ),
-   static_cast< ScriptObject* >( new AlexanderTheArmoftheFather ),
-   static_cast< ScriptObject* >( new AlexanderTheArmoftheFatherSavage ),
-   static_cast< ScriptObject* >( new AlexanderTheArmoftheSon ),
-   static_cast< ScriptObject* >( new AlexanderTheArmoftheSonSavage ),
-   static_cast< ScriptObject* >( new AlexanderTheBreathoftheCreator ),
-   static_cast< ScriptObject* >( new AlexanderTheBreathoftheCreatorSavage ),
-   static_cast< ScriptObject* >( new AlexanderTheBurdenoftheFather ),
-   static_cast< ScriptObject* >( new AlexanderTheBurdenoftheFatherSavage ),
-   static_cast< ScriptObject* >( new AlexanderTheBurdenoftheSon ),
-   static_cast< ScriptObject* >( new AlexanderTheBurdenoftheSonSavage ),
-   static_cast< ScriptObject* >( new AlexanderTheCuffoftheFather ),
-   static_cast< ScriptObject* >( new AlexanderTheCuffoftheFatherSavage ),
-   static_cast< ScriptObject* >( new AlexanderTheCuffoftheSon ),
-   static_cast< ScriptObject* >( new AlexanderTheCuffoftheSonSavage ),
-   static_cast< ScriptObject* >( new AlexanderTheEyesoftheCreator ),
-   static_cast< ScriptObject* >( new AlexanderTheEyesoftheCreatorSavage ),
-   static_cast< ScriptObject* >( new AlexanderTheFistoftheFather ),
-   static_cast< ScriptObject* >( new AlexanderTheFistoftheFatherSavage ),
-   static_cast< ScriptObject* >( new AlexanderTheFistoftheSon ),
-   static_cast< ScriptObject* >( new AlexanderTheFistoftheSonSavage ),
-   static_cast< ScriptObject* >( new AlexanderTheHeartoftheCreator ),
-   static_cast< ScriptObject* >( new AlexanderTheHeartoftheCreatorSavage ),
-   static_cast< ScriptObject* >( new AlexanderTheSouloftheCreator ),
-   static_cast< ScriptObject* >( new AlexanderTheSouloftheCreatorSavage ),
-   static_cast< ScriptObject* >( new DeltascapeV10 ),
-   static_cast< ScriptObject* >( new DeltascapeV10Savage ),
-   static_cast< ScriptObject* >( new DeltascapeV20 ),
-   static_cast< ScriptObject* >( new DeltascapeV20Savage ),
-   static_cast< ScriptObject* >( new DeltascapeV30 ),
-   static_cast< ScriptObject* >( new DeltascapeV30Savage ),
-   static_cast< ScriptObject* >( new DeltascapeV40 ),
-   static_cast< ScriptObject* >( new DeltascapeV40Savage ),
-   static_cast< ScriptObject* >( new DunScaith ),
-   static_cast< ScriptObject* >( new SigmascapeV10 ),
-   static_cast< ScriptObject* >( new SigmascapeV10Savage ),
-   static_cast< ScriptObject* >( new SigmascapeV20 ),
-   static_cast< ScriptObject* >( new SigmascapeV20Savage ),
-   static_cast< ScriptObject* >( new SigmascapeV30 ),
-   static_cast< ScriptObject* >( new SigmascapeV30Savage ),
-   static_cast< ScriptObject* >( new SigmascapeV40 ),
-   static_cast< ScriptObject* >( new SigmascapeV40Savage ),
-   static_cast< ScriptObject* >( new SyrcusTower ),
-   static_cast< ScriptObject* >( new TheBindingCoilofBahamutTurn1 ),
-   static_cast< ScriptObject* >( new TheBindingCoilofBahamutTurn2 ),
-   static_cast< ScriptObject* >( new TheBindingCoilofBahamutTurn3 ),
-   static_cast< ScriptObject* >( new TheBindingCoilofBahamutTurn4 ),
-   static_cast< ScriptObject* >( new TheBindingCoilofBahamutTurn5 ),
-   static_cast< ScriptObject* >( new TheFinalCoilofBahamutTurn1 ),
-   static_cast< ScriptObject* >( new TheFinalCoilofBahamutTurn2 ),
-   static_cast< ScriptObject* >( new TheFinalCoilofBahamutTurn3 ),
-   static_cast< ScriptObject* >( new TheFinalCoilofBahamutTurn4 ),
-   static_cast< ScriptObject* >( new TheLabyrinthoftheAncients ),
-   static_cast< ScriptObject* >( new TheRoyalCityofRabanastre ),
-   static_cast< ScriptObject* >( new TheSecondCoilofBahamutSavageTurn1 ),
-   static_cast< ScriptObject* >( new TheSecondCoilofBahamutSavageTurn2 ),
-   static_cast< ScriptObject* >( new TheSecondCoilofBahamutSavageTurn3 ),
-   static_cast< ScriptObject* >( new TheSecondCoilofBahamutSavageTurn4 ),
-   static_cast< ScriptObject* >( new TheSecondCoilofBahamutTurn1 ),
-   static_cast< ScriptObject* >( new TheSecondCoilofBahamutTurn2 ),
-   static_cast< ScriptObject* >( new TheSecondCoilofBahamutTurn3 ),
-   static_cast< ScriptObject* >( new TheSecondCoilofBahamutTurn4 ),
-   static_cast< ScriptObject* >( new TheUnendingCoilofBahamutUltimate ),
-   static_cast< ScriptObject* >( new TheVoidArk ),
-   static_cast< ScriptObject* >( new TheWeepingCityofMhach ),
-   static_cast< ScriptObject* >( new TheWorldofDarkness ),
-   static_cast< ScriptObject* >( new TheAquapolis ),
-   static_cast< ScriptObject* >( new TheHiddenCanalsofUznair ),
-   static_cast< ScriptObject* >( new TheLostCanalsofUznair ),
-   static_cast< ScriptObject* >( new ARelicReborntheChimera ),
-   static_cast< ScriptObject* >( new ARelicReborntheHydra ),
-   static_cast< ScriptObject* >( new AkhAfahAmphitheatreHard ),
-   static_cast< ScriptObject* >( new BattleintheBigKeep ),
-   static_cast< ScriptObject* >( new BattleontheBigBridge ),
-   static_cast< ScriptObject* >( new CapeWestwind ),
-   static_cast< ScriptObject* >( new ContainmentBayP1T6 ),
-   static_cast< ScriptObject* >( new ContainmentBayP1T6Extreme ),
-   static_cast< ScriptObject* >( new ContainmentBayS1T7 ),
-   static_cast< ScriptObject* >( new ContainmentBayS1T7Extreme ),
-   static_cast< ScriptObject* >( new ContainmentBayZ1T9 ),
-   static_cast< ScriptObject* >( new ContainmentBayZ1T9Extreme ),
-   static_cast< ScriptObject* >( new Emanation ),
-   static_cast< ScriptObject* >( new EmanationExtreme ),
-   static_cast< ScriptObject* >( new SpecialEventI ),
-   static_cast< ScriptObject* >( new SpecialEventII ),
-   static_cast< ScriptObject* >( new SpecialEventIII ),
-   static_cast< ScriptObject* >( new TheBowlofEmbers ),
-   static_cast< ScriptObject* >( new TheBowlofEmbersExtreme ),
-   static_cast< ScriptObject* >( new TheBowlofEmbersHard ),
-   static_cast< ScriptObject* >( new TheChrysalis ),
-   static_cast< ScriptObject* >( new TheDragonsNeck ),
-   static_cast< ScriptObject* >( new TheFinalStepsofFaith ),
-   static_cast< ScriptObject* >( new TheHowlingEye ),
-   static_cast< ScriptObject* >( new TheHowlingEyeExtreme ),
-   static_cast< ScriptObject* >( new TheHowlingEyeHard ),
-   static_cast< ScriptObject* >( new TheJadeStoa ),
-   static_cast< ScriptObject* >( new TheJadeStoaExtreme ),
-   static_cast< ScriptObject* >( new TheLimitlessBlueExtreme ),
-   static_cast< ScriptObject* >( new TheLimitlessBlueHard ),
-   static_cast< ScriptObject* >( new TheMinstrelsBalladNidhoggsRage ),
-   static_cast< ScriptObject* >( new TheMinstrelsBalladShinryusDomain ),
-   static_cast< ScriptObject* >( new TheMinstrelsBalladThordansReign ),
-   static_cast< ScriptObject* >( new TheMinstrelsBalladUltimasBane ),
-   static_cast< ScriptObject* >( new TheNavel ),
-   static_cast< ScriptObject* >( new TheNavelExtreme ),
-   static_cast< ScriptObject* >( new TheNavelHard ),
-   static_cast< ScriptObject* >( new ThePoolofTribute ),
-   static_cast< ScriptObject* >( new ThePoolofTributeExtreme ),
-   static_cast< ScriptObject* >( new TheRoyalMenagerie ),
-   static_cast< ScriptObject* >( new TheSingularityReactor ),
-   static_cast< ScriptObject* >( new TheStepsofFaith ),
-   static_cast< ScriptObject* >( new TheStrikingTreeExtreme ),
-   static_cast< ScriptObject* >( new TheStrikingTreeHard ),
-   static_cast< ScriptObject* >( new TheWhorleaterExtreme ),
-   static_cast< ScriptObject* >( new TheWhorleaterHard ),
-   static_cast< ScriptObject* >( new ThokastThokExtreme ),
-   static_cast< ScriptObject* >( new ThokastThokHard ),
-   static_cast< ScriptObject* >( new ThornmarchExtreme ),
-   static_cast< ScriptObject* >( new ThornmarchHard ),
-   static_cast< ScriptObject* >( new UrthsFount ),
-
-   nullptr
-};
-
-extern "C" EXPORT const ScriptObject** getScripts()
-{
-   return ptrs;
-}
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors101110.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors101110.cpp
index de850179..711fae97 100644
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors101110.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors101110.cpp
@@ -21,7 +21,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors110.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors110.cpp
index 1c25a60f..855e7490 100644
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors110.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors110.cpp
@@ -19,7 +19,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors111120.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors111120.cpp
index b87eed6a..a7c11f16 100644
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors111120.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors111120.cpp
@@ -19,7 +19,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors1120.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors1120.cpp
index eb9351c4..2a437c06 100644
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors1120.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors1120.cpp
@@ -19,7 +19,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors121130.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors121130.cpp
index c2e42eb6..dcaa393a 100644
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors121130.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors121130.cpp
@@ -19,7 +19,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors131140.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors131140.cpp
index 9ee44ddd..4188d6e8 100644
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors131140.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors131140.cpp
@@ -19,7 +19,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors141150.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors141150.cpp
index 66849a89..5c3523d5 100644
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors141150.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors141150.cpp
@@ -19,7 +19,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors151160.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors151160.cpp
index 9acc04d7..802de0e8 100644
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors151160.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors151160.cpp
@@ -19,7 +19,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors161170.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors161170.cpp
index 63fb7730..4b892ff3 100644
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors161170.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors161170.cpp
@@ -19,7 +19,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors171180.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors171180.cpp
index 8e2d2dd6..38adbaca 100644
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors171180.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors171180.cpp
@@ -19,7 +19,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors181190.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors181190.cpp
index 16f8221a..dedc42fc 100644
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors181190.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors181190.cpp
@@ -19,7 +19,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors191200.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors191200.cpp
index 6669f0d4..df4d3f25 100644
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors191200.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors191200.cpp
@@ -19,7 +19,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors2130.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors2130.cpp
index b73a152c..f529b0a7 100644
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors2130.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors2130.cpp
@@ -19,7 +19,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp
index be1b135f..9566958d 100644
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp
@@ -27,7 +27,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors4150.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors4150.cpp
index 33731057..67e35bca 100644
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors4150.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors4150.cpp
@@ -27,7 +27,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors5160.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors5160.cpp
index e37a1fbf..108b616e 100644
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors5160.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors5160.cpp
@@ -19,7 +19,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors6170.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors6170.cpp
index 76d13804..e97c0a35 100644
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors6170.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors6170.cpp
@@ -19,7 +19,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors7180.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors7180.cpp
index 0423fd4d..2cac3524 100644
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors7180.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors7180.cpp
@@ -19,7 +19,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors8190.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors8190.cpp
index c4d2325c..6e883ccf 100644
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors8190.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors8190.cpp
@@ -21,7 +21,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors91100.cpp b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors91100.cpp
index ec178993..28f672d8 100644
--- a/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors91100.cpp
+++ b/src/servers/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors91100.cpp
@@ -21,7 +21,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/AlaMhigo.cpp b/src/servers/Scripts/instances/dungeons/AlaMhigo.cpp
index e2a4b4c1..e4350243 100644
--- a/src/servers/Scripts/instances/dungeons/AlaMhigo.cpp
+++ b/src/servers/Scripts/instances/dungeons/AlaMhigo.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/AmdaporKeep.cpp b/src/servers/Scripts/instances/dungeons/AmdaporKeep.cpp
index 96e289e1..f0934771 100644
--- a/src/servers/Scripts/instances/dungeons/AmdaporKeep.cpp
+++ b/src/servers/Scripts/instances/dungeons/AmdaporKeep.cpp
@@ -140,7 +140,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/AmdaporKeepHard.cpp b/src/servers/Scripts/instances/dungeons/AmdaporKeepHard.cpp
index c9f94f9e..512146c4 100644
--- a/src/servers/Scripts/instances/dungeons/AmdaporKeepHard.cpp
+++ b/src/servers/Scripts/instances/dungeons/AmdaporKeepHard.cpp
@@ -57,7 +57,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/BaelsarsWall.cpp b/src/servers/Scripts/instances/dungeons/BaelsarsWall.cpp
index e15fd097..ec9e761e 100644
--- a/src/servers/Scripts/instances/dungeons/BaelsarsWall.cpp
+++ b/src/servers/Scripts/instances/dungeons/BaelsarsWall.cpp
@@ -49,7 +49,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/BardamsMettle.cpp b/src/servers/Scripts/instances/dungeons/BardamsMettle.cpp
index 2883817c..2ca73d36 100644
--- a/src/servers/Scripts/instances/dungeons/BardamsMettle.cpp
+++ b/src/servers/Scripts/instances/dungeons/BardamsMettle.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/BrayfloxsLongstop.cpp b/src/servers/Scripts/instances/dungeons/BrayfloxsLongstop.cpp
index 7491e30b..48aeb8b3 100644
--- a/src/servers/Scripts/instances/dungeons/BrayfloxsLongstop.cpp
+++ b/src/servers/Scripts/instances/dungeons/BrayfloxsLongstop.cpp
@@ -40,7 +40,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/BrayfloxsLongstopHard.cpp b/src/servers/Scripts/instances/dungeons/BrayfloxsLongstopHard.cpp
index 4ca4e515..145e0171 100644
--- a/src/servers/Scripts/instances/dungeons/BrayfloxsLongstopHard.cpp
+++ b/src/servers/Scripts/instances/dungeons/BrayfloxsLongstopHard.cpp
@@ -46,7 +46,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/CastrumAbania.cpp b/src/servers/Scripts/instances/dungeons/CastrumAbania.cpp
index 8fda1a59..cd6a9c1a 100644
--- a/src/servers/Scripts/instances/dungeons/CastrumAbania.cpp
+++ b/src/servers/Scripts/instances/dungeons/CastrumAbania.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/CastrumMeridianum.cpp b/src/servers/Scripts/instances/dungeons/CastrumMeridianum.cpp
index eb5f3f7d..6c604220 100644
--- a/src/servers/Scripts/instances/dungeons/CastrumMeridianum.cpp
+++ b/src/servers/Scripts/instances/dungeons/CastrumMeridianum.cpp
@@ -87,7 +87,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/CopperbellMines.cpp b/src/servers/Scripts/instances/dungeons/CopperbellMines.cpp
index e9a3fcf3..a8189c10 100644
--- a/src/servers/Scripts/instances/dungeons/CopperbellMines.cpp
+++ b/src/servers/Scripts/instances/dungeons/CopperbellMines.cpp
@@ -71,7 +71,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/CopperbellMinesHard.cpp b/src/servers/Scripts/instances/dungeons/CopperbellMinesHard.cpp
index c709a97d..58073b22 100644
--- a/src/servers/Scripts/instances/dungeons/CopperbellMinesHard.cpp
+++ b/src/servers/Scripts/instances/dungeons/CopperbellMinesHard.cpp
@@ -63,7 +63,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/CuttersCry.cpp b/src/servers/Scripts/instances/dungeons/CuttersCry.cpp
index 19f9c0c4..d65b21fd 100644
--- a/src/servers/Scripts/instances/dungeons/CuttersCry.cpp
+++ b/src/servers/Scripts/instances/dungeons/CuttersCry.cpp
@@ -57,7 +57,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/DomaCastle.cpp b/src/servers/Scripts/instances/dungeons/DomaCastle.cpp
index 11984570..9b18b769 100644
--- a/src/servers/Scripts/instances/dungeons/DomaCastle.cpp
+++ b/src/servers/Scripts/instances/dungeons/DomaCastle.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/DzemaelDarkhold.cpp b/src/servers/Scripts/instances/dungeons/DzemaelDarkhold.cpp
index 11e96c5d..cd6bb243 100644
--- a/src/servers/Scripts/instances/dungeons/DzemaelDarkhold.cpp
+++ b/src/servers/Scripts/instances/dungeons/DzemaelDarkhold.cpp
@@ -117,7 +117,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/Halatali.cpp b/src/servers/Scripts/instances/dungeons/Halatali.cpp
index 01d6a55f..8f7cdb59 100644
--- a/src/servers/Scripts/instances/dungeons/Halatali.cpp
+++ b/src/servers/Scripts/instances/dungeons/Halatali.cpp
@@ -68,7 +68,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/HalataliHard.cpp b/src/servers/Scripts/instances/dungeons/HalataliHard.cpp
index b4ed9722..95d78de6 100644
--- a/src/servers/Scripts/instances/dungeons/HalataliHard.cpp
+++ b/src/servers/Scripts/instances/dungeons/HalataliHard.cpp
@@ -73,7 +73,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/HaukkeManor.cpp b/src/servers/Scripts/instances/dungeons/HaukkeManor.cpp
index 0928015d..ba476a83 100644
--- a/src/servers/Scripts/instances/dungeons/HaukkeManor.cpp
+++ b/src/servers/Scripts/instances/dungeons/HaukkeManor.cpp
@@ -61,7 +61,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/HaukkeManorHard.cpp b/src/servers/Scripts/instances/dungeons/HaukkeManorHard.cpp
index 2209df6e..05c91502 100644
--- a/src/servers/Scripts/instances/dungeons/HaukkeManorHard.cpp
+++ b/src/servers/Scripts/instances/dungeons/HaukkeManorHard.cpp
@@ -87,7 +87,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/HellsLid.cpp b/src/servers/Scripts/instances/dungeons/HellsLid.cpp
index e692ceef..c2309cb4 100644
--- a/src/servers/Scripts/instances/dungeons/HellsLid.cpp
+++ b/src/servers/Scripts/instances/dungeons/HellsLid.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/HullbreakerIsle.cpp b/src/servers/Scripts/instances/dungeons/HullbreakerIsle.cpp
index 246a85c0..87446f15 100644
--- a/src/servers/Scripts/instances/dungeons/HullbreakerIsle.cpp
+++ b/src/servers/Scripts/instances/dungeons/HullbreakerIsle.cpp
@@ -85,7 +85,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/HullbreakerIsleHard.cpp b/src/servers/Scripts/instances/dungeons/HullbreakerIsleHard.cpp
index cf3d839a..f3d16e4b 100644
--- a/src/servers/Scripts/instances/dungeons/HullbreakerIsleHard.cpp
+++ b/src/servers/Scripts/instances/dungeons/HullbreakerIsleHard.cpp
@@ -48,7 +48,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/KuganeCastle.cpp b/src/servers/Scripts/instances/dungeons/KuganeCastle.cpp
index 54d14361..9e05a7ea 100644
--- a/src/servers/Scripts/instances/dungeons/KuganeCastle.cpp
+++ b/src/servers/Scripts/instances/dungeons/KuganeCastle.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/Neverreap.cpp b/src/servers/Scripts/instances/dungeons/Neverreap.cpp
index 98ead40a..d2bbf14f 100644
--- a/src/servers/Scripts/instances/dungeons/Neverreap.cpp
+++ b/src/servers/Scripts/instances/dungeons/Neverreap.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/PharosSirius.cpp b/src/servers/Scripts/instances/dungeons/PharosSirius.cpp
index dd17eb61..013daa40 100644
--- a/src/servers/Scripts/instances/dungeons/PharosSirius.cpp
+++ b/src/servers/Scripts/instances/dungeons/PharosSirius.cpp
@@ -52,7 +52,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/PharosSiriusHard.cpp b/src/servers/Scripts/instances/dungeons/PharosSiriusHard.cpp
index 3087fe9a..8d7e4864 100644
--- a/src/servers/Scripts/instances/dungeons/PharosSiriusHard.cpp
+++ b/src/servers/Scripts/instances/dungeons/PharosSiriusHard.cpp
@@ -49,7 +49,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/SaintMociannesArboretum.cpp b/src/servers/Scripts/instances/dungeons/SaintMociannesArboretum.cpp
index beb7637b..bc4139bb 100644
--- a/src/servers/Scripts/instances/dungeons/SaintMociannesArboretum.cpp
+++ b/src/servers/Scripts/instances/dungeons/SaintMociannesArboretum.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/Sastasha.cpp b/src/servers/Scripts/instances/dungeons/Sastasha.cpp
index 9a2d1377..cfdd3837 100644
--- a/src/servers/Scripts/instances/dungeons/Sastasha.cpp
+++ b/src/servers/Scripts/instances/dungeons/Sastasha.cpp
@@ -69,9 +69,9 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
    {
-      player.directorPlayScene( getId(), 1, NO_DEFAULT_CAMERA | HIDE_HOTBAR, 0, 0xA );
+
    }
 
 };
\ No newline at end of file
diff --git a/src/servers/Scripts/instances/dungeons/SastashaHard.cpp b/src/servers/Scripts/instances/dungeons/SastashaHard.cpp
index 19e0cab6..7be5da3f 100644
--- a/src/servers/Scripts/instances/dungeons/SastashaHard.cpp
+++ b/src/servers/Scripts/instances/dungeons/SastashaHard.cpp
@@ -57,7 +57,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/ShisuioftheVioletTides.cpp b/src/servers/Scripts/instances/dungeons/ShisuioftheVioletTides.cpp
index f5763e03..e9a87601 100644
--- a/src/servers/Scripts/instances/dungeons/ShisuioftheVioletTides.cpp
+++ b/src/servers/Scripts/instances/dungeons/ShisuioftheVioletTides.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/Snowcloak.cpp b/src/servers/Scripts/instances/dungeons/Snowcloak.cpp
index 5ecf8597..be8a3e9a 100644
--- a/src/servers/Scripts/instances/dungeons/Snowcloak.cpp
+++ b/src/servers/Scripts/instances/dungeons/Snowcloak.cpp
@@ -63,7 +63,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/SohmAl.cpp b/src/servers/Scripts/instances/dungeons/SohmAl.cpp
index 9d96a514..f599cfbe 100644
--- a/src/servers/Scripts/instances/dungeons/SohmAl.cpp
+++ b/src/servers/Scripts/instances/dungeons/SohmAl.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/SohmAlHard.cpp b/src/servers/Scripts/instances/dungeons/SohmAlHard.cpp
index 8f706c4a..d42d75c1 100644
--- a/src/servers/Scripts/instances/dungeons/SohmAlHard.cpp
+++ b/src/servers/Scripts/instances/dungeons/SohmAlHard.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/SohrKhai.cpp b/src/servers/Scripts/instances/dungeons/SohrKhai.cpp
index 5a24be1b..37a019f4 100644
--- a/src/servers/Scripts/instances/dungeons/SohrKhai.cpp
+++ b/src/servers/Scripts/instances/dungeons/SohrKhai.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/TheAery.cpp b/src/servers/Scripts/instances/dungeons/TheAery.cpp
index 0905d8f2..8ee907bc 100644
--- a/src/servers/Scripts/instances/dungeons/TheAery.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheAery.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp b/src/servers/Scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp
index 812849dd..357536eb 100644
--- a/src/servers/Scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/TheAntitower.cpp b/src/servers/Scripts/instances/dungeons/TheAntitower.cpp
index e3aa86a0..d650014a 100644
--- a/src/servers/Scripts/instances/dungeons/TheAntitower.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheAntitower.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/TheAurumVale.cpp b/src/servers/Scripts/instances/dungeons/TheAurumVale.cpp
index dc08a97f..a4272fa0 100644
--- a/src/servers/Scripts/instances/dungeons/TheAurumVale.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheAurumVale.cpp
@@ -39,7 +39,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/TheDrownedCityofSkalla.cpp b/src/servers/Scripts/instances/dungeons/TheDrownedCityofSkalla.cpp
index 9fee4f1d..785ff5e3 100644
--- a/src/servers/Scripts/instances/dungeons/TheDrownedCityofSkalla.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheDrownedCityofSkalla.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/TheDuskVigil.cpp b/src/servers/Scripts/instances/dungeons/TheDuskVigil.cpp
index 44e04c89..73284952 100644
--- a/src/servers/Scripts/instances/dungeons/TheDuskVigil.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheDuskVigil.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/TheFractalContinuum.cpp b/src/servers/Scripts/instances/dungeons/TheFractalContinuum.cpp
index e1efa206..16fbb68b 100644
--- a/src/servers/Scripts/instances/dungeons/TheFractalContinuum.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheFractalContinuum.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/TheFractalContinuumHard.cpp b/src/servers/Scripts/instances/dungeons/TheFractalContinuumHard.cpp
index a2215725..89992e90 100644
--- a/src/servers/Scripts/instances/dungeons/TheFractalContinuumHard.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheFractalContinuumHard.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/TheGreatGubalLibrary.cpp b/src/servers/Scripts/instances/dungeons/TheGreatGubalLibrary.cpp
index 2e6baa96..e99ae513 100644
--- a/src/servers/Scripts/instances/dungeons/TheGreatGubalLibrary.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheGreatGubalLibrary.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp b/src/servers/Scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp
index 657f41a0..02b29aba 100644
--- a/src/servers/Scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/TheKeeperoftheLake.cpp b/src/servers/Scripts/instances/dungeons/TheKeeperoftheLake.cpp
index c1bb1f22..e340c4dc 100644
--- a/src/servers/Scripts/instances/dungeons/TheKeeperoftheLake.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheKeeperoftheLake.cpp
@@ -52,7 +52,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/TheLostCityofAmdapor.cpp b/src/servers/Scripts/instances/dungeons/TheLostCityofAmdapor.cpp
index 17ea1412..37f39068 100644
--- a/src/servers/Scripts/instances/dungeons/TheLostCityofAmdapor.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheLostCityofAmdapor.cpp
@@ -72,7 +72,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp b/src/servers/Scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp
index ea9f09ed..52f6890c 100644
--- a/src/servers/Scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp
@@ -63,7 +63,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/ThePraetorium.cpp b/src/servers/Scripts/instances/dungeons/ThePraetorium.cpp
index 90a050e9..c9033f68 100644
--- a/src/servers/Scripts/instances/dungeons/ThePraetorium.cpp
+++ b/src/servers/Scripts/instances/dungeons/ThePraetorium.cpp
@@ -133,7 +133,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/TheSirensongSea.cpp b/src/servers/Scripts/instances/dungeons/TheSirensongSea.cpp
index a5933eae..4b013972 100644
--- a/src/servers/Scripts/instances/dungeons/TheSirensongSea.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheSirensongSea.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/TheStoneVigil.cpp b/src/servers/Scripts/instances/dungeons/TheStoneVigil.cpp
index 192a5bfd..bfe93648 100644
--- a/src/servers/Scripts/instances/dungeons/TheStoneVigil.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheStoneVigil.cpp
@@ -54,7 +54,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/TheStoneVigilHard.cpp b/src/servers/Scripts/instances/dungeons/TheStoneVigilHard.cpp
index 53324047..8ce39c0b 100644
--- a/src/servers/Scripts/instances/dungeons/TheStoneVigilHard.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheStoneVigilHard.cpp
@@ -47,7 +47,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/TheSunkenTempleofQarn.cpp b/src/servers/Scripts/instances/dungeons/TheSunkenTempleofQarn.cpp
index df2d147f..4dd192cc 100644
--- a/src/servers/Scripts/instances/dungeons/TheSunkenTempleofQarn.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheSunkenTempleofQarn.cpp
@@ -80,7 +80,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp b/src/servers/Scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp
index 9d5fdd05..81a552c3 100644
--- a/src/servers/Scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp
@@ -71,7 +71,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/TheTamTaraDeepcroft.cpp b/src/servers/Scripts/instances/dungeons/TheTamTaraDeepcroft.cpp
index cd96d466..cf3a0dc9 100644
--- a/src/servers/Scripts/instances/dungeons/TheTamTaraDeepcroft.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheTamTaraDeepcroft.cpp
@@ -48,7 +48,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp b/src/servers/Scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp
index 19758edf..1796e774 100644
--- a/src/servers/Scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp
@@ -95,7 +95,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/TheTempleoftheFist.cpp b/src/servers/Scripts/instances/dungeons/TheTempleoftheFist.cpp
index 72465331..3873360c 100644
--- a/src/servers/Scripts/instances/dungeons/TheTempleoftheFist.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheTempleoftheFist.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp b/src/servers/Scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp
index da49748f..713e4c5f 100644
--- a/src/servers/Scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp
@@ -70,7 +70,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/TheVault.cpp b/src/servers/Scripts/instances/dungeons/TheVault.cpp
index c5349672..ecf5244f 100644
--- a/src/servers/Scripts/instances/dungeons/TheVault.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheVault.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/TheWanderersPalace.cpp b/src/servers/Scripts/instances/dungeons/TheWanderersPalace.cpp
index c7806459..668fed1b 100644
--- a/src/servers/Scripts/instances/dungeons/TheWanderersPalace.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheWanderersPalace.cpp
@@ -71,7 +71,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/TheWanderersPalaceHard.cpp b/src/servers/Scripts/instances/dungeons/TheWanderersPalaceHard.cpp
index 0605608f..92ea37cb 100644
--- a/src/servers/Scripts/instances/dungeons/TheWanderersPalaceHard.cpp
+++ b/src/servers/Scripts/instances/dungeons/TheWanderersPalaceHard.cpp
@@ -52,7 +52,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/dungeons/Xelphatol.cpp b/src/servers/Scripts/instances/dungeons/Xelphatol.cpp
index b8ee60bc..b8272a13 100644
--- a/src/servers/Scripts/instances/dungeons/Xelphatol.cpp
+++ b/src/servers/Scripts/instances/dungeons/Xelphatol.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/events/TheHauntedManor.cpp b/src/servers/Scripts/instances/events/TheHauntedManor.cpp
index 7f57dcd4..c7e3deab 100644
--- a/src/servers/Scripts/instances/events/TheHauntedManor.cpp
+++ b/src/servers/Scripts/instances/events/TheHauntedManor.cpp
@@ -34,7 +34,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/events/TheValentionesCeremony.cpp b/src/servers/Scripts/instances/events/TheValentionesCeremony.cpp
index bcf500ec..a4983a8e 100644
--- a/src/servers/Scripts/instances/events/TheValentionesCeremony.cpp
+++ b/src/servers/Scripts/instances/events/TheValentionesCeremony.cpp
@@ -62,7 +62,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/guildhests/AllsWellthatEndsintheWell.cpp b/src/servers/Scripts/instances/guildhests/AllsWellthatEndsintheWell.cpp
index a2c65ba8..8524dc49 100644
--- a/src/servers/Scripts/instances/guildhests/AllsWellthatEndsintheWell.cpp
+++ b/src/servers/Scripts/instances/guildhests/AllsWellthatEndsintheWell.cpp
@@ -20,7 +20,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/guildhests/AnnoytheVoid.cpp b/src/servers/Scripts/instances/guildhests/AnnoytheVoid.cpp
index b79dae1f..ed50c9bd 100644
--- a/src/servers/Scripts/instances/guildhests/AnnoytheVoid.cpp
+++ b/src/servers/Scripts/instances/guildhests/AnnoytheVoid.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/guildhests/BasicTrainingEnemyParties.cpp b/src/servers/Scripts/instances/guildhests/BasicTrainingEnemyParties.cpp
index 1d104af6..9e22b6d1 100644
--- a/src/servers/Scripts/instances/guildhests/BasicTrainingEnemyParties.cpp
+++ b/src/servers/Scripts/instances/guildhests/BasicTrainingEnemyParties.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/guildhests/BasicTrainingEnemyStrongholds.cpp b/src/servers/Scripts/instances/guildhests/BasicTrainingEnemyStrongholds.cpp
index fe587bff..3ef2622e 100644
--- a/src/servers/Scripts/instances/guildhests/BasicTrainingEnemyStrongholds.cpp
+++ b/src/servers/Scripts/instances/guildhests/BasicTrainingEnemyStrongholds.cpp
@@ -21,7 +21,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/guildhests/FlickingSticksandTakingNames.cpp b/src/servers/Scripts/instances/guildhests/FlickingSticksandTakingNames.cpp
index 176639d1..488e06de 100644
--- a/src/servers/Scripts/instances/guildhests/FlickingSticksandTakingNames.cpp
+++ b/src/servers/Scripts/instances/guildhests/FlickingSticksandTakingNames.cpp
@@ -18,7 +18,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/guildhests/HeroontheHalfShell.cpp b/src/servers/Scripts/instances/guildhests/HeroontheHalfShell.cpp
index f6aa26ae..b4c93aa3 100644
--- a/src/servers/Scripts/instances/guildhests/HeroontheHalfShell.cpp
+++ b/src/servers/Scripts/instances/guildhests/HeroontheHalfShell.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/guildhests/LongLivetheQueen.cpp b/src/servers/Scripts/instances/guildhests/LongLivetheQueen.cpp
index 040f5ea3..0ac5fa56 100644
--- a/src/servers/Scripts/instances/guildhests/LongLivetheQueen.cpp
+++ b/src/servers/Scripts/instances/guildhests/LongLivetheQueen.cpp
@@ -34,7 +34,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/guildhests/MorethanaFeeler.cpp b/src/servers/Scripts/instances/guildhests/MorethanaFeeler.cpp
index cd53622c..31d9bf17 100644
--- a/src/servers/Scripts/instances/guildhests/MorethanaFeeler.cpp
+++ b/src/servers/Scripts/instances/guildhests/MorethanaFeeler.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/guildhests/PullingPoisonPosies.cpp b/src/servers/Scripts/instances/guildhests/PullingPoisonPosies.cpp
index 8f65e8fa..3842606b 100644
--- a/src/servers/Scripts/instances/guildhests/PullingPoisonPosies.cpp
+++ b/src/servers/Scripts/instances/guildhests/PullingPoisonPosies.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/guildhests/ShadowandClaw.cpp b/src/servers/Scripts/instances/guildhests/ShadowandClaw.cpp
index 06faa408..61a1ca68 100644
--- a/src/servers/Scripts/instances/guildhests/ShadowandClaw.cpp
+++ b/src/servers/Scripts/instances/guildhests/ShadowandClaw.cpp
@@ -34,7 +34,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/guildhests/SolemnTrinity.cpp b/src/servers/Scripts/instances/guildhests/SolemnTrinity.cpp
index 08819387..77bbbe08 100644
--- a/src/servers/Scripts/instances/guildhests/SolemnTrinity.cpp
+++ b/src/servers/Scripts/instances/guildhests/SolemnTrinity.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/guildhests/StingingBack.cpp b/src/servers/Scripts/instances/guildhests/StingingBack.cpp
index 5aadaca6..5631663e 100644
--- a/src/servers/Scripts/instances/guildhests/StingingBack.cpp
+++ b/src/servers/Scripts/instances/guildhests/StingingBack.cpp
@@ -20,7 +20,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/guildhests/UndertheArmor.cpp b/src/servers/Scripts/instances/guildhests/UndertheArmor.cpp
index 1b4bcff5..d785be5a 100644
--- a/src/servers/Scripts/instances/guildhests/UndertheArmor.cpp
+++ b/src/servers/Scripts/instances/guildhests/UndertheArmor.cpp
@@ -18,7 +18,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/guildhests/WardUp.cpp b/src/servers/Scripts/instances/guildhests/WardUp.cpp
index 2d3605c4..2f423b10 100644
--- a/src/servers/Scripts/instances/guildhests/WardUp.cpp
+++ b/src/servers/Scripts/instances/guildhests/WardUp.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp b/src/servers/Scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp
index d0f6e3b8..ec20ccba 100644
--- a/src/servers/Scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp
+++ b/src/servers/Scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp
@@ -27,7 +27,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp b/src/servers/Scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp
index 9d16d7ad..08766aac 100644
--- a/src/servers/Scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp
+++ b/src/servers/Scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp
@@ -27,7 +27,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/hallofthenovice/AvoidAreaofEffectAttacks.cpp b/src/servers/Scripts/instances/hallofthenovice/AvoidAreaofEffectAttacks.cpp
index fa3a624d..58c9eba4 100644
--- a/src/servers/Scripts/instances/hallofthenovice/AvoidAreaofEffectAttacks.cpp
+++ b/src/servers/Scripts/instances/hallofthenovice/AvoidAreaofEffectAttacks.cpp
@@ -27,7 +27,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/hallofthenovice/AvoidEngagedTargets.cpp b/src/servers/Scripts/instances/hallofthenovice/AvoidEngagedTargets.cpp
index 5651a5ec..13bfe298 100644
--- a/src/servers/Scripts/instances/hallofthenovice/AvoidEngagedTargets.cpp
+++ b/src/servers/Scripts/instances/hallofthenovice/AvoidEngagedTargets.cpp
@@ -27,7 +27,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/hallofthenovice/DefeatanOccupiedTarget.cpp b/src/servers/Scripts/instances/hallofthenovice/DefeatanOccupiedTarget.cpp
index 97c20479..0a015a4a 100644
--- a/src/servers/Scripts/instances/hallofthenovice/DefeatanOccupiedTarget.cpp
+++ b/src/servers/Scripts/instances/hallofthenovice/DefeatanOccupiedTarget.cpp
@@ -27,7 +27,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/hallofthenovice/EngageEnemyReinforcements.cpp b/src/servers/Scripts/instances/hallofthenovice/EngageEnemyReinforcements.cpp
index b9e37ef9..33ddf467 100644
--- a/src/servers/Scripts/instances/hallofthenovice/EngageEnemyReinforcements.cpp
+++ b/src/servers/Scripts/instances/hallofthenovice/EngageEnemyReinforcements.cpp
@@ -27,7 +27,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/hallofthenovice/EngageMultipleTargets.cpp b/src/servers/Scripts/instances/hallofthenovice/EngageMultipleTargets.cpp
index fbe3a627..c71a589e 100644
--- a/src/servers/Scripts/instances/hallofthenovice/EngageMultipleTargets.cpp
+++ b/src/servers/Scripts/instances/hallofthenovice/EngageMultipleTargets.cpp
@@ -27,7 +27,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/hallofthenovice/ExecuteaComboinBattle.cpp b/src/servers/Scripts/instances/hallofthenovice/ExecuteaComboinBattle.cpp
index c1ecf99f..798fcc84 100644
--- a/src/servers/Scripts/instances/hallofthenovice/ExecuteaComboinBattle.cpp
+++ b/src/servers/Scripts/instances/hallofthenovice/ExecuteaComboinBattle.cpp
@@ -27,7 +27,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp b/src/servers/Scripts/instances/hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp
index 397ea203..9e066641 100644
--- a/src/servers/Scripts/instances/hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp
+++ b/src/servers/Scripts/instances/hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp
@@ -27,7 +27,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp b/src/servers/Scripts/instances/hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp
index f0853bd1..e0175ffc 100644
--- a/src/servers/Scripts/instances/hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp
+++ b/src/servers/Scripts/instances/hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp
@@ -27,7 +27,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/hallofthenovice/FinalExercise.cpp b/src/servers/Scripts/instances/hallofthenovice/FinalExercise.cpp
index 4a1ecdf2..a121efa5 100644
--- a/src/servers/Scripts/instances/hallofthenovice/FinalExercise.cpp
+++ b/src/servers/Scripts/instances/hallofthenovice/FinalExercise.cpp
@@ -20,7 +20,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/hallofthenovice/HealMultipleAllies.cpp b/src/servers/Scripts/instances/hallofthenovice/HealMultipleAllies.cpp
index 00791972..44669332 100644
--- a/src/servers/Scripts/instances/hallofthenovice/HealMultipleAllies.cpp
+++ b/src/servers/Scripts/instances/hallofthenovice/HealMultipleAllies.cpp
@@ -27,7 +27,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/hallofthenovice/HealanAlly.cpp b/src/servers/Scripts/instances/hallofthenovice/HealanAlly.cpp
index a298b73b..0691ce44 100644
--- a/src/servers/Scripts/instances/hallofthenovice/HealanAlly.cpp
+++ b/src/servers/Scripts/instances/hallofthenovice/HealanAlly.cpp
@@ -27,7 +27,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/hallofthenovice/InteractwiththeBattlefield.cpp b/src/servers/Scripts/instances/hallofthenovice/InteractwiththeBattlefield.cpp
index 6e43c2e5..3d8d28ba 100644
--- a/src/servers/Scripts/instances/hallofthenovice/InteractwiththeBattlefield.cpp
+++ b/src/servers/Scripts/instances/hallofthenovice/InteractwiththeBattlefield.cpp
@@ -27,7 +27,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/pvp/Astragalos.cpp b/src/servers/Scripts/instances/pvp/Astragalos.cpp
index 6c5fb87b..551cb40c 100644
--- a/src/servers/Scripts/instances/pvp/Astragalos.cpp
+++ b/src/servers/Scripts/instances/pvp/Astragalos.cpp
@@ -31,7 +31,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/pvp/SealRockSeize.cpp b/src/servers/Scripts/instances/pvp/SealRockSeize.cpp
index e1f95258..fa2dcc80 100644
--- a/src/servers/Scripts/instances/pvp/SealRockSeize.cpp
+++ b/src/servers/Scripts/instances/pvp/SealRockSeize.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/pvp/TheBorderlandRuinsSecure.cpp b/src/servers/Scripts/instances/pvp/TheBorderlandRuinsSecure.cpp
index d7692ac7..9b85d972 100644
--- a/src/servers/Scripts/instances/pvp/TheBorderlandRuinsSecure.cpp
+++ b/src/servers/Scripts/instances/pvp/TheBorderlandRuinsSecure.cpp
@@ -42,7 +42,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/pvp/TheFeast4on4LightParty.cpp b/src/servers/Scripts/instances/pvp/TheFeast4on4LightParty.cpp
index 18376f34..5c198c9a 100644
--- a/src/servers/Scripts/instances/pvp/TheFeast4on4LightParty.cpp
+++ b/src/servers/Scripts/instances/pvp/TheFeast4on4LightParty.cpp
@@ -21,7 +21,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/pvp/TheFeast4on4Ranked.cpp b/src/servers/Scripts/instances/pvp/TheFeast4on4Ranked.cpp
index 19d81862..521ef812 100644
--- a/src/servers/Scripts/instances/pvp/TheFeast4on4Ranked.cpp
+++ b/src/servers/Scripts/instances/pvp/TheFeast4on4Ranked.cpp
@@ -19,7 +19,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/pvp/TheFeast4on4Training.cpp b/src/servers/Scripts/instances/pvp/TheFeast4on4Training.cpp
index 8215cc27..92f4e579 100644
--- a/src/servers/Scripts/instances/pvp/TheFeast4on4Training.cpp
+++ b/src/servers/Scripts/instances/pvp/TheFeast4on4Training.cpp
@@ -19,7 +19,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/pvp/TheFeastCustomMatchCrystalTower.cpp b/src/servers/Scripts/instances/pvp/TheFeastCustomMatchCrystalTower.cpp
index d5e2d7ea..ce4e3d36 100644
--- a/src/servers/Scripts/instances/pvp/TheFeastCustomMatchCrystalTower.cpp
+++ b/src/servers/Scripts/instances/pvp/TheFeastCustomMatchCrystalTower.cpp
@@ -23,7 +23,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/pvp/TheFeastCustomMatchFeastingGrounds.cpp b/src/servers/Scripts/instances/pvp/TheFeastCustomMatchFeastingGrounds.cpp
index 6c2a3c35..5773bff2 100644
--- a/src/servers/Scripts/instances/pvp/TheFeastCustomMatchFeastingGrounds.cpp
+++ b/src/servers/Scripts/instances/pvp/TheFeastCustomMatchFeastingGrounds.cpp
@@ -21,7 +21,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/pvp/TheFeastCustomMatchLichenweed.cpp b/src/servers/Scripts/instances/pvp/TheFeastCustomMatchLichenweed.cpp
index 1f369875..e8084bac 100644
--- a/src/servers/Scripts/instances/pvp/TheFeastCustomMatchLichenweed.cpp
+++ b/src/servers/Scripts/instances/pvp/TheFeastCustomMatchLichenweed.cpp
@@ -19,7 +19,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/pvp/TheFeastRanked.cpp b/src/servers/Scripts/instances/pvp/TheFeastRanked.cpp
index 8fa5bb96..5473eb1d 100644
--- a/src/servers/Scripts/instances/pvp/TheFeastRanked.cpp
+++ b/src/servers/Scripts/instances/pvp/TheFeastRanked.cpp
@@ -23,7 +23,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/pvp/TheFeastTeamRanked.cpp b/src/servers/Scripts/instances/pvp/TheFeastTeamRanked.cpp
index a10fce7e..0f019311 100644
--- a/src/servers/Scripts/instances/pvp/TheFeastTeamRanked.cpp
+++ b/src/servers/Scripts/instances/pvp/TheFeastTeamRanked.cpp
@@ -23,7 +23,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/pvp/TheFeastTraining.cpp b/src/servers/Scripts/instances/pvp/TheFeastTraining.cpp
index 00f2e7a8..01d99119 100644
--- a/src/servers/Scripts/instances/pvp/TheFeastTraining.cpp
+++ b/src/servers/Scripts/instances/pvp/TheFeastTraining.cpp
@@ -23,7 +23,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/pvp/TheFieldsofGloryShatter.cpp b/src/servers/Scripts/instances/pvp/TheFieldsofGloryShatter.cpp
index 035dbdeb..82747ba8 100644
--- a/src/servers/Scripts/instances/pvp/TheFieldsofGloryShatter.cpp
+++ b/src/servers/Scripts/instances/pvp/TheFieldsofGloryShatter.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/questbattles/ABloodyReunion.cpp b/src/servers/Scripts/instances/questbattles/ABloodyReunion.cpp
index dabfa0b9..bf9ed3a1 100644
--- a/src/servers/Scripts/instances/questbattles/ABloodyReunion.cpp
+++ b/src/servers/Scripts/instances/questbattles/ABloodyReunion.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/questbattles/ASpectaclefortheAges.cpp b/src/servers/Scripts/instances/questbattles/ASpectaclefortheAges.cpp
index e98adce1..4d847687 100644
--- a/src/servers/Scripts/instances/questbattles/ASpectaclefortheAges.cpp
+++ b/src/servers/Scripts/instances/questbattles/ASpectaclefortheAges.cpp
@@ -34,7 +34,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/questbattles/BloodDragoon.cpp b/src/servers/Scripts/instances/questbattles/BloodDragoon.cpp
index 8a2ee812..0db9c41c 100644
--- a/src/servers/Scripts/instances/questbattles/BloodDragoon.cpp
+++ b/src/servers/Scripts/instances/questbattles/BloodDragoon.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/questbattles/BloodontheDeck.cpp b/src/servers/Scripts/instances/questbattles/BloodontheDeck.cpp
index 0b131b3b..c994038c 100644
--- a/src/servers/Scripts/instances/questbattles/BloodontheDeck.cpp
+++ b/src/servers/Scripts/instances/questbattles/BloodontheDeck.cpp
@@ -19,7 +19,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/questbattles/CuriousGorgeMeetsHisMatch.cpp b/src/servers/Scripts/instances/questbattles/CuriousGorgeMeetsHisMatch.cpp
index 249a1a03..5343e5f7 100644
--- a/src/servers/Scripts/instances/questbattles/CuriousGorgeMeetsHisMatch.cpp
+++ b/src/servers/Scripts/instances/questbattles/CuriousGorgeMeetsHisMatch.cpp
@@ -20,7 +20,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/questbattles/DarkwingDragon.cpp b/src/servers/Scripts/instances/questbattles/DarkwingDragon.cpp
index b6c5068c..5ee859c1 100644
--- a/src/servers/Scripts/instances/questbattles/DarkwingDragon.cpp
+++ b/src/servers/Scripts/instances/questbattles/DarkwingDragon.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/questbattles/InThalsName.cpp b/src/servers/Scripts/instances/questbattles/InThalsName.cpp
index ce6c34a7..61e0a032 100644
--- a/src/servers/Scripts/instances/questbattles/InThalsName.cpp
+++ b/src/servers/Scripts/instances/questbattles/InThalsName.cpp
@@ -19,7 +19,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/questbattles/InterdimensionalRift.cpp b/src/servers/Scripts/instances/questbattles/InterdimensionalRift.cpp
index dff5ac16..f305edee 100644
--- a/src/servers/Scripts/instances/questbattles/InterdimensionalRift.cpp
+++ b/src/servers/Scripts/instances/questbattles/InterdimensionalRift.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/questbattles/ItsProbablyaTrap.cpp b/src/servers/Scripts/instances/questbattles/ItsProbablyaTrap.cpp
index 99f100c4..e0471d55 100644
--- a/src/servers/Scripts/instances/questbattles/ItsProbablyaTrap.cpp
+++ b/src/servers/Scripts/instances/questbattles/ItsProbablyaTrap.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/questbattles/MatsubaMayhem.cpp b/src/servers/Scripts/instances/questbattles/MatsubaMayhem.cpp
index 22a64e03..2b1ace2e 100644
--- a/src/servers/Scripts/instances/questbattles/MatsubaMayhem.cpp
+++ b/src/servers/Scripts/instances/questbattles/MatsubaMayhem.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/questbattles/Naadam.cpp b/src/servers/Scripts/instances/questbattles/Naadam.cpp
index adbdf71d..c0ea7653 100644
--- a/src/servers/Scripts/instances/questbattles/Naadam.cpp
+++ b/src/servers/Scripts/instances/questbattles/Naadam.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/questbattles/OneLifeforOneWorld.cpp b/src/servers/Scripts/instances/questbattles/OneLifeforOneWorld.cpp
index c654d1e1..b951f6b2 100644
--- a/src/servers/Scripts/instances/questbattles/OneLifeforOneWorld.cpp
+++ b/src/servers/Scripts/instances/questbattles/OneLifeforOneWorld.cpp
@@ -22,7 +22,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/questbattles/OurCompromise.cpp b/src/servers/Scripts/instances/questbattles/OurCompromise.cpp
index 7bac4fcb..6c01c1a4 100644
--- a/src/servers/Scripts/instances/questbattles/OurCompromise.cpp
+++ b/src/servers/Scripts/instances/questbattles/OurCompromise.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/questbattles/OurUnsungHeroes.cpp b/src/servers/Scripts/instances/questbattles/OurUnsungHeroes.cpp
index 999767c2..ca934fdd 100644
--- a/src/servers/Scripts/instances/questbattles/OurUnsungHeroes.cpp
+++ b/src/servers/Scripts/instances/questbattles/OurUnsungHeroes.cpp
@@ -63,7 +63,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/questbattles/RaisingtheSword.cpp b/src/servers/Scripts/instances/questbattles/RaisingtheSword.cpp
index dec3526a..61c54417 100644
--- a/src/servers/Scripts/instances/questbattles/RaisingtheSword.cpp
+++ b/src/servers/Scripts/instances/questbattles/RaisingtheSword.cpp
@@ -19,7 +19,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/questbattles/ReturnoftheBull.cpp b/src/servers/Scripts/instances/questbattles/ReturnoftheBull.cpp
index fe3c37c9..91fd7a2d 100644
--- a/src/servers/Scripts/instances/questbattles/ReturnoftheBull.cpp
+++ b/src/servers/Scripts/instances/questbattles/ReturnoftheBull.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/questbattles/TheBattleonBekko.cpp b/src/servers/Scripts/instances/questbattles/TheBattleonBekko.cpp
index ec276d56..e11794f2 100644
--- a/src/servers/Scripts/instances/questbattles/TheBattleonBekko.cpp
+++ b/src/servers/Scripts/instances/questbattles/TheBattleonBekko.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/questbattles/TheCarteneauFlatsHeliodrome.cpp b/src/servers/Scripts/instances/questbattles/TheCarteneauFlatsHeliodrome.cpp
index fbc8f8ae..fba35856 100644
--- a/src/servers/Scripts/instances/questbattles/TheCarteneauFlatsHeliodrome.cpp
+++ b/src/servers/Scripts/instances/questbattles/TheCarteneauFlatsHeliodrome.cpp
@@ -42,7 +42,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/questbattles/TheFaceofTrueEvil.cpp b/src/servers/Scripts/instances/questbattles/TheFaceofTrueEvil.cpp
index fc2d41f8..84bbd953 100644
--- a/src/servers/Scripts/instances/questbattles/TheFaceofTrueEvil.cpp
+++ b/src/servers/Scripts/instances/questbattles/TheFaceofTrueEvil.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/questbattles/TheHeartoftheProblem.cpp b/src/servers/Scripts/instances/questbattles/TheHeartoftheProblem.cpp
index 2534603d..8fffbccb 100644
--- a/src/servers/Scripts/instances/questbattles/TheHeartoftheProblem.cpp
+++ b/src/servers/Scripts/instances/questbattles/TheHeartoftheProblem.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/questbattles/TheOrphansandtheBrokenBlade.cpp b/src/servers/Scripts/instances/questbattles/TheOrphansandtheBrokenBlade.cpp
index 3212bfa4..9d5bc468 100644
--- a/src/servers/Scripts/instances/questbattles/TheOrphansandtheBrokenBlade.cpp
+++ b/src/servers/Scripts/instances/questbattles/TheOrphansandtheBrokenBlade.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/questbattles/TheResonant.cpp b/src/servers/Scripts/instances/questbattles/TheResonant.cpp
index 86809778..73f90b8c 100644
--- a/src/servers/Scripts/instances/questbattles/TheResonant.cpp
+++ b/src/servers/Scripts/instances/questbattles/TheResonant.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/questbattles/WhenClansCollide.cpp b/src/servers/Scripts/instances/questbattles/WhenClansCollide.cpp
index b318d638..22d6fdc1 100644
--- a/src/servers/Scripts/instances/questbattles/WhenClansCollide.cpp
+++ b/src/servers/Scripts/instances/questbattles/WhenClansCollide.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/questbattles/WithHeartandSteel.cpp b/src/servers/Scripts/instances/questbattles/WithHeartandSteel.cpp
index 294437aa..5d71e7ff 100644
--- a/src/servers/Scripts/instances/questbattles/WithHeartandSteel.cpp
+++ b/src/servers/Scripts/instances/questbattles/WithHeartandSteel.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheArmoftheFather.cpp b/src/servers/Scripts/instances/raids/AlexanderTheArmoftheFather.cpp
index 3c982512..73793d1a 100644
--- a/src/servers/Scripts/instances/raids/AlexanderTheArmoftheFather.cpp
+++ b/src/servers/Scripts/instances/raids/AlexanderTheArmoftheFather.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheArmoftheFatherSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheArmoftheFatherSavage.cpp
index f62468e7..8c6ac0e3 100644
--- a/src/servers/Scripts/instances/raids/AlexanderTheArmoftheFatherSavage.cpp
+++ b/src/servers/Scripts/instances/raids/AlexanderTheArmoftheFatherSavage.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheArmoftheSon.cpp b/src/servers/Scripts/instances/raids/AlexanderTheArmoftheSon.cpp
index 4ab0396a..48920e20 100644
--- a/src/servers/Scripts/instances/raids/AlexanderTheArmoftheSon.cpp
+++ b/src/servers/Scripts/instances/raids/AlexanderTheArmoftheSon.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheArmoftheSonSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheArmoftheSonSavage.cpp
index 0d536523..fa9848bc 100644
--- a/src/servers/Scripts/instances/raids/AlexanderTheArmoftheSonSavage.cpp
+++ b/src/servers/Scripts/instances/raids/AlexanderTheArmoftheSonSavage.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheBreathoftheCreator.cpp b/src/servers/Scripts/instances/raids/AlexanderTheBreathoftheCreator.cpp
index ac2e03e0..8929deaa 100644
--- a/src/servers/Scripts/instances/raids/AlexanderTheBreathoftheCreator.cpp
+++ b/src/servers/Scripts/instances/raids/AlexanderTheBreathoftheCreator.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheBreathoftheCreatorSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheBreathoftheCreatorSavage.cpp
index 34124213..861e32de 100644
--- a/src/servers/Scripts/instances/raids/AlexanderTheBreathoftheCreatorSavage.cpp
+++ b/src/servers/Scripts/instances/raids/AlexanderTheBreathoftheCreatorSavage.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheFather.cpp b/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheFather.cpp
index 72ff8a23..18c59d56 100644
--- a/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheFather.cpp
+++ b/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheFather.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheFatherSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheFatherSavage.cpp
index 938f47bc..a4b16086 100644
--- a/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheFatherSavage.cpp
+++ b/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheFatherSavage.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheSon.cpp b/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheSon.cpp
index 8941bd9d..bdb5d5fd 100644
--- a/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheSon.cpp
+++ b/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheSon.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheSonSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheSonSavage.cpp
index cd3029df..72c5a708 100644
--- a/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheSonSavage.cpp
+++ b/src/servers/Scripts/instances/raids/AlexanderTheBurdenoftheSonSavage.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheFather.cpp b/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheFather.cpp
index ca940a2a..32d6908c 100644
--- a/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheFather.cpp
+++ b/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheFather.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheFatherSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheFatherSavage.cpp
index e3080497..ff04aa9e 100644
--- a/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheFatherSavage.cpp
+++ b/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheFatherSavage.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheSon.cpp b/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheSon.cpp
index 706bec7f..96fd9198 100644
--- a/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheSon.cpp
+++ b/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheSon.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheSonSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheSonSavage.cpp
index 66883bbd..43e3af7b 100644
--- a/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheSonSavage.cpp
+++ b/src/servers/Scripts/instances/raids/AlexanderTheCuffoftheSonSavage.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheEyesoftheCreator.cpp b/src/servers/Scripts/instances/raids/AlexanderTheEyesoftheCreator.cpp
index 1decebf5..5d9681ff 100644
--- a/src/servers/Scripts/instances/raids/AlexanderTheEyesoftheCreator.cpp
+++ b/src/servers/Scripts/instances/raids/AlexanderTheEyesoftheCreator.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheEyesoftheCreatorSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheEyesoftheCreatorSavage.cpp
index 1eebf5ea..b5ad4d84 100644
--- a/src/servers/Scripts/instances/raids/AlexanderTheEyesoftheCreatorSavage.cpp
+++ b/src/servers/Scripts/instances/raids/AlexanderTheEyesoftheCreatorSavage.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheFistoftheFather.cpp b/src/servers/Scripts/instances/raids/AlexanderTheFistoftheFather.cpp
index 052c43b4..a44545eb 100644
--- a/src/servers/Scripts/instances/raids/AlexanderTheFistoftheFather.cpp
+++ b/src/servers/Scripts/instances/raids/AlexanderTheFistoftheFather.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheFistoftheFatherSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheFistoftheFatherSavage.cpp
index f7ddbc42..657c0d38 100644
--- a/src/servers/Scripts/instances/raids/AlexanderTheFistoftheFatherSavage.cpp
+++ b/src/servers/Scripts/instances/raids/AlexanderTheFistoftheFatherSavage.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheFistoftheSon.cpp b/src/servers/Scripts/instances/raids/AlexanderTheFistoftheSon.cpp
index c16d30a7..8584cde4 100644
--- a/src/servers/Scripts/instances/raids/AlexanderTheFistoftheSon.cpp
+++ b/src/servers/Scripts/instances/raids/AlexanderTheFistoftheSon.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheFistoftheSonSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheFistoftheSonSavage.cpp
index 804c2b18..f91d4591 100644
--- a/src/servers/Scripts/instances/raids/AlexanderTheFistoftheSonSavage.cpp
+++ b/src/servers/Scripts/instances/raids/AlexanderTheFistoftheSonSavage.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheHeartoftheCreator.cpp b/src/servers/Scripts/instances/raids/AlexanderTheHeartoftheCreator.cpp
index 6439230c..5e835c50 100644
--- a/src/servers/Scripts/instances/raids/AlexanderTheHeartoftheCreator.cpp
+++ b/src/servers/Scripts/instances/raids/AlexanderTheHeartoftheCreator.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheHeartoftheCreatorSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheHeartoftheCreatorSavage.cpp
index c346add5..fdbc11b8 100644
--- a/src/servers/Scripts/instances/raids/AlexanderTheHeartoftheCreatorSavage.cpp
+++ b/src/servers/Scripts/instances/raids/AlexanderTheHeartoftheCreatorSavage.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheSouloftheCreator.cpp b/src/servers/Scripts/instances/raids/AlexanderTheSouloftheCreator.cpp
index 1a057c21..5c258c4f 100644
--- a/src/servers/Scripts/instances/raids/AlexanderTheSouloftheCreator.cpp
+++ b/src/servers/Scripts/instances/raids/AlexanderTheSouloftheCreator.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/AlexanderTheSouloftheCreatorSavage.cpp b/src/servers/Scripts/instances/raids/AlexanderTheSouloftheCreatorSavage.cpp
index 4d211068..b3eb20bd 100644
--- a/src/servers/Scripts/instances/raids/AlexanderTheSouloftheCreatorSavage.cpp
+++ b/src/servers/Scripts/instances/raids/AlexanderTheSouloftheCreatorSavage.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/DeltascapeV10.cpp b/src/servers/Scripts/instances/raids/DeltascapeV10.cpp
index 6794f5ae..7c33ed24 100644
--- a/src/servers/Scripts/instances/raids/DeltascapeV10.cpp
+++ b/src/servers/Scripts/instances/raids/DeltascapeV10.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/DeltascapeV10Savage.cpp b/src/servers/Scripts/instances/raids/DeltascapeV10Savage.cpp
index 2a08c009..7888e7ae 100644
--- a/src/servers/Scripts/instances/raids/DeltascapeV10Savage.cpp
+++ b/src/servers/Scripts/instances/raids/DeltascapeV10Savage.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/DeltascapeV20.cpp b/src/servers/Scripts/instances/raids/DeltascapeV20.cpp
index eefb3431..879ff9ff 100644
--- a/src/servers/Scripts/instances/raids/DeltascapeV20.cpp
+++ b/src/servers/Scripts/instances/raids/DeltascapeV20.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/DeltascapeV20Savage.cpp b/src/servers/Scripts/instances/raids/DeltascapeV20Savage.cpp
index 4c6ffffe..7c8a4cdc 100644
--- a/src/servers/Scripts/instances/raids/DeltascapeV20Savage.cpp
+++ b/src/servers/Scripts/instances/raids/DeltascapeV20Savage.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/DeltascapeV30.cpp b/src/servers/Scripts/instances/raids/DeltascapeV30.cpp
index 5d61a429..8845ac5e 100644
--- a/src/servers/Scripts/instances/raids/DeltascapeV30.cpp
+++ b/src/servers/Scripts/instances/raids/DeltascapeV30.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/DeltascapeV30Savage.cpp b/src/servers/Scripts/instances/raids/DeltascapeV30Savage.cpp
index 9e5d96d6..18f3296c 100644
--- a/src/servers/Scripts/instances/raids/DeltascapeV30Savage.cpp
+++ b/src/servers/Scripts/instances/raids/DeltascapeV30Savage.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/DeltascapeV40.cpp b/src/servers/Scripts/instances/raids/DeltascapeV40.cpp
index 519da6f1..1197532f 100644
--- a/src/servers/Scripts/instances/raids/DeltascapeV40.cpp
+++ b/src/servers/Scripts/instances/raids/DeltascapeV40.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/DeltascapeV40Savage.cpp b/src/servers/Scripts/instances/raids/DeltascapeV40Savage.cpp
index 21590579..7734552d 100644
--- a/src/servers/Scripts/instances/raids/DeltascapeV40Savage.cpp
+++ b/src/servers/Scripts/instances/raids/DeltascapeV40Savage.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/DunScaith.cpp b/src/servers/Scripts/instances/raids/DunScaith.cpp
index ebb9fd58..f9509059 100644
--- a/src/servers/Scripts/instances/raids/DunScaith.cpp
+++ b/src/servers/Scripts/instances/raids/DunScaith.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/SigmascapeV10.cpp b/src/servers/Scripts/instances/raids/SigmascapeV10.cpp
index 888331cc..7f9c094e 100644
--- a/src/servers/Scripts/instances/raids/SigmascapeV10.cpp
+++ b/src/servers/Scripts/instances/raids/SigmascapeV10.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/SigmascapeV10Savage.cpp b/src/servers/Scripts/instances/raids/SigmascapeV10Savage.cpp
index 9170dbc6..ca8d30db 100644
--- a/src/servers/Scripts/instances/raids/SigmascapeV10Savage.cpp
+++ b/src/servers/Scripts/instances/raids/SigmascapeV10Savage.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/SigmascapeV20.cpp b/src/servers/Scripts/instances/raids/SigmascapeV20.cpp
index 456719f2..b7602c00 100644
--- a/src/servers/Scripts/instances/raids/SigmascapeV20.cpp
+++ b/src/servers/Scripts/instances/raids/SigmascapeV20.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/SigmascapeV20Savage.cpp b/src/servers/Scripts/instances/raids/SigmascapeV20Savage.cpp
index 4907cef1..2e0b6056 100644
--- a/src/servers/Scripts/instances/raids/SigmascapeV20Savage.cpp
+++ b/src/servers/Scripts/instances/raids/SigmascapeV20Savage.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/SigmascapeV30.cpp b/src/servers/Scripts/instances/raids/SigmascapeV30.cpp
index 10f08cf4..6086671e 100644
--- a/src/servers/Scripts/instances/raids/SigmascapeV30.cpp
+++ b/src/servers/Scripts/instances/raids/SigmascapeV30.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/SigmascapeV30Savage.cpp b/src/servers/Scripts/instances/raids/SigmascapeV30Savage.cpp
index 630e851a..e69fbe70 100644
--- a/src/servers/Scripts/instances/raids/SigmascapeV30Savage.cpp
+++ b/src/servers/Scripts/instances/raids/SigmascapeV30Savage.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/SigmascapeV40.cpp b/src/servers/Scripts/instances/raids/SigmascapeV40.cpp
index 1e670e34..0580cadb 100644
--- a/src/servers/Scripts/instances/raids/SigmascapeV40.cpp
+++ b/src/servers/Scripts/instances/raids/SigmascapeV40.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/SigmascapeV40Savage.cpp b/src/servers/Scripts/instances/raids/SigmascapeV40Savage.cpp
index ec4001c4..1aed3d19 100644
--- a/src/servers/Scripts/instances/raids/SigmascapeV40Savage.cpp
+++ b/src/servers/Scripts/instances/raids/SigmascapeV40Savage.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/SyrcusTower.cpp b/src/servers/Scripts/instances/raids/SyrcusTower.cpp
index 1a8ae8fa..9209a3b7 100644
--- a/src/servers/Scripts/instances/raids/SyrcusTower.cpp
+++ b/src/servers/Scripts/instances/raids/SyrcusTower.cpp
@@ -85,7 +85,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn1.cpp b/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn1.cpp
index ab94dc12..f00c9001 100644
--- a/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn1.cpp
+++ b/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn1.cpp
@@ -54,7 +54,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn2.cpp b/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn2.cpp
index 1f929643..512d27a1 100644
--- a/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn2.cpp
+++ b/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn2.cpp
@@ -55,7 +55,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn3.cpp b/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn3.cpp
index f72046d7..1723893f 100644
--- a/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn3.cpp
+++ b/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn3.cpp
@@ -65,7 +65,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn4.cpp b/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn4.cpp
index 5d4f4c81..0e58db36 100644
--- a/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn4.cpp
+++ b/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn4.cpp
@@ -34,7 +34,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn5.cpp b/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn5.cpp
index cefd6220..e81a8a46 100644
--- a/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn5.cpp
+++ b/src/servers/Scripts/instances/raids/TheBindingCoilofBahamutTurn5.cpp
@@ -27,7 +27,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn1.cpp b/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn1.cpp
index 4cbadec0..0e8f5d62 100644
--- a/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn1.cpp
+++ b/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn1.cpp
@@ -42,7 +42,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn2.cpp b/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn2.cpp
index c7016a05..c8250fbe 100644
--- a/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn2.cpp
+++ b/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn2.cpp
@@ -52,7 +52,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn3.cpp b/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn3.cpp
index b6141096..1689600a 100644
--- a/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn3.cpp
+++ b/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn3.cpp
@@ -25,7 +25,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn4.cpp b/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn4.cpp
index 486cc0d6..0da9629a 100644
--- a/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn4.cpp
+++ b/src/servers/Scripts/instances/raids/TheFinalCoilofBahamutTurn4.cpp
@@ -25,7 +25,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/TheLabyrinthoftheAncients.cpp b/src/servers/Scripts/instances/raids/TheLabyrinthoftheAncients.cpp
index a5f72ce0..c2318a39 100644
--- a/src/servers/Scripts/instances/raids/TheLabyrinthoftheAncients.cpp
+++ b/src/servers/Scripts/instances/raids/TheLabyrinthoftheAncients.cpp
@@ -98,7 +98,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/TheRoyalCityofRabanastre.cpp b/src/servers/Scripts/instances/raids/TheRoyalCityofRabanastre.cpp
index 5a1880c3..69643e23 100644
--- a/src/servers/Scripts/instances/raids/TheRoyalCityofRabanastre.cpp
+++ b/src/servers/Scripts/instances/raids/TheRoyalCityofRabanastre.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn1.cpp b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn1.cpp
index f6d3c144..67aed517 100644
--- a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn1.cpp
+++ b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn1.cpp
@@ -33,7 +33,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn2.cpp b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn2.cpp
index 0c448267..cfee5d24 100644
--- a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn2.cpp
+++ b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn2.cpp
@@ -33,7 +33,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn3.cpp b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn3.cpp
index 41fb4285..58d862b0 100644
--- a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn3.cpp
+++ b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn3.cpp
@@ -96,7 +96,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn4.cpp b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn4.cpp
index b0b4156c..1330ce2c 100644
--- a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn4.cpp
+++ b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn4.cpp
@@ -32,7 +32,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn1.cpp b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn1.cpp
index 9d9569b5..0e06439c 100644
--- a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn1.cpp
+++ b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn1.cpp
@@ -33,7 +33,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn2.cpp b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn2.cpp
index 24e6fdbf..382fc38f 100644
--- a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn2.cpp
+++ b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn2.cpp
@@ -33,7 +33,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn3.cpp b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn3.cpp
index 66630243..56b59269 100644
--- a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn3.cpp
+++ b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn3.cpp
@@ -96,7 +96,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn4.cpp b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn4.cpp
index cfa9eecf..f95eba79 100644
--- a/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn4.cpp
+++ b/src/servers/Scripts/instances/raids/TheSecondCoilofBahamutTurn4.cpp
@@ -32,7 +32,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/TheUnendingCoilofBahamutUltimate.cpp b/src/servers/Scripts/instances/raids/TheUnendingCoilofBahamutUltimate.cpp
index ad4c09d4..46c29d9f 100644
--- a/src/servers/Scripts/instances/raids/TheUnendingCoilofBahamutUltimate.cpp
+++ b/src/servers/Scripts/instances/raids/TheUnendingCoilofBahamutUltimate.cpp
@@ -26,7 +26,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/TheVoidArk.cpp b/src/servers/Scripts/instances/raids/TheVoidArk.cpp
index 9248406f..917dfda5 100644
--- a/src/servers/Scripts/instances/raids/TheVoidArk.cpp
+++ b/src/servers/Scripts/instances/raids/TheVoidArk.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/TheWeepingCityofMhach.cpp b/src/servers/Scripts/instances/raids/TheWeepingCityofMhach.cpp
index 0f7347e5..5e74bfc4 100644
--- a/src/servers/Scripts/instances/raids/TheWeepingCityofMhach.cpp
+++ b/src/servers/Scripts/instances/raids/TheWeepingCityofMhach.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/raids/TheWorldofDarkness.cpp b/src/servers/Scripts/instances/raids/TheWorldofDarkness.cpp
index bb99fb85..44537474 100644
--- a/src/servers/Scripts/instances/raids/TheWorldofDarkness.cpp
+++ b/src/servers/Scripts/instances/raids/TheWorldofDarkness.cpp
@@ -134,7 +134,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/treasurehunt/TheAquapolis.cpp b/src/servers/Scripts/instances/treasurehunt/TheAquapolis.cpp
index 6f649610..be94ab18 100644
--- a/src/servers/Scripts/instances/treasurehunt/TheAquapolis.cpp
+++ b/src/servers/Scripts/instances/treasurehunt/TheAquapolis.cpp
@@ -119,7 +119,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/treasurehunt/TheHiddenCanalsofUznair.cpp b/src/servers/Scripts/instances/treasurehunt/TheHiddenCanalsofUznair.cpp
index e0be9b22..f7308558 100644
--- a/src/servers/Scripts/instances/treasurehunt/TheHiddenCanalsofUznair.cpp
+++ b/src/servers/Scripts/instances/treasurehunt/TheHiddenCanalsofUznair.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/treasurehunt/TheLostCanalsofUznair.cpp b/src/servers/Scripts/instances/treasurehunt/TheLostCanalsofUznair.cpp
index cb3eb7b1..c767cd36 100644
--- a/src/servers/Scripts/instances/treasurehunt/TheLostCanalsofUznair.cpp
+++ b/src/servers/Scripts/instances/treasurehunt/TheLostCanalsofUznair.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/trials/ARelicReborntheChimera.cpp b/src/servers/Scripts/instances/trials/ARelicReborntheChimera.cpp
index 7e6ec5e9..8d177bc3 100644
--- a/src/servers/Scripts/instances/trials/ARelicReborntheChimera.cpp
+++ b/src/servers/Scripts/instances/trials/ARelicReborntheChimera.cpp
@@ -34,7 +34,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/trials/ARelicReborntheHydra.cpp b/src/servers/Scripts/instances/trials/ARelicReborntheHydra.cpp
index e617486e..a44347cc 100644
--- a/src/servers/Scripts/instances/trials/ARelicReborntheHydra.cpp
+++ b/src/servers/Scripts/instances/trials/ARelicReborntheHydra.cpp
@@ -68,7 +68,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/trials/AkhAfahAmphitheatreHard.cpp b/src/servers/Scripts/instances/trials/AkhAfahAmphitheatreHard.cpp
index c93ef664..120fdf33 100644
--- a/src/servers/Scripts/instances/trials/AkhAfahAmphitheatreHard.cpp
+++ b/src/servers/Scripts/instances/trials/AkhAfahAmphitheatreHard.cpp
@@ -31,7 +31,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/trials/BattleintheBigKeep.cpp b/src/servers/Scripts/instances/trials/BattleintheBigKeep.cpp
index 17e97166..0d1cb656 100644
--- a/src/servers/Scripts/instances/trials/BattleintheBigKeep.cpp
+++ b/src/servers/Scripts/instances/trials/BattleintheBigKeep.cpp
@@ -140,7 +140,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/trials/BattleontheBigBridge.cpp b/src/servers/Scripts/instances/trials/BattleontheBigBridge.cpp
index 517d0de5..5ee749b7 100644
--- a/src/servers/Scripts/instances/trials/BattleontheBigBridge.cpp
+++ b/src/servers/Scripts/instances/trials/BattleontheBigBridge.cpp
@@ -29,7 +29,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/trials/CapeWestwind.cpp b/src/servers/Scripts/instances/trials/CapeWestwind.cpp
index 45730407..a9be0a33 100644
--- a/src/servers/Scripts/instances/trials/CapeWestwind.cpp
+++ b/src/servers/Scripts/instances/trials/CapeWestwind.cpp
@@ -21,7 +21,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/trials/ContainmentBayP1T6.cpp b/src/servers/Scripts/instances/trials/ContainmentBayP1T6.cpp
index 5537f963..a42123e5 100644
--- a/src/servers/Scripts/instances/trials/ContainmentBayP1T6.cpp
+++ b/src/servers/Scripts/instances/trials/ContainmentBayP1T6.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/trials/ContainmentBayP1T6Extreme.cpp b/src/servers/Scripts/instances/trials/ContainmentBayP1T6Extreme.cpp
index a4c7506d..f788224e 100644
--- a/src/servers/Scripts/instances/trials/ContainmentBayP1T6Extreme.cpp
+++ b/src/servers/Scripts/instances/trials/ContainmentBayP1T6Extreme.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/trials/ContainmentBayS1T7.cpp b/src/servers/Scripts/instances/trials/ContainmentBayS1T7.cpp
index 9edfb173..41d885ae 100644
--- a/src/servers/Scripts/instances/trials/ContainmentBayS1T7.cpp
+++ b/src/servers/Scripts/instances/trials/ContainmentBayS1T7.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/trials/ContainmentBayS1T7Extreme.cpp b/src/servers/Scripts/instances/trials/ContainmentBayS1T7Extreme.cpp
index 66872c68..3584a978 100644
--- a/src/servers/Scripts/instances/trials/ContainmentBayS1T7Extreme.cpp
+++ b/src/servers/Scripts/instances/trials/ContainmentBayS1T7Extreme.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/trials/ContainmentBayZ1T9.cpp b/src/servers/Scripts/instances/trials/ContainmentBayZ1T9.cpp
index 9486e2c3..951dbeac 100644
--- a/src/servers/Scripts/instances/trials/ContainmentBayZ1T9.cpp
+++ b/src/servers/Scripts/instances/trials/ContainmentBayZ1T9.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/trials/ContainmentBayZ1T9Extreme.cpp b/src/servers/Scripts/instances/trials/ContainmentBayZ1T9Extreme.cpp
index 3e2aaa42..cf3af5e2 100644
--- a/src/servers/Scripts/instances/trials/ContainmentBayZ1T9Extreme.cpp
+++ b/src/servers/Scripts/instances/trials/ContainmentBayZ1T9Extreme.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/trials/Emanation.cpp b/src/servers/Scripts/instances/trials/Emanation.cpp
index d363053d..9098605f 100644
--- a/src/servers/Scripts/instances/trials/Emanation.cpp
+++ b/src/servers/Scripts/instances/trials/Emanation.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/trials/EmanationExtreme.cpp b/src/servers/Scripts/instances/trials/EmanationExtreme.cpp
index 61b68bbd..b79218e3 100644
--- a/src/servers/Scripts/instances/trials/EmanationExtreme.cpp
+++ b/src/servers/Scripts/instances/trials/EmanationExtreme.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/trials/SpecialEventI.cpp b/src/servers/Scripts/instances/trials/SpecialEventI.cpp
index 605e8185..d6820ecd 100644
--- a/src/servers/Scripts/instances/trials/SpecialEventI.cpp
+++ b/src/servers/Scripts/instances/trials/SpecialEventI.cpp
@@ -20,7 +20,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/trials/SpecialEventII.cpp b/src/servers/Scripts/instances/trials/SpecialEventII.cpp
index f48f0576..e67b169f 100644
--- a/src/servers/Scripts/instances/trials/SpecialEventII.cpp
+++ b/src/servers/Scripts/instances/trials/SpecialEventII.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/trials/SpecialEventIII.cpp b/src/servers/Scripts/instances/trials/SpecialEventIII.cpp
index 096d954f..b51956b0 100644
--- a/src/servers/Scripts/instances/trials/SpecialEventIII.cpp
+++ b/src/servers/Scripts/instances/trials/SpecialEventIII.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/trials/TheBowlofEmbers.cpp b/src/servers/Scripts/instances/trials/TheBowlofEmbers.cpp
index 89bdc5ab..30a15c0d 100644
--- a/src/servers/Scripts/instances/trials/TheBowlofEmbers.cpp
+++ b/src/servers/Scripts/instances/trials/TheBowlofEmbers.cpp
@@ -22,7 +22,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/trials/TheBowlofEmbersExtreme.cpp b/src/servers/Scripts/instances/trials/TheBowlofEmbersExtreme.cpp
index be3a4d4a..1609c1ad 100644
--- a/src/servers/Scripts/instances/trials/TheBowlofEmbersExtreme.cpp
+++ b/src/servers/Scripts/instances/trials/TheBowlofEmbersExtreme.cpp
@@ -22,7 +22,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/trials/TheBowlofEmbersHard.cpp b/src/servers/Scripts/instances/trials/TheBowlofEmbersHard.cpp
index 08fcb11b..8ee93875 100644
--- a/src/servers/Scripts/instances/trials/TheBowlofEmbersHard.cpp
+++ b/src/servers/Scripts/instances/trials/TheBowlofEmbersHard.cpp
@@ -22,7 +22,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/trials/TheChrysalis.cpp b/src/servers/Scripts/instances/trials/TheChrysalis.cpp
index d8b99b94..07d2c1c4 100644
--- a/src/servers/Scripts/instances/trials/TheChrysalis.cpp
+++ b/src/servers/Scripts/instances/trials/TheChrysalis.cpp
@@ -50,7 +50,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/trials/TheDragonsNeck.cpp b/src/servers/Scripts/instances/trials/TheDragonsNeck.cpp
index 163578d4..0b17e684 100644
--- a/src/servers/Scripts/instances/trials/TheDragonsNeck.cpp
+++ b/src/servers/Scripts/instances/trials/TheDragonsNeck.cpp
@@ -73,7 +73,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/trials/TheFinalStepsofFaith.cpp b/src/servers/Scripts/instances/trials/TheFinalStepsofFaith.cpp
index ddac1a17..e0b2b811 100644
--- a/src/servers/Scripts/instances/trials/TheFinalStepsofFaith.cpp
+++ b/src/servers/Scripts/instances/trials/TheFinalStepsofFaith.cpp
@@ -23,7 +23,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/trials/TheHowlingEye.cpp b/src/servers/Scripts/instances/trials/TheHowlingEye.cpp
index d06ff180..65d5e1fe 100644
--- a/src/servers/Scripts/instances/trials/TheHowlingEye.cpp
+++ b/src/servers/Scripts/instances/trials/TheHowlingEye.cpp
@@ -28,7 +28,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/trials/TheHowlingEyeExtreme.cpp b/src/servers/Scripts/instances/trials/TheHowlingEyeExtreme.cpp
index df6a70fe..8c4c6d5b 100644
--- a/src/servers/Scripts/instances/trials/TheHowlingEyeExtreme.cpp
+++ b/src/servers/Scripts/instances/trials/TheHowlingEyeExtreme.cpp
@@ -28,7 +28,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/trials/TheHowlingEyeHard.cpp b/src/servers/Scripts/instances/trials/TheHowlingEyeHard.cpp
index 67cd6a49..3d232cff 100644
--- a/src/servers/Scripts/instances/trials/TheHowlingEyeHard.cpp
+++ b/src/servers/Scripts/instances/trials/TheHowlingEyeHard.cpp
@@ -28,7 +28,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/trials/TheJadeStoa.cpp b/src/servers/Scripts/instances/trials/TheJadeStoa.cpp
index aa247c9c..ef50f35c 100644
--- a/src/servers/Scripts/instances/trials/TheJadeStoa.cpp
+++ b/src/servers/Scripts/instances/trials/TheJadeStoa.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/trials/TheJadeStoaExtreme.cpp b/src/servers/Scripts/instances/trials/TheJadeStoaExtreme.cpp
index 903af5ee..5ff17e0d 100644
--- a/src/servers/Scripts/instances/trials/TheJadeStoaExtreme.cpp
+++ b/src/servers/Scripts/instances/trials/TheJadeStoaExtreme.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/trials/TheLimitlessBlueExtreme.cpp b/src/servers/Scripts/instances/trials/TheLimitlessBlueExtreme.cpp
index a5d005ef..31e9b2bd 100644
--- a/src/servers/Scripts/instances/trials/TheLimitlessBlueExtreme.cpp
+++ b/src/servers/Scripts/instances/trials/TheLimitlessBlueExtreme.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/trials/TheLimitlessBlueHard.cpp b/src/servers/Scripts/instances/trials/TheLimitlessBlueHard.cpp
index 0fa086f7..5b24e2d0 100644
--- a/src/servers/Scripts/instances/trials/TheLimitlessBlueHard.cpp
+++ b/src/servers/Scripts/instances/trials/TheLimitlessBlueHard.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/trials/TheMinstrelsBalladNidhoggsRage.cpp b/src/servers/Scripts/instances/trials/TheMinstrelsBalladNidhoggsRage.cpp
index 04655911..de99240b 100644
--- a/src/servers/Scripts/instances/trials/TheMinstrelsBalladNidhoggsRage.cpp
+++ b/src/servers/Scripts/instances/trials/TheMinstrelsBalladNidhoggsRage.cpp
@@ -23,7 +23,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/trials/TheMinstrelsBalladShinryusDomain.cpp b/src/servers/Scripts/instances/trials/TheMinstrelsBalladShinryusDomain.cpp
index b75dc05c..bbd8061d 100644
--- a/src/servers/Scripts/instances/trials/TheMinstrelsBalladShinryusDomain.cpp
+++ b/src/servers/Scripts/instances/trials/TheMinstrelsBalladShinryusDomain.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/trials/TheMinstrelsBalladThordansReign.cpp b/src/servers/Scripts/instances/trials/TheMinstrelsBalladThordansReign.cpp
index 4ed8839f..d6f704d5 100644
--- a/src/servers/Scripts/instances/trials/TheMinstrelsBalladThordansReign.cpp
+++ b/src/servers/Scripts/instances/trials/TheMinstrelsBalladThordansReign.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/trials/TheMinstrelsBalladUltimasBane.cpp b/src/servers/Scripts/instances/trials/TheMinstrelsBalladUltimasBane.cpp
index b9b6fab3..bda9c611 100644
--- a/src/servers/Scripts/instances/trials/TheMinstrelsBalladUltimasBane.cpp
+++ b/src/servers/Scripts/instances/trials/TheMinstrelsBalladUltimasBane.cpp
@@ -26,7 +26,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/trials/TheNavel.cpp b/src/servers/Scripts/instances/trials/TheNavel.cpp
index 82c45dda..1b17ac7d 100644
--- a/src/servers/Scripts/instances/trials/TheNavel.cpp
+++ b/src/servers/Scripts/instances/trials/TheNavel.cpp
@@ -20,7 +20,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/trials/TheNavelExtreme.cpp b/src/servers/Scripts/instances/trials/TheNavelExtreme.cpp
index 4f851089..7fba63c0 100644
--- a/src/servers/Scripts/instances/trials/TheNavelExtreme.cpp
+++ b/src/servers/Scripts/instances/trials/TheNavelExtreme.cpp
@@ -20,7 +20,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/trials/TheNavelHard.cpp b/src/servers/Scripts/instances/trials/TheNavelHard.cpp
index 3c0fff47..966285ef 100644
--- a/src/servers/Scripts/instances/trials/TheNavelHard.cpp
+++ b/src/servers/Scripts/instances/trials/TheNavelHard.cpp
@@ -20,7 +20,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/trials/ThePoolofTribute.cpp b/src/servers/Scripts/instances/trials/ThePoolofTribute.cpp
index f9ab0d24..15745fcd 100644
--- a/src/servers/Scripts/instances/trials/ThePoolofTribute.cpp
+++ b/src/servers/Scripts/instances/trials/ThePoolofTribute.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/trials/ThePoolofTributeExtreme.cpp b/src/servers/Scripts/instances/trials/ThePoolofTributeExtreme.cpp
index c5124b54..7fdd35f8 100644
--- a/src/servers/Scripts/instances/trials/ThePoolofTributeExtreme.cpp
+++ b/src/servers/Scripts/instances/trials/ThePoolofTributeExtreme.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/trials/TheRoyalMenagerie.cpp b/src/servers/Scripts/instances/trials/TheRoyalMenagerie.cpp
index 80293d3e..f1a7d1b3 100644
--- a/src/servers/Scripts/instances/trials/TheRoyalMenagerie.cpp
+++ b/src/servers/Scripts/instances/trials/TheRoyalMenagerie.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/trials/TheSingularityReactor.cpp b/src/servers/Scripts/instances/trials/TheSingularityReactor.cpp
index 26dda762..03f4efef 100644
--- a/src/servers/Scripts/instances/trials/TheSingularityReactor.cpp
+++ b/src/servers/Scripts/instances/trials/TheSingularityReactor.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/trials/TheStepsofFaith.cpp b/src/servers/Scripts/instances/trials/TheStepsofFaith.cpp
index 3036724c..706aca2f 100644
--- a/src/servers/Scripts/instances/trials/TheStepsofFaith.cpp
+++ b/src/servers/Scripts/instances/trials/TheStepsofFaith.cpp
@@ -44,7 +44,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/trials/TheStrikingTreeExtreme.cpp b/src/servers/Scripts/instances/trials/TheStrikingTreeExtreme.cpp
index 84f24747..1f412b76 100644
--- a/src/servers/Scripts/instances/trials/TheStrikingTreeExtreme.cpp
+++ b/src/servers/Scripts/instances/trials/TheStrikingTreeExtreme.cpp
@@ -20,7 +20,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/trials/TheStrikingTreeHard.cpp b/src/servers/Scripts/instances/trials/TheStrikingTreeHard.cpp
index 25dc5004..0a45c68a 100644
--- a/src/servers/Scripts/instances/trials/TheStrikingTreeHard.cpp
+++ b/src/servers/Scripts/instances/trials/TheStrikingTreeHard.cpp
@@ -20,7 +20,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/trials/TheWhorleaterExtreme.cpp b/src/servers/Scripts/instances/trials/TheWhorleaterExtreme.cpp
index 2ab09363..bd35f9f9 100644
--- a/src/servers/Scripts/instances/trials/TheWhorleaterExtreme.cpp
+++ b/src/servers/Scripts/instances/trials/TheWhorleaterExtreme.cpp
@@ -25,7 +25,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/trials/TheWhorleaterHard.cpp b/src/servers/Scripts/instances/trials/TheWhorleaterHard.cpp
index c37f7792..19af13fc 100644
--- a/src/servers/Scripts/instances/trials/TheWhorleaterHard.cpp
+++ b/src/servers/Scripts/instances/trials/TheWhorleaterHard.cpp
@@ -25,7 +25,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/trials/ThokastThokExtreme.cpp b/src/servers/Scripts/instances/trials/ThokastThokExtreme.cpp
index 5f808dc2..6f51351c 100644
--- a/src/servers/Scripts/instances/trials/ThokastThokExtreme.cpp
+++ b/src/servers/Scripts/instances/trials/ThokastThokExtreme.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/trials/ThokastThokHard.cpp b/src/servers/Scripts/instances/trials/ThokastThokHard.cpp
index 5f3b225d..16e53d87 100644
--- a/src/servers/Scripts/instances/trials/ThokastThokHard.cpp
+++ b/src/servers/Scripts/instances/trials/ThokastThokHard.cpp
@@ -17,7 +17,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/trials/ThornmarchExtreme.cpp b/src/servers/Scripts/instances/trials/ThornmarchExtreme.cpp
index 11b7d129..baf14f66 100644
--- a/src/servers/Scripts/instances/trials/ThornmarchExtreme.cpp
+++ b/src/servers/Scripts/instances/trials/ThornmarchExtreme.cpp
@@ -20,7 +20,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/trials/ThornmarchHard.cpp b/src/servers/Scripts/instances/trials/ThornmarchHard.cpp
index 105ffe6d..8dca0eb1 100644
--- a/src/servers/Scripts/instances/trials/ThornmarchHard.cpp
+++ b/src/servers/Scripts/instances/trials/ThornmarchHard.cpp
@@ -20,7 +20,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/instances/trials/UrthsFount.cpp b/src/servers/Scripts/instances/trials/UrthsFount.cpp
index 58c2215a..cbe988f6 100644
--- a/src/servers/Scripts/instances/trials/UrthsFount.cpp
+++ b/src/servers/Scripts/instances/trials/UrthsFount.cpp
@@ -20,7 +20,8 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1,
+                             uint16_t param2 ) override
    {
 
    }
diff --git a/src/servers/Scripts/opening/OpeningGridania.cpp b/src/servers/Scripts/opening/OpeningGridania.cpp
index 86775868..0c218e02 100644
--- a/src/servers/Scripts/opening/OpeningGridania.cpp
+++ b/src/servers/Scripts/opening/OpeningGridania.cpp
@@ -34,7 +34,9 @@ private:
          Scene00001( player );
       };
 
-      player.eventPlay( getId(), 0, 0x04AC05, 0, 1, callback );
+      player.eventPlay( getId(), 0, NO_DEFAULT_CAMERA | INVIS_ENPC |
+                                    CONDITION_CUTSCENE | HIDE_UI |
+                                    HIDE_HOTBAR | SILENT_ENTER_TERRI_ENV, 0, 1, callback );
    }
 
    void Scene00001( Entity::Player& player )
diff --git a/src/servers/Scripts/opening/OpeningLimsa.cpp b/src/servers/Scripts/opening/OpeningLimsa.cpp
index 84a1f771..24a11421 100644
--- a/src/servers/Scripts/opening/OpeningLimsa.cpp
+++ b/src/servers/Scripts/opening/OpeningLimsa.cpp
@@ -49,7 +49,9 @@ private:
          Scene00001( player );
       };
 
-      player.eventPlay( getId(), 0, 0x04AC05, 0, 1, callback );
+      player.eventPlay( getId(), 0, NO_DEFAULT_CAMERA | INVIS_ENPC |
+                                    CONDITION_CUTSCENE | HIDE_UI |
+                                    HIDE_HOTBAR | SILENT_ENTER_TERRI_ENV, 0, 1, callback );
    }
 
    void Scene00001( Entity::Player& player )
diff --git a/src/servers/Scripts/opening/OpeningUldah.cpp b/src/servers/Scripts/opening/OpeningUldah.cpp
index c3edda7e..2c66cffe 100644
--- a/src/servers/Scripts/opening/OpeningUldah.cpp
+++ b/src/servers/Scripts/opening/OpeningUldah.cpp
@@ -35,7 +35,9 @@ private:
          Scene00001( player );
       };
 
-      player.eventPlay( getId(), 0, 0x04AC05, 0, 1, callback );
+      player.eventPlay( getId(), 0, NO_DEFAULT_CAMERA | INVIS_ENPC |
+                                    CONDITION_CUTSCENE | HIDE_UI |
+                                    HIDE_HOTBAR | SILENT_ENTER_TERRI_ENV, 0, 1, callback );
    }
 
    void Scene00001( Entity::Player& player )
diff --git a/src/servers/Scripts/opening/ScriptLoader.cpp b/src/servers/Scripts/opening/ScriptLoader.cpp
deleted file mode 100644
index c0306ca9..00000000
--- a/src/servers/Scripts/opening/ScriptLoader.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-#include <Script/NativeScriptApi.h>
-
-#include "OpeningGridania.cpp"
-#include "OpeningLimsa.cpp"
-#include "OpeningUldah.cpp"
-
-const ScriptObject* ptrs[] =
-{
-   static_cast< ScriptObject* >( new OpeningGridania ),
-   static_cast< ScriptObject* >( new OpeningLimsa ),
-   static_cast< ScriptObject* >( new OpeningUldah ),
-
-   nullptr
-};
-
-extern "C" EXPORT const ScriptObject** getScripts()
-{
-   return ptrs;
-}
diff --git a/src/servers/Scripts/quest/ManFst001.cpp b/src/servers/Scripts/quest/ManFst001.cpp
index 8f03aeab..8b813fe5 100644
--- a/src/servers/Scripts/quest/ManFst001.cpp
+++ b/src/servers/Scripts/quest/ManFst001.cpp
@@ -53,7 +53,7 @@ private:
          Scene00002( player );
       };
 
-      player.eventPlay( getId(), 1, 0xF8482EFB, 0, 0, callback );
+      player.eventPlay( getId(), 1, DISABLE_SKIP | HIDE_HOTBAR | SET_BASE, 0, 0, callback );
    }
 
    void Scene00002( Entity::Player& player )
@@ -75,7 +75,7 @@ private:
          Scene00005( player );
       };
 
-      player.eventPlay( getId(), 4, 0x2c02, 0, 0, callback );
+      player.eventPlay( getId(), 4, FADE_OUT | HIDE_HOTBAR | CONDITION_CUTSCENE | HIDE_UI , 0, 0, callback );
    }
 
    void Scene00005( Entity::Player& player )
diff --git a/src/servers/Scripts/quest/ManFst002.cpp b/src/servers/Scripts/quest/ManFst002.cpp
index dd99f0d3..98c0f0da 100644
--- a/src/servers/Scripts/quest/ManFst002.cpp
+++ b/src/servers/Scripts/quest/ManFst002.cpp
@@ -108,7 +108,7 @@ private:
          checkQuestCompletion( player, 3 );
       };
 
-      player.eventPlay( getId(), 2, 0, 0, 0, callback );
+      player.eventPlay( getId(), 2, NONE, 0, 0, callback );
    }
 
    void Scene00003( Entity::Player& player )
@@ -121,12 +121,12 @@ private:
             Scene00099( player );
       };
 
-      player.eventPlay( getId(), 3, 0, 0, 0, callback );
+      player.eventPlay( getId(), 3, NONE, 0, 0, callback );
    }
 
    void Scene00004( Entity::Player& player )
    {
-      player.eventPlay( getId(), 4, 0, 0, 0 );
+      player.eventPlay( getId(), 4, NONE, 0, 0 );
    }
 
    void Scene00005( Entity::Player& player )
@@ -165,7 +165,7 @@ private:
          Scene00001( player );
       };
 
-      player.eventPlay( getId(), 51, 0, 0, 0, callback );
+      player.eventPlay( getId(), 51, NONE, 0, 0, callback );
    }
 
    void Scene00099( Entity::Player& player )
@@ -175,7 +175,7 @@ private:
          Scene00004( player );
       };
 
-      player.eventPlay( getId(), 99, 0, 0, 0, callback );
+      player.eventPlay( getId(), 99, NONE, 0, 0, callback );
    }
 
    void Scene00100( Entity::Player& player )
diff --git a/src/servers/Scripts/quest/ManFst004.cpp b/src/servers/Scripts/quest/ManFst004.cpp
index 738444e0..62adad46 100644
--- a/src/servers/Scripts/quest/ManFst004.cpp
+++ b/src/servers/Scripts/quest/ManFst004.cpp
@@ -225,7 +225,7 @@ class ManFst004 : public EventScript
 
    void Scene00051( Entity::Player& player )
    {
-      player.eventPlay( m_id, 51, 0,
+      player.eventPlay( m_id, 51, NONE,
          [&]( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2, uint16_t param3 )
          {
             Scene00001( player );
@@ -234,7 +234,7 @@ class ManFst004 : public EventScript
 
    void Scene00099( Entity::Player& player )
    {
-      player.eventPlay( m_id, 99, 0,
+      player.eventPlay( m_id, 99, NONE,
          [&]( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2, uint16_t param3 )
          {
             Scene00004( player );
@@ -243,7 +243,7 @@ class ManFst004 : public EventScript
 
    void Scene00100( Entity::Player& player )
    {
-      player.eventPlay( m_id, 100, 0,
+      player.eventPlay( m_id, 100, NONE,
          [&]( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2, uint16_t param3 )
          {
             player.setQuestUI8CH( m_id, 0 ); // remove key item, since we have just traded it
diff --git a/src/servers/Scripts/quest/ManSea001.cpp b/src/servers/Scripts/quest/ManSea001.cpp
index 4ad91b50..568b190e 100644
--- a/src/servers/Scripts/quest/ManSea001.cpp
+++ b/src/servers/Scripts/quest/ManSea001.cpp
@@ -46,7 +46,7 @@ private:
          Scene00002( player );
       };
 
-      player.eventPlay( getId(), 1, 0xF8482EFB, 0, 0, callback );
+      player.eventPlay( getId(), 1, DISABLE_SKIP | HIDE_HOTBAR | SET_BASE, 0, 0, callback );
    }
 
    void Scene00002( Entity::Player& player )
diff --git a/src/servers/Scripts/quest/ManSea002.cpp b/src/servers/Scripts/quest/ManSea002.cpp
index 8cb1b0b8..23a017b0 100644
--- a/src/servers/Scripts/quest/ManSea002.cpp
+++ b/src/servers/Scripts/quest/ManSea002.cpp
@@ -132,7 +132,7 @@ private:
          player.updateQuest( getId(), 1 );
          player.setQuestUI8CH( getId(), 1 ); // receive key item
 
-         // teleport to real gridania
+         // teleport to real limsa
          player.forceZoneing( 128 );
       };
 
diff --git a/src/servers/Scripts/quest/ManWil001.cpp b/src/servers/Scripts/quest/ManWil001.cpp
index 18669bd1..867399ec 100644
--- a/src/servers/Scripts/quest/ManWil001.cpp
+++ b/src/servers/Scripts/quest/ManWil001.cpp
@@ -47,7 +47,7 @@ private:
          Scene00002( player );
       };
 
-      player.eventPlay( getId(), 1, 0xF8482EFB, 0, 0, callback );
+      player.eventPlay( getId(), 1, DISABLE_SKIP | HIDE_HOTBAR | SET_BASE, 0, 0, callback );
    }
 
    void Scene00002( Entity::Player& player )
@@ -62,7 +62,7 @@ private:
 
    void Scene00003( Entity::Player& player )
    {
-      player.eventPlay( getId(), 3, 0, 0, 0 );
+      player.eventPlay( getId(), 3, NONE, 0, 0 );
    }
 
    void Scene00004( Entity::Player& player )
diff --git a/src/servers/Scripts/quest/ScriptLoader.cpp b/src/servers/Scripts/quest/ScriptLoader.cpp
deleted file mode 100644
index 53db3f2e..00000000
--- a/src/servers/Scripts/quest/ScriptLoader.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-#include <Script/NativeScriptApi.h>
-
-#include "ManFst001.cpp"
-#include "ManFst002.cpp"
-#include "ManFst003.cpp"
-#include "ManFst004.cpp"
-#include "ManSea001.cpp"
-#include "ManSea002.cpp"
-#include "ManWil001.cpp"
-#include "ManWil002.cpp"
-#include "subquest/gridania/SubFst001.cpp"
-#include "subquest/gridania/SubFst002.cpp"
-#include "subquest/gridania/SubFst010.cpp"
-#include "subquest/gridania/SubFst013.cpp"
-
-const ScriptObject* ptrs[] =
-{
-   static_cast< ScriptObject* >( new ManFst001 ),
-   static_cast< ScriptObject* >( new ManFst002 ),
-   static_cast< ScriptObject* >( new ManFst003 ),
-   static_cast< ScriptObject* >( new ManFst004 ),
-   static_cast< ScriptObject* >( new ManSea001 ),
-   static_cast< ScriptObject* >( new ManSea002 ),
-   static_cast< ScriptObject* >( new ManWil001 ),
-   static_cast< ScriptObject* >( new ManWil002 ),
-   static_cast< ScriptObject* >( new SubFst001 ),
-   static_cast< ScriptObject* >( new SubFst002 ),
-   static_cast< ScriptObject* >( new SubFst010 ),
-   static_cast< ScriptObject* >( new SubFst013 ),
-
-   nullptr
-};
-
-extern "C" EXPORT const ScriptObject** getScripts()
-{
-   return ptrs;
-}
diff --git a/src/servers/sapphire_zone/Actor/Player.h b/src/servers/sapphire_zone/Actor/Player.h
index 9fbe8ee4..759f3134 100644
--- a/src/servers/sapphire_zone/Actor/Player.h
+++ b/src/servers/sapphire_zone/Actor/Player.h
@@ -54,11 +54,11 @@ public:
    /*! start an event item action */
    void eventItemActionStart( uint32_t eventId, uint32_t action, ActionCallback finishCallback, ActionCallback interruptCallback, uint64_t additional );
    /*! start/register a normal event */
-   void eventStart( uint64_t actorId, uint32_t eventId, Event::EventHandler::EventType eventParam, uint8_t eventParam1, uint32_t eventParam2, uint32_t contentId = 0 );
+   void eventStart( uint64_t actorId, uint32_t eventId, Event::EventHandler::EventType eventParam, uint8_t eventParam1, uint32_t eventParam2 );
    /*! play a subevent */
    void eventPlay( uint32_t eventId, uint32_t scene, uint32_t flags, uint32_t eventParam2, uint32_t eventParam3 );
 
-   void directorPlayScene( uint32_t eventId, uint32_t scene, uint32_t flags, uint32_t eventParam2, uint32_t eventParam3 );
+   void directorPlayScene( uint32_t eventId, uint32_t scene, uint32_t flags, uint32_t eventParam3, uint32_t eventParam4, uint32_t eventParam5 = 0 );
 
    /*! play a subevent */
    void eventPlay( uint32_t eventId, uint32_t scene, uint32_t flags,
diff --git a/src/servers/sapphire_zone/Actor/PlayerEvent.cpp b/src/servers/sapphire_zone/Actor/PlayerEvent.cpp
index 9ebdbcd2..7aff9966 100644
--- a/src/servers/sapphire_zone/Actor/PlayerEvent.cpp
+++ b/src/servers/sapphire_zone/Actor/PlayerEvent.cpp
@@ -75,8 +75,8 @@ void Core::Entity::Player::checkEvent( uint32_t eventId )
 }
 
 
-void Core::Entity::Player::directorPlayScene( uint32_t eventId, uint32_t scene, uint32_t flags, uint32_t eventParam2,
-                                              uint32_t eventParam3 )
+void Core::Entity::Player::directorPlayScene( uint32_t eventId, uint32_t scene, uint32_t flags, uint32_t eventParam3,
+                                              uint32_t eventParam4, uint32_t eventParam5 )
 {
    if( flags & 0x02 )
       setStateFlag( PlayerStateFlag::WatchingCutscene );
@@ -92,14 +92,14 @@ void Core::Entity::Player::directorPlayScene( uint32_t eventId, uint32_t scene,
    pEvent->setPlayedScene( true );
    pEvent->setEventReturnCallback( nullptr );
    DirectorPlayScenePacket eventPlay( getId(), getId(), pEvent->getId(),
-                                      scene, flags, eventParam2, eventParam3 );
+                                      scene, flags, eventParam3, eventParam4, eventParam5 );
 
    queuePacket( eventPlay );
 }
 
 void Core::Entity::Player::eventStart( uint64_t actorId, uint32_t eventId, 
                                        Event::EventHandler::EventType eventType, uint8_t eventParam1,
-                                       uint32_t eventParam2, uint32_t contentId )
+                                       uint32_t eventParam2 )
 {
 
    auto newEvent = Event::make_EventHandler( this, actorId, eventId, eventType, eventParam2 );
@@ -108,7 +108,7 @@ void Core::Entity::Player::eventStart( uint64_t actorId, uint32_t eventId,
 
    setStateFlag( PlayerStateFlag::InNpcEvent );
 
-   EventStartPacket eventStart( getId(), actorId, eventId, eventType, eventParam1, eventParam2, contentId );
+   EventStartPacket eventStart( getId(), actorId, eventId, eventType, eventParam1, eventParam2 );
    
    queuePacket( eventStart );
    
diff --git a/src/servers/sapphire_zone/CMakeLists.txt b/src/servers/sapphire_zone/CMakeLists.txt
index 2f54bba3..725db8a1 100644
--- a/src/servers/sapphire_zone/CMakeLists.txt
+++ b/src/servers/sapphire_zone/CMakeLists.txt
@@ -73,4 +73,6 @@ target_link_libraries( sapphire_zone ${Boost_LIBRARIES} )
 target_include_directories( sapphire_zone PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" )
 target_include_directories( sapphire_zone PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/Script" )
 target_include_directories( sapphire_zone PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../../libraries/external" )
-#cotire( sapphire_zone )
+if (UNIX)
+  cotire( sapphire_zone )
+endif()
diff --git a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
index 310d9f78..08fb8a07 100644
--- a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
+++ b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
@@ -710,6 +710,58 @@ void Core::DebugCommandHandler::instance( char* data, Entity::Player &player, bo
       else
          player.sendDebug( "Failed to create instance with id: " + std::to_string( instanceContentId ) );
    }
+   else if( subCommand == "bind" )
+   {
+      uint32_t instanceId;
+      sscanf( params.c_str(), "%d", &instanceId );
+
+      auto instance = pTeriMgr->getInstanceZonePtr( instanceId );
+      if( instance )
+      {
+         auto pInstanceContent = instance->getAsInstanceContent();
+         pInstanceContent->bindPlayer( player.getId() );
+         player.sendDebug(
+                 "Now bound to instance with id: " + std::to_string( pInstanceContent->getGuId() ) +
+                 " -> " + pInstanceContent->getName() );
+      }
+      else
+         player.sendDebug( "Unknown instance with id: " + std::to_string( instanceId ) );
+   }
+   else if( subCommand == "unbind" )
+   {
+      uint32_t instanceId;
+      sscanf( params.c_str(), "%d", &instanceId );
+
+      auto instance = pTeriMgr->getInstanceZonePtr( instanceId );
+      if( !instance )
+      {
+         player.sendDebug( "Unknown instance with id: " + std::to_string( instanceId ) );
+         return;
+      }
+
+      auto pInstanceContent = instance->getAsInstanceContent();
+      if( pInstanceContent->isPlayerBound( player.getId() ) )
+      {
+         pInstanceContent->unbindPlayer( player.getId() );
+         player.sendDebug(
+                 "Now unbound from instance with id: " + std::to_string( pInstanceContent->getGuId() ) +
+                 " -> " + pInstanceContent->getName() );
+      }
+      else
+         player.sendDebug( "Player not bound to instance with id: " + std::to_string( instanceId ) );
+
+   }
+   else if( subCommand == "createzone" || subCommand == "crz" )
+   {
+      uint32_t zoneId;
+      sscanf( params.c_str(), "%d", &zoneId );
+
+      auto instance = pTeriMgr->createTerritoryInstance( zoneId );
+      if( instance )
+         player.sendDebug( "Created instance with id: " + std::to_string( instance->getGuId() ) + " -> " + instance->getName() );
+      else
+         player.sendDebug( "Failed to create instance with id: " + std::to_string( zoneId ) );
+   }
    else if( subCommand == "remove" || subCommand == "rm" )
    {
       uint32_t terriId;
@@ -793,4 +845,43 @@ void Core::DebugCommandHandler::instance( char* data, Entity::Player &player, bo
 
       player.getCurrentZone()->setCurrentFestival( 0 );
    }
+   else if ( subCommand == "qte_start" )
+   {
+      auto instance = boost::dynamic_pointer_cast< InstanceContent >( player.getCurrentZone() );
+      if ( !instance )
+         return;
+
+      player.sendDebug( "qte start" );
+      instance->startQte();
+   }
+   else if ( subCommand == "event_start" )
+   {
+      auto instance = boost::dynamic_pointer_cast< InstanceContent >( player.getCurrentZone() );
+      if ( !instance )
+         return;
+
+      player.sendDebug( "evt start" );
+      instance->startEventCutscene();
+   }
+   else if ( subCommand == "event_end" )
+   {
+      auto instance = boost::dynamic_pointer_cast< InstanceContent >( player.getCurrentZone() );
+      if ( !instance )
+         return;
+
+      player.sendDebug( "evt end" );
+      instance->endEventCutscene();
+   }
+   else if( subCommand == "bgm" )
+   {
+      uint16_t bgmId;
+      sscanf( params.c_str(), "%hd", &bgmId );
+
+      if( auto instance = player.getCurrentInstance() )
+         instance->setCurrentBGM( bgmId );
+   }
+   else
+   {
+      player.sendDebug( "Unknown sub command." );
+   }
 }
diff --git a/src/servers/sapphire_zone/Event/EventDefs.h b/src/servers/sapphire_zone/Event/EventDefs.h
new file mode 100644
index 00000000..b7c4afba
--- /dev/null
+++ b/src/servers/sapphire_zone/Event/EventDefs.h
@@ -0,0 +1,91 @@
+#ifndef SAPPHIRE_EVENTDEFS_H
+#define SAPPHIRE_EVENTDEFS_H
+
+namespace Core
+{
+   enum EventFlags
+   {
+      NONE = 0,
+      NO_DEFAULT_CAMERA = 0x00000001,
+      FADE_OUT = 0x00000002,
+      INVIS_ENPC = 0x00000004,
+      INVIS_EOBJ = 0x00000008,
+      INVIS_BNPC = 0x00000010,
+      INVIS_OTHER_PC = 0x00000020,
+      INVIS_PARTY_PC = 0x00000040,
+      INVIS_PARTY_BUDDY = 0x10000000,
+      INVIS_GATHERING_POINT = 0x00000080,
+      INVIS_AETHERYTE = 0x00000100,
+      INVIS_TREASURE = 0x00000200,
+      CONDITION_CUTSCENE = 0x00000400,
+      HIDE_UI = 0x00000800,
+      INVIS_ALL = 0xF80003FC,
+      AUTO_LOC_CAMERA = 0x00001000,
+      HIDE_HOTBAR = 0x00002000,
+      INVINCIBLE = 0x00004000,
+      SILENT_ENTER_TERRI_ENV = 0x00008000,
+      SILENT_ENTER_TERRI_BGM = 0x00010000,
+      SILENT_ENTER_TERRI_SE = 0x00020000,
+      SILENT_ENTER_TERRI_ALL = 0x00038000,
+      DISABLE_SKIP = 0x00080000,
+      HIDE_FESTIVAL = 0x00200000,
+      DISABLE_STEALTH = 0x00400000,
+      ROLLBACK_HIDE_UI = 0x00800000,
+      LOCK_HUD = 0x01000000,
+      LOCK_HOTBAR = 0x02000000,
+      DISABLE_CANCEL_EMOTE = 0x04000000,
+      INVIS_AOE = 0x08000000,
+      INVIS_ALLIANCE_PC = 0x20000000,
+      INVIS_ALLIANCE_BUDDY = 0x40000000,
+      INVIS_COMPANION = 0x80000000,
+      SET_BASE = 0xF8400EFB,
+      SET_INVIS_BASE = 0xF8400FFF,
+      SET_EOBJ_BASE = 0xF8400EF3
+   };
+
+   enum EventTypes
+   {
+      EVENT_TALK = 1,
+      EVENT_EMOTE = 2,
+      EVENT_DISTANCE_BELOW = 3,
+      EVENT_DISTANCE_OVER = 4,
+      EVENT_BATTLE_REWARD = 5,
+      EVENT_CRAFT = 6,
+      EVENT_NEST = 7,
+      EVENT_EVENT_ITEM = 8,
+      EVENT_DROP = 9,
+      EVENT_WITHIN_RANGE = 10,
+      EVENT_OUTSIDE_RANGE = 11,
+      EVENT_GAME_START = 12,
+      EVENT_GAME_PROGRESS = 13,
+      EVENT_ENTER_TERRITORY = 15,
+      EVENT_GAME_COME_BACK = 17,
+      EVENT_ACTION_RESULT = 18,
+      EVENT_MATERIA_CRAFT = 19,
+      EVENT_FISHING = 20,
+      EVENT_UI = 21,
+      EVENT_HOUSING = 22,
+      EVENT_SAY = 23,
+      EVENT_TABLE_GAME = 24
+   };
+
+   enum EventFinishState
+   {
+      UNLOCK = 1,
+      KEEPLOCK = 0
+   };
+
+   enum DamageType
+   {
+      STD_DAMAGE = 0X03,
+      STD_HEAL = 0X04,
+      STD_MP_LOSS = 0X0A,
+      STD_MP_GAIN = 0X0B,
+      STD_TP_LOSS = 0X0C,
+      STD_TP_GAIN = 0X0D
+   };
+
+}
+
+
+#endif //SAPPHIRE_EVENTDEFS_H
diff --git a/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp
index 2e1ad688..d099be24 100644
--- a/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp
@@ -93,6 +93,7 @@ enum ClientTrigger
    SomeDirectorEvent = 0x328, // unsure what exactly triggers it, starts director when returning to instance though
 
    EnterTerritoryEventFinished = 0x330,
+   RequestInstanceLeave = 0x333, // df menu button
 
    AchievementCritReq = 0x3E8,
    AchievementList = 0x3E9,
@@ -107,174 +108,182 @@ enum ClientTrigger
 void Core::Network::GameConnection::actionHandler( const Packets::GamePacket& inPacket,
                                                    Entity::Player& player )
 {
-    auto pLog = g_fw.get< Logger >();
-    uint16_t commandId = inPacket.getValAt< uint16_t >( 0x20 );
-    uint64_t param1 = inPacket.getValAt< uint64_t >( 0x24 );
-    uint32_t param11 = inPacket.getValAt< uint32_t >( 0x24 );
-    uint32_t param12 = inPacket.getValAt< uint32_t >( 0x28 );
-    uint32_t param2 = inPacket.getValAt< uint32_t >( 0x2C );
-    uint64_t param3 = inPacket.getValAt< uint64_t >( 0x38 );
+   auto pLog = g_fw.get< Logger >();
+   uint16_t commandId = inPacket.getValAt< uint16_t >( 0x20 );
+   uint64_t param1 = inPacket.getValAt< uint64_t >( 0x24 );
+   uint32_t param11 = inPacket.getValAt< uint32_t >( 0x24 );
+   uint32_t param12 = inPacket.getValAt< uint32_t >( 0x28 );
+   uint32_t param2 = inPacket.getValAt< uint32_t >( 0x2C );
+   uint64_t param3 = inPacket.getValAt< uint64_t >( 0x38 );
 
-    pLog->debug( "[" + std::to_string( m_pSession->getId() ) + "] Incoming action: " +
-                 boost::str( boost::format( "%|04X|" ) % ( uint32_t ) ( commandId & 0xFFFF ) ) +
-                 "\nparam1: " + boost::str( boost::format( "%|016X|" ) % ( uint64_t ) ( param1 & 0xFFFFFFFFFFFFFFF ) ) +
-                 "\nparam2: " + boost::str( boost::format( "%|08X|" ) % ( uint32_t ) ( param2 & 0xFFFFFFFF ) ) +
-                 "\nparam3: " + boost::str( boost::format( "%|016X|" ) % ( uint64_t ) ( param3 & 0xFFFFFFFFFFFFFFF ) )
-    );
+   pLog->debug( "[" + std::to_string( m_pSession->getId() ) + "] Incoming action: " +
+              boost::str( boost::format( "%|04X|" ) % ( uint32_t ) ( commandId & 0xFFFF ) ) +
+              "\nparam1: " + boost::str( boost::format( "%|016X|" ) % ( uint64_t ) ( param1 & 0xFFFFFFFFFFFFFFF ) ) +
+              "\nparam2: " + boost::str( boost::format( "%|08X|" ) % ( uint32_t ) ( param2 & 0xFFFFFFFF ) ) +
+              "\nparam3: " + boost::str( boost::format( "%|016X|" ) % ( uint64_t ) ( param3 & 0xFFFFFFFFFFFFFFF ) )
+   );
 
 
-    //g_log.Log(LoggingSeverity::debug, "[" + std::to_string(m_pSession->getId()) + "] " + pInPacket->toString());
+   //g_log.Log(LoggingSeverity::debug, "[" + std::to_string(m_pSession->getId()) + "] " + pInPacket->toString());
 
-    switch( commandId )
-    {
-        case ClientTrigger::ToggleSeathe:  // Toggle sheathe
-        {
-            if ( param11 == 1 )
-                player.setStance( Entity::Chara::Stance::Active );
-            else
-            {
-                player.setStance( Entity::Chara::Stance::Passive );
-                player.setAutoattack( false );
-            }
+   switch( commandId )
+   {
+       case ClientTrigger::ToggleSeathe:  // Toggle sheathe
+       {
+          if ( param11 == 1 )
+              player.setStance( Entity::Chara::Stance::Active );
+          else
+          {
+              player.setStance( Entity::Chara::Stance::Passive );
+              player.setAutoattack( false );
+          }
 
-            player.sendToInRangeSet( ActorControlPacket142( player.getId(), 0, param11, 1 ) );
+          player.sendToInRangeSet( ActorControlPacket142( player.getId(), 0, param11, 1 ) );
 
-            break;
-        }
-        case ClientTrigger::ToggleAutoAttack:  // Toggle auto-attack
-        {
-            if ( param11 == 1 )
-            {
-                player.setAutoattack( true );
-                player.setStance( Entity::Chara::Stance::Active );
-            }
-            else
-                player.setAutoattack( false );
+          break;
+       }
+       case ClientTrigger::ToggleAutoAttack:  // Toggle auto-attack
+       {
+          if ( param11 == 1 )
+          {
+              player.setAutoattack( true );
+              player.setStance( Entity::Chara::Stance::Active );
+          }
+          else
+              player.setAutoattack( false );
 
-            player.sendToInRangeSet( ActorControlPacket142( player.getId(), 1, param11, 1 ) );
+          player.sendToInRangeSet( ActorControlPacket142( player.getId(), 1, param11, 1 ) );
 
-            break;
-        }
-        case ClientTrigger::ChangeTarget: // Change target
-        {
+          break;
+       }
+       case ClientTrigger::ChangeTarget: // Change target
+       {
 
-            uint64_t targetId = inPacket.getValAt< uint64_t >( 0x24 );
-            player.changeTarget( targetId );
-            break;
-        }
-        case ClientTrigger::Dismount:
-        {
-           player.dismount();
-           break;
-        }
-        case ClientTrigger::RemoveStatusEffect: // Remove status (clicking it off)
-        {
-           // todo: check if status can be removed by client from exd
-           player.removeSingleStatusEffectById( static_cast< uint32_t >( param1 ) );
-           break;
-        }
-        case ClientTrigger::CastCancel: // Cancel cast
-        {
-           if( player.getCurrentAction() )
-               player.getCurrentAction()->setInterrupted();
-           break;
-        }
-        case ClientTrigger::MarkPlayer: // Mark player
-        {
-           break;
-        }
-        case ClientTrigger::SetTitle: // Set player title
-        {
-           player.setTitle( static_cast< uint16_t >( param1 ) );
-           break;
-        }
-        case ClientTrigger::TitleList: // Get title list
-        {
-           player.sendTitleList();
-           break;
-        }
-        case ClientTrigger::UpdatedSeenHowTos: // Update howtos seen
-        {
-            uint32_t howToId = param11;
-            player.updateHowtosSeen( howToId );
-            break;
-        }
-        case ClientTrigger::Emote: // emote
-        {
-            uint64_t targetId = player.getTargetId();
-            uint32_t emoteId = inPacket.getValAt< uint32_t >( 0x24 );
+          uint64_t targetId = inPacket.getValAt< uint64_t >( 0x24 );
+          player.changeTarget( targetId );
+          break;
+       }
+       case ClientTrigger::Dismount:
+       {
+          player.dismount();
+          break;
+       }
+       case ClientTrigger::RemoveStatusEffect: // Remove status (clicking it off)
+       {
+          // todo: check if status can be removed by client from exd
+          player.removeSingleStatusEffectById( static_cast< uint32_t >( param1 ) );
+          break;
+       }
+       case ClientTrigger::CastCancel: // Cancel cast
+       {
+          if( player.getCurrentAction() )
+              player.getCurrentAction()->setInterrupted();
+          break;
+       }
+       case ClientTrigger::MarkPlayer: // Mark player
+       {
+          break;
+       }
+       case ClientTrigger::SetTitle: // Set player title
+       {
+          player.setTitle( static_cast< uint16_t >( param1 ) );
+          break;
+       }
+       case ClientTrigger::TitleList: // Get title list
+       {
+          player.sendTitleList();
+          break;
+       }
+       case ClientTrigger::UpdatedSeenHowTos: // Update howtos seen
+       {
+          uint32_t howToId = param11;
+          player.updateHowtosSeen( howToId );
+          break;
+       }
+       case ClientTrigger::Emote: // emote
+       {
+          uint64_t targetId = player.getTargetId();
+          uint32_t emoteId = inPacket.getValAt< uint32_t >( 0x24 );
 
-            player.emote( emoteId, targetId );
-            break;
-        }
-        case ClientTrigger::PersistantEmoteCancel: // cancel persistant emote
-        {
-            break;
-        }
-        case ClientTrigger::PoseChange: // change pose
-        {
-            break;
-        }
-        case ClientTrigger::PoseReapply: // reapply pose
-        {
-            break;
-        }
-        case ClientTrigger::PoseCancel: // cancel pose
-        {
-            break;
-        }
-        case ClientTrigger::Return: // return dead / accept raise
-        {
-           switch ( static_cast < ResurrectType >( param1 ) )
-           {
-              case ResurrectType::RaiseSpell:
-                 // todo: handle raise case (set position to raiser, apply weakness status, set hp/mp/tp as well as packet)
-                 player.returnToHomepoint();
-                 break;
-              case ResurrectType::Return:
-                 player.returnToHomepoint();
-                 break;
-              default:
-                 break;
-           }
-            
-        }
-        case ClientTrigger::FinishZoning: // Finish zoning
-        {
-            player.finishZoning();
-            break;
-        }
+          player.emote( emoteId, targetId );
+          break;
+       }
+       case ClientTrigger::PersistantEmoteCancel: // cancel persistant emote
+       {
+          break;
+       }
+       case ClientTrigger::PoseChange: // change pose
+       {
+          break;
+       }
+       case ClientTrigger::PoseReapply: // reapply pose
+       {
+          break;
+       }
+       case ClientTrigger::PoseCancel: // cancel pose
+       {
+          break;
+       }
+       case ClientTrigger::Return: // return dead / accept raise
+       {
+          switch ( static_cast < ResurrectType >( param1 ) )
+          {
+             case ResurrectType::RaiseSpell:
+                // todo: handle raise case (set position to raiser, apply weakness status, set hp/mp/tp as well as packet)
+                player.returnToHomepoint();
+                break;
+             case ResurrectType::Return:
+                player.returnToHomepoint();
+                break;
+             default:
+                break;
+          }
 
-        case ClientTrigger::Teleport: // Teleport
-        {
+       }
+       case ClientTrigger::FinishZoning: // Finish zoning
+       {
+          player.finishZoning();
+          break;
+       }
 
-            player.teleportQuery( param11 );
-            break;
-        }
-        case ClientTrigger::DyeItem: // Dye item
-        {
-           break;
-        }
-        case ClientTrigger::DirectorInitFinish: // Director init finish
-        {
-           player.getCurrentZone()->onInitDirector( player );
-           break;
-        }
+       case ClientTrigger::Teleport: // Teleport
+       {
+
+          player.teleportQuery( param11 );
+          break;
+       }
+       case ClientTrigger::DyeItem: // Dye item
+       {
+          break;
+       }
+       case ClientTrigger::DirectorInitFinish: // Director init finish
+       {
+          player.getCurrentZone()->onInitDirector( player );
+          break;
+       }
        case ClientTrigger::SomeDirectorEvent: // Director init finish
        {
           player.getCurrentZone()->onSomeDirectorEvent( player );
           break;
        }
-        case ClientTrigger::EnterTerritoryEventFinished:// this may still be something else. I think i have seen it elsewhere
-        {
-           player.setOnEnterEventDone( true );
-           break;
-        }
-        default:
-        {
-           pLog->debug( "[" + std::to_string( m_pSession->getId() ) + "] Unhandled action: " +
-              boost::str( boost::format( "%|04X|" ) % (uint32_t) ( commandId & 0xFFFF ) ) );
-           break;
-        }
-    }
+       case ClientTrigger::EnterTerritoryEventFinished:// this may still be something else. I think i have seen it elsewhere
+       {
+          player.setOnEnterEventDone( true );
+          break;
+       }
+       case ClientTrigger::RequestInstanceLeave:
+       {
+          // todo: apply cf penalty if applicable, make sure player isnt in combat
+          player.exitInstance();
+          break;
+       }
+
+
+       default:
+       {
+          pLog->debug( "[" + std::to_string( m_pSession->getId() ) + "] Unhandled action: " +
+             boost::str( boost::format( "%|04X|" ) % (uint32_t) ( commandId & 0xFFFF ) ) );
+          break;
+       }
+   }
 }
diff --git a/src/servers/sapphire_zone/Network/Handlers/CFHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/CFHandlers.cpp
index 0ece4964..5e0b1bdf 100644
--- a/src/servers/sapphire_zone/Network/Handlers/CFHandlers.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/CFHandlers.cpp
@@ -6,7 +6,7 @@
 #include <Exd/ExdDataGenerated.h>
 
 #include "Zone/TerritoryMgr.h"
-#include "Zone/Zone.h"
+#include "Zone/InstanceContent.h"
 
 #include "Network/GameConnection.h"
 #include "Network/PacketWrappers/ServerNoticePacket.h"
@@ -54,19 +54,25 @@ void Core::Network::GameConnection::cfRegisterDuty( const Packets::GamePacket& i
 {
    auto pTeriMgr = g_fw.get< TerritoryMgr >();
    auto pExdData = g_fw.get< Data::ExdDataGenerated >();
-   // TODO use for loop for this
-   auto contentId1 = inPacket.getValAt< uint16_t >( 0x2E );
-   auto contentId2 = inPacket.getValAt< uint16_t >( 0x30 );
-   auto contentId3 = inPacket.getValAt< uint16_t >( 0x32 );
-   auto contentId4 = inPacket.getValAt< uint16_t >( 0x34 );
-   auto contentId5 = inPacket.getValAt< uint16_t >( 0x36 );
 
-   player.sendDebug( "Duty register request");
-   player.sendDebug( "ContentId1: " + std::to_string( contentId1 ) );
-   player.sendDebug( "ContentId2: " + std::to_string( contentId2 ) );
-   player.sendDebug( "ContentId3: " + std::to_string( contentId3 ) );
-   player.sendDebug( "ContentId4: " + std::to_string( contentId4 ) );
-   player.sendDebug( "ContentId5: " + std::to_string( contentId5 ) );
+   std::vector< uint16_t > selectedContent;
+
+   for( uint32_t offset = 0x2E; offset <= 0x36; offset += 0x2 )
+   {
+      auto id = inPacket.getValAt< uint16_t >( offset );
+      if( id == 0 )
+         break;
+
+      player.sendDebug( "got contentId: " + std::to_string( id ) );
+
+      selectedContent.push_back( id );
+   }
+
+   // todo: rand bias problem, will do for now tho
+   auto index = std::rand() % selectedContent.size();
+   auto contentId = selectedContent.at( index );
+
+   player.sendDebug( "Duty register request for contentid: " + std::to_string( contentId ) );
 
    // let's cancel it because otherwise you can't register it again
    ZoneChannelPacket< FFXIVIpcCFNotify > cfCancelPacket( player.getId() );
@@ -74,7 +80,7 @@ void Core::Network::GameConnection::cfRegisterDuty( const Packets::GamePacket& i
    cfCancelPacket.data().state2 = 1; // Your registration is withdrawn.
    queueOutPacket( cfCancelPacket );
 
-   auto cfCondition = pExdData->get< Core::Data::ContentFinderCondition >( contentId1 );
+   auto cfCondition = pExdData->get< Core::Data::ContentFinderCondition >( contentId );
    if( !cfCondition )
       return;
 
@@ -82,6 +88,9 @@ void Core::Network::GameConnection::cfRegisterDuty( const Packets::GamePacket& i
    if( !instance )
       return;
 
+   auto pInstance = instance->getAsInstanceContent();
+   pInstance->bindPlayer( player.getId() );
+
    player.sendDebug( "Created instance with id: " + std::to_string( instance->getGuId() ) );
 
    player.setInstance( instance );
@@ -90,6 +99,11 @@ void Core::Network::GameConnection::cfRegisterDuty( const Packets::GamePacket& i
 void Core::Network::GameConnection::cfRegisterRoulette( const Packets::GamePacket& inPacket,
                                                         Entity::Player& player)
 {
+   ZoneChannelPacket< FFXIVIpcCFNotify > cfCancelPacket( player.getId() );
+   cfCancelPacket.data().state1 = 3;
+   cfCancelPacket.data().state2 = 1; // Your registration is withdrawn.
+   queueOutPacket( cfCancelPacket );
+
    player.sendDebug( "Roulette register" );
 }
 
diff --git a/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp
index 32dfaba5..77ead826 100644
--- a/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp
@@ -170,7 +170,7 @@ void Core::Network::GameConnection::eventHandlerEnterTerritory( const Packets::G
 
    if( auto instance = player.getCurrentInstance() )
    {
-      player.eventStart( player.getId(), eventId, Event::EventHandler::EnterTerritory, 0, player.getZoneId(), instance->getDirectorId() & 0xFFFF );
+      player.eventStart( player.getId(), eventId, Event::EventHandler::EnterTerritory, 1, player.getZoneId() );
       instance->onEnterTerritory( player, eventId, param1, param2 );
    }
    else
diff --git a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
index afffb561..f1470ff9 100644
--- a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
@@ -15,6 +15,7 @@
 
 #include "Zone/TerritoryMgr.h"
 #include "Zone/Zone.h"
+#include "Zone/InstanceContent.h"
 #include "Zone/ZonePosition.h"
 
 #include "Network/GameConnection.h"
@@ -415,6 +416,17 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac
       {
          player.sendDebug( "Found instance: " + instance->getName() + ", id: " + std::to_string( param1 ) );
 
+         // if the zone is an instanceContent instance, make sure the player is actually bound to it
+         auto pInstance = instance->getAsInstanceContent();
+
+         // pInstance will be nullptr if you're accessing a normal zone via its allocated instance id rather than its zoneid
+         if( pInstance && !pInstance->isPlayerBound( player.getId() ) )
+         {
+            player.sendUrgent( "Not able to join instance: " + std::to_string( param1 ) );
+            player.sendUrgent( "Player not bound! ( run !instance bind <instanceId> first ) " + std::to_string( param1 ) );
+            break;
+         }
+
          player.setInstance( instance );
       }
       else if( !pTeriMgr->isValidTerritory( param1 )  )
@@ -429,9 +441,11 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac
             player.sendUrgent( "No zone instance found for " + std::to_string( param1 ) );
             break;
          }
+
          targetPlayer->setPos( targetPlayer->getPos() );
          targetPlayer->performZoning( param1, targetPlayer->getPos(), 0 );
-         player.sendNotice( targetPlayer->getName() + " was warped to zone " + std::to_string( param1 ) + " (" + pZone->getName() + ")" );
+         player.sendNotice( targetPlayer->getName() + " was warped to zone " +
+                            std::to_string( param1 ) + " (" + pZone->getName() + ")" );
       }
       break;
    }
diff --git a/src/servers/sapphire_zone/Network/Handlers/SkillHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/SkillHandler.cpp
index 4ae0ebfe..f3ed84d3 100644
--- a/src/servers/sapphire_zone/Network/Handlers/SkillHandler.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/SkillHandler.cpp
@@ -76,11 +76,20 @@ void Core::Network::GameConnection::skillHandler( const Packets::GamePacket& inP
         else
         {
             Core::Entity::ActorPtr targetActor = player.getAsPlayer();
+           
             if( targetId != player.getId() )
             {
                 targetActor = player.lookupTargetById( targetId );
             }
 
+            // Check if we actually have an actor
+            if( !targetActor )
+            {
+               // todo: interrupt a cast.
+               player.sendDebug( "Invalid target." );
+               return;
+            }
+
             if( !player.actionHasCastTime( action ) )
             {
                 pScriptMgr->onCastFinish( player, targetActor->getAsChara(), action );
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/DirectorPlayScenePacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/DirectorPlayScenePacket.h
index 05e2773e..8f097c38 100644
--- a/src/servers/sapphire_zone/Network/PacketWrappers/DirectorPlayScenePacket.h
+++ b/src/servers/sapphire_zone/Network/PacketWrappers/DirectorPlayScenePacket.h
@@ -44,6 +44,21 @@ private:
       m_data.param3 = param3;
       m_data.param4 = param4;
       m_data.param5 = param5;
+      m_data.unknown[0] = 0x05;
+      m_data.unknown[4] = 0x22;
+      m_data.unknown[5] = 0xD6;
+      m_data.unknown[6] = 0x62;
+      m_data.unknown[7] = 0x59;
+      m_data.unknown[0x14] = 0x08;
+      m_data.unknown[0x15] = 0x02;
+
+      // time remaining in sec
+      m_data.unknown[0x18] = 0x19;
+      m_data.unknown[0x19] = 0x14;
+
+      m_data.unknown[0x1C] = 0x23;
+      m_data.unknown[0x20] = 0x40;
+      m_data.unknown[0x24] = 0x80;
    };
 };
 
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/EventStartPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/EventStartPacket.h
index 5b5b282e..2058a593 100644
--- a/src/servers/sapphire_zone/Network/PacketWrappers/EventStartPacket.h
+++ b/src/servers/sapphire_zone/Network/PacketWrappers/EventStartPacket.h
@@ -20,11 +20,10 @@ public:
                      uint32_t eventId,
                      uint8_t param1 = 0,
                      uint8_t param2 = 0,
-                     uint32_t param3 = 0,
-                     uint32_t contentId = 0 ) :
+                     uint32_t param3 = 0 ) :
       ZoneChannelPacket< FFXIVIpcEventStart >( playerId, playerId )
    {
-      initialize( actorId, eventId, param1, param2, param3, contentId );
+      initialize( actorId, eventId, param1, param2, param3 );
    };
 
 private:
@@ -32,15 +31,13 @@ private:
                     uint32_t eventId,
                     uint8_t param1,
                     uint8_t param2,
-                    uint32_t param3,
-                    uint32_t contentId )
+                    uint32_t param3 )
    {
       m_data.actorId = actorId;
       m_data.eventId = eventId;
       m_data.param1 = param1;
       m_data.param2 = param2;
       m_data.param3 = param3;
-      m_data.contentId = contentId;
 
    };
 };
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/InitUIPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/InitUIPacket.h
index 8c4465c5..9017fee9 100644
--- a/src/servers/sapphire_zone/Network/PacketWrappers/InitUIPacket.h
+++ b/src/servers/sapphire_zone/Network/PacketWrappers/InitUIPacket.h
@@ -38,6 +38,7 @@ private:
       m_data.gender = player.getLookAt( Common::CharaLook::Gender );
       m_data.currentClass = static_cast< uint8_t >( player.getClass() );
       m_data.currentJob = static_cast< uint8_t >( player.getClass() );
+      m_data.currentLevel = player.getLevel();
       m_data.deity = static_cast< uint8_t >( player.getGuardianDeity() );
       m_data.namedayMonth = player.getBirthMonth();
       m_data.namedayDay = player.getBirthDay();
@@ -74,6 +75,17 @@ private:
       m_data.maxLevel = 0x46;
       m_data.expansion = 2;
 
+      // df stuff
+      // todo: actually do this properly
+      m_data.unknown70[4] = 1; // enable df
+
+      // enable all raids/guildhests/dungeons
+      memset( m_data.unlockedDungeons, 0xFF, sizeof( m_data.unlockedDungeons ) );
+      memset( m_data.unlockedGuildhests, 0xFF, sizeof( m_data.unlockedGuildhests ) );
+      memset( m_data.unlockedPvp, 0xFF, sizeof( m_data.unlockedPvp ) );
+      memset( m_data.unlockedRaids, 0xFF, sizeof( m_data.unlockedRaids ) );
+      memset( m_data.unlockedTrials, 0xFF, sizeof( m_data.unlockedTrials ) );
+
    };
 };
 
diff --git a/src/servers/sapphire_zone/Script/NativeScriptApi.h b/src/servers/sapphire_zone/Script/NativeScriptApi.h
index 43edd68e..9e7f9d36 100644
--- a/src/servers/sapphire_zone/Script/NativeScriptApi.h
+++ b/src/servers/sapphire_zone/Script/NativeScriptApi.h
@@ -118,7 +118,7 @@ public:
 
    virtual void onInit( InstanceContentPtr instance ) { }
    virtual void onUpdate( InstanceContentPtr instance, uint32_t currTime ) { }
-   virtual void onEnterTerritory( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 ) { }
+   virtual void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 ) { }
 };
 
 #endif
diff --git a/src/servers/sapphire_zone/Script/ScriptMgr.cpp b/src/servers/sapphire_zone/Script/ScriptMgr.cpp
index dabcaeb6..57d24893 100644
--- a/src/servers/sapphire_zone/Script/ScriptMgr.cpp
+++ b/src/servers/sapphire_zone/Script/ScriptMgr.cpp
@@ -375,7 +375,7 @@ bool Core::Scripting::ScriptMgr::onInstanceEnterTerritory( InstanceContentPtr in
    auto script = m_nativeScriptMgr->getScript< InstanceContentScript >( instance->getDirectorId() );
    if( script )
    {
-      script->onEnterTerritory( player, eventId, param1, param2 );
+      script->onEnterTerritory( instance, player, eventId, param1, param2 );
       return true;
    }
 
diff --git a/src/servers/sapphire_zone/Zone/Cell.cpp b/src/servers/sapphire_zone/Zone/Cell.cpp
index 6259da07..899fdc4c 100644
--- a/src/servers/sapphire_zone/Zone/Cell.cpp
+++ b/src/servers/sapphire_zone/Zone/Cell.cpp
@@ -3,6 +3,10 @@
 #include "Actor/Chara.h"
 #include "Forwards.h"
 #include "Zone.h"
+#include <Logging/Logger.h>
+
+#include "Framework.h"
+extern Core::Framework g_fw;
 
 // TODO: the entire zone / areahandling is a bit outdated ( in parts i used this for the 1.0 iteration )
 // likely this could be greatly improved or redone
@@ -32,6 +36,8 @@ void Core::Cell::init( uint32_t x, uint32_t y, ZonePtr pZone )
 
 void Core::Cell::addActor( Entity::ActorPtr pAct )
 {
+   auto pLog = g_fw.get< Core::Logger >();
+   pLog->debug( "Adding actor to cell in " + this->m_pZone->getName() );
    if( pAct->isPlayer() )
       ++m_playerCount;
 
@@ -40,6 +46,8 @@ void Core::Cell::addActor( Entity::ActorPtr pAct )
 
 void Core::Cell::removeActor( Entity::ActorPtr pAct )
 {
+   auto pLog = g_fw.get< Core::Logger >();
+   pLog->debug( "Removing actor from cell in " + this->m_pZone->getName() );
    if( pAct->isPlayer() )
       --m_playerCount;
 
diff --git a/src/servers/sapphire_zone/Zone/InstanceContent.cpp b/src/servers/sapphire_zone/Zone/InstanceContent.cpp
index aaac6a62..69cd5c20 100644
--- a/src/servers/sapphire_zone/Zone/InstanceContent.cpp
+++ b/src/servers/sapphire_zone/Zone/InstanceContent.cpp
@@ -6,6 +6,7 @@
 #include <Exd/ExdDataGenerated.h>
 
 #include "Event/Director.h"
+#include "Event/EventDefs.h"
 #include "Script/ScriptMgr.h"
 
 #include "Actor/Player.h"
@@ -26,18 +27,19 @@ using namespace Core::Common;
 using namespace Core::Network::Packets;
 using namespace Core::Network::Packets::Server;
 
-Core::InstanceContent::InstanceContent( boost::shared_ptr< Core::Data::InstanceContent > pInstanceContent,
+Core::InstanceContent::InstanceContent( boost::shared_ptr< Core::Data::InstanceContent > pInstanceConfiguration,
                                         uint32_t guId,
                                         const std::string& internalName,
                                         const std::string& contentName,
                                         uint32_t instanceContentId )
-   : Zone( static_cast< uint16_t >( pInstanceContent->territoryType ), guId, internalName, contentName ),
+   : Zone( static_cast< uint16_t >( pInstanceConfiguration->territoryType ), guId, internalName, contentName ),
      Director( Event::Director::InstanceContent, instanceContentId ),
-     m_instanceContentInfo( pInstanceContent ),
+     m_instanceConfiguration( pInstanceConfiguration ),
      m_instanceContentId( instanceContentId ),
      m_state( Created ),
      m_pEntranceEObj( nullptr ),
-     m_instanceCommenceTime( 0 )
+     m_instanceCommenceTime( 0 ),
+     m_currentBgm( pInstanceConfiguration->bGM )
 {
 
 }
@@ -61,15 +63,15 @@ uint32_t Core::InstanceContent::getInstanceContentId() const
    return m_instanceContentId;
 }
 
-Core::Data::ExdDataGenerated::InstanceContentPtr Core::InstanceContent::getInstanceContentInfo() const
+Core::Data::ExdDataGenerated::InstanceContentPtr Core::InstanceContent::getInstanceConfiguration() const
 {
-   return m_instanceContentInfo;
+   return m_instanceConfiguration;
 }
 
 void Core::InstanceContent::onPlayerZoneIn( Entity::Player& player )
 {
    auto pLog = g_fw.get< Logger >();
-   pLog->debug( "InstanceContent::onEnterTerritory: Zone#" + std::to_string( getGuId() ) + "|"
+   pLog->debug( "InstanceContent::onPlayerZoneIn: Zone#" + std::to_string( getGuId() ) + "|"
                                                            + std::to_string( getInstanceContentId() ) +
                                                            + ", Entity#" + std::to_string( player.getId() ) );
 
@@ -98,21 +100,24 @@ void Core::InstanceContent::onLeaveTerritory( Entity::Player& player )
 
 void Core::InstanceContent::onUpdate( uint32_t currTime )
 {
-
    switch( m_state )
    {
       case Created:
       {
-         // temporary handling for instance state progression
-         if( m_playerMap.size() < 1 )
+         if( m_boundPlayerIds.size() == 0 )
             return;
 
-         for( const auto& playerIt : m_playerMap )
+         for( auto playerId : m_boundPlayerIds )
          {
-            if( !playerIt.second->isLoadingComplete() ||
-                !playerIt.second->isDirectorInitialized() ||
-                !playerIt.second->isOnEnterEventDone() ||
-                playerIt.second->hasStateFlag( PlayerStateFlag::WatchingCutscene ) )
+            auto it = m_playerMap.find( playerId );
+            if( it == m_playerMap.end() )
+               return;
+
+            auto player = it->second;
+            if( !player->isLoadingComplete() ||
+                !player->isDirectorInitialized() ||
+                !player->isOnEnterEventDone() ||
+                player->hasStateFlag( PlayerStateFlag::WatchingCutscene ) )
                return;
          }
 
@@ -129,13 +134,13 @@ void Core::InstanceContent::onUpdate( uint32_t currTime )
             auto pPlayer = playerIt.second;
             pPlayer->queuePacket(
                     ActorControlPacket143( pPlayer->getId(), DirectorUpdate,
-                                           getDirectorId(), 0x40000001, m_instanceContentInfo->timeLimitmin * 60u ) );
+                                           getDirectorId(), 0x40000001, m_instanceConfiguration->timeLimitmin * 60u ) );
          }
 
          if( m_pEntranceEObj )
             m_pEntranceEObj->setState( 7 );
          m_state = DutyInProgress;
-         m_instanceExpireTime = Util::getTimeSeconds() + ( m_instanceContentInfo->timeLimitmin * 60u );
+         m_instanceExpireTime = Util::getTimeSeconds() + ( m_instanceConfiguration->timeLimitmin * 60u );
          break;
       }
 
@@ -152,9 +157,9 @@ void Core::InstanceContent::onUpdate( uint32_t currTime )
       case DutyFinished:
          break;
    }
+
    auto pScriptMgr = g_fw.get< Scripting::ScriptMgr >();
    pScriptMgr->onInstanceUpdate( getAsInstanceContent(), currTime );
-
 }
 
 void Core::InstanceContent::onFinishLoading( Entity::Player& player )
@@ -271,6 +276,34 @@ void Core::InstanceContent::setBranch( uint8_t value )
    }
 }
 
+void Core::InstanceContent::startQte()
+{
+   for( const auto& playerIt : m_playerMap )
+   {
+      auto player = playerIt.second;
+      player->queuePacket( ActorControlPacket143( player->getId(), DirectorUpdate, getDirectorId(), 0x8000000A ) );
+   }
+}
+
+void Core::InstanceContent::startEventCutscene()
+{
+   // TODO: lock player movement
+   for( const auto& playerIt : m_playerMap )
+   {
+      auto player = playerIt.second;
+      player->queuePacket( ActorControlPacket143( player->getId(), DirectorUpdate, getDirectorId(), 0x80000008 ) );
+   }
+}
+
+void Core::InstanceContent::endEventCutscene()
+{
+   for( const auto& playerIt : m_playerMap )
+   {
+      auto player = playerIt.second;
+      player->queuePacket( ActorControlPacket143( player->getId(), DirectorUpdate, getDirectorId(), 0x80000009 ) );
+   }
+}
+
 void Core::InstanceContent::onRegisterEObj( Entity::EventObjectPtr object )
 {
    if( object->getName() != "none" )
@@ -290,11 +323,25 @@ void Core::InstanceContent::onRegisterEObj( Entity::EventObjectPtr object )
                                      std::to_string( object->getObjectId() ) );
 }
 
+bool Core::InstanceContent::hasPlayerPreviouslySpawned( Entity::Player &player ) const
+{
+   auto it = m_spawnedPlayers.find( player.getId() );
+   return it != m_spawnedPlayers.end();
+}
+
+Core::InstanceContent::InstanceContentState Core::InstanceContent::getState() const
+{
+   return m_state;
+}
+
 void Core::InstanceContent::onBeforePlayerZoneIn( Core::Entity::Player& player )
 {
+   // remove any players from the instance who aren't bound on zone in
+   if( !isPlayerBound( player.getId() ) )
+      player.exitInstance();
+
    // if a player has already spawned once inside this instance, don't move them if they happen to zone in again
-   auto it = m_spawnedPlayers.find( player.getId() );
-   if( it == m_spawnedPlayers.end() )
+   if( !hasPlayerPreviouslySpawned( player ) )
    {
       if( m_pEntranceEObj != nullptr )
       {
@@ -306,11 +353,9 @@ void Core::InstanceContent::onBeforePlayerZoneIn( Core::Entity::Player& player )
          player.setRot( PI );
          player.setPos( { 0.f, 0.f, 0.f } );
       }
-
-      m_spawnedPlayers.insert( player.getId() );
    }
 
-   player.resetObjSpawnIndex( );
+   player.resetObjSpawnIndex();
 }
 
 Core::Entity::EventObjectPtr Core::InstanceContent::getEObjByName( const std::string& name )
@@ -341,4 +386,67 @@ void Core::InstanceContent::onEnterTerritory( Entity::Player& player, uint32_t e
 {
    auto pScriptMgr = g_fw.get< Scripting::ScriptMgr >();
    pScriptMgr->onInstanceEnterTerritory( getAsInstanceContent(), player, eventId, param1, param2 );
+
+   if( !hasPlayerPreviouslySpawned( player ) )
+   {
+      m_spawnedPlayers.insert( player.getId() );
+      player.directorPlayScene( getDirectorId(), 1, NO_DEFAULT_CAMERA | CONDITION_CUTSCENE | SILENT_ENTER_TERRI_ENV |
+                                                    HIDE_HOTBAR | SILENT_ENTER_TERRI_BGM | SILENT_ENTER_TERRI_SE |
+                                                    DISABLE_STEALTH | 0x00100000 | LOCK_HUD | LOCK_HOTBAR | // todo: wtf is 0x00100000
+                                                    DISABLE_CANCEL_EMOTE, 0, 0x9, getCurrentBGM() );
+   }
+   else
+      player.directorPlayScene( getDirectorId(), 2, NO_DEFAULT_CAMERA | HIDE_HOTBAR, 0, 0x9, getCurrentBGM() );
+}
+
+void Core::InstanceContent::setCurrentBGM( uint16_t bgmIndex )
+{
+   m_currentBgm = bgmIndex;
+
+   for( const auto& playerIt : m_playerMap )
+   {
+      auto player = playerIt.second;
+      // note: retail do send a BGM_MUTE(1) first before any BGM transition, but YOLO in this case.
+      // also do note that this code can't control the bgm granularly. (i.e. per player for WoD submap.) oops.
+      // player->queuePacket( ActorControlPacket143( player->getId(), DirectorUpdate, getDirectorId(), 0x80000001, 1 ) );
+      player->queuePacket( ActorControlPacket143( player->getId(), DirectorUpdate, getDirectorId(), 0x80000001, bgmIndex ) );
+   }
+}
+
+void Core::InstanceContent::setPlayerBGM( Core::Entity::Player& player, uint16_t bgmId )
+{
+   player.queuePacket( ActorControlPacket143( player.getId(), DirectorUpdate, getDirectorId(), 0x80000001, bgmId ) );
+}
+
+uint16_t Core::InstanceContent::getCurrentBGM() const
+{
+   return m_currentBgm;
+}
+
+bool Core::InstanceContent::bindPlayer( uint32_t playerId )
+{
+   // if player already bound, return false
+   if( m_boundPlayerIds.count( playerId ) )
+      return false;
+
+   // TODO: do not allow binding of players if instance already has all it can take
+   // if( m_boundPlayerIds.size() >= party resttrictions )
+   //    return false;
+
+   m_boundPlayerIds.insert( playerId );
+   return true;
+}
+
+bool Core::InstanceContent::isPlayerBound( uint32_t playerId ) const
+{
+   return m_boundPlayerIds.count( playerId ) > 0;
+}
+
+void Core::InstanceContent::unbindPlayer( uint32_t playerId )
+{
+   m_boundPlayerIds.erase( playerId );
+
+   auto it = m_playerMap.find( playerId );
+   if( it != m_playerMap.end() )
+      it->second->exitInstance();
 }
diff --git a/src/servers/sapphire_zone/Zone/InstanceContent.h b/src/servers/sapphire_zone/Zone/InstanceContent.h
index 0dad9d5c..a4d0e4be 100644
--- a/src/servers/sapphire_zone/Zone/InstanceContent.h
+++ b/src/servers/sapphire_zone/Zone/InstanceContent.h
@@ -22,7 +22,7 @@ public:
       DutyFinished
    };
 
-   InstanceContent( boost::shared_ptr< Core::Data::InstanceContent > pInstanceContent,
+   InstanceContent( boost::shared_ptr< Core::Data::InstanceContent > pInstanceConfiguration,
                     uint32_t guId,
                     const std::string& internalName,
                     const std::string& contentName,
@@ -46,19 +46,43 @@ public:
    void setSequence( uint8_t value );
    void setBranch( uint8_t value );
 
-   boost::shared_ptr< Core::Data::InstanceContent > getInstanceContentInfo() const;
+   void startQte();
+   void startEventCutscene();
+   void endEventCutscene();
+
+   /*! set the current bgm index (inside bgm.exd) */
+   void setCurrentBGM( uint16_t bgmId );
+   /*! set the current bgm for a specific player */
+   void setPlayerBGM( Entity::Player& player, uint16_t bgmId );
+   /*! get the currently playing bgm index */
+   uint16_t getCurrentBGM() const;
+
+   bool hasPlayerPreviouslySpawned( Entity::Player& player ) const;
+   InstanceContentState getState() const;
+
+   boost::shared_ptr< Core::Data::InstanceContent > getInstanceConfiguration() const;
 
    uint32_t getInstanceContentId() const;
 
    Entity::EventObjectPtr getEObjByName( const std::string& name );
 
+   /*! binds a player to the instance */
+   bool bindPlayer( uint32_t playerId );
+
+   /*! removes bind of player from the instance */
+   void unbindPlayer( uint32_t playerId );
+
+   /*! return true if the player is bound to the instance */
+   bool isPlayerBound( uint32_t playerId ) const;
+
    /*! number of milliseconds after all players are ready for the instance to commence (spawn circle removed) */
    const uint32_t instanceStartDelay = 1250;
+
 private:
-   Event::DirectorPtr m_pDirector;
-   boost::shared_ptr< Core::Data::InstanceContent > m_instanceContentInfo;
+   boost::shared_ptr< Core::Data::InstanceContent > m_instanceConfiguration;
    uint32_t m_instanceContentId;
    InstanceContentState m_state;
+   uint16_t m_currentBgm;
 
    int64_t m_instanceExpireTime;
    int64_t m_instanceCommenceTime;
@@ -68,6 +92,9 @@ private:
    std::map< std::string, Entity::EventObjectPtr > m_eventObjectMap;
    std::unordered_map< uint32_t, Entity::EventObjectPtr > m_eventIdToObjectMap;
    std::set< uint32_t > m_spawnedPlayers;
+
+   // the players which are bound to the instance, regardless of inside or offline
+   std::set< uint32_t > m_boundPlayerIds;
 };
 
 }
diff --git a/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp b/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp
index f9e87ce7..500f2d93 100644
--- a/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp
+++ b/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp
@@ -70,15 +70,18 @@ bool Core::TerritoryMgr::isInstanceContentTerritory( uint32_t territoryTypeId )
    if( !pTeri )
       return false;
 
-   return pTeri->territoryIntendedUse == TerritoryIntendedUse::AllianceRaid ||
-          pTeri->territoryIntendedUse == TerritoryIntendedUse::BeforeTrialDung ||
-          pTeri->territoryIntendedUse == TerritoryIntendedUse::Trial ||
-          pTeri->territoryIntendedUse == TerritoryIntendedUse::Dungeon ||
-          pTeri->territoryIntendedUse == TerritoryIntendedUse::OpenWorldInstanceBattle ||
-          pTeri->territoryIntendedUse == TerritoryIntendedUse::PalaceOfTheDead ||
-          pTeri->territoryIntendedUse == TerritoryIntendedUse::RaidFights ||
-          pTeri->territoryIntendedUse == TerritoryIntendedUse::Raids ||
-          pTeri->territoryIntendedUse == TerritoryIntendedUse::TreasureMapInstance;
+   auto intendedUse = pTeri->territoryIntendedUse;
+
+   return intendedUse == TerritoryIntendedUse::AllianceRaid ||
+          intendedUse == TerritoryIntendedUse::BeforeTrialDung ||
+          intendedUse == TerritoryIntendedUse::Trial ||
+          intendedUse == TerritoryIntendedUse::Dungeon ||
+          intendedUse == TerritoryIntendedUse::OpenWorldInstanceBattle ||
+          intendedUse == TerritoryIntendedUse::PalaceOfTheDead ||
+          intendedUse == TerritoryIntendedUse::RaidFights ||
+          intendedUse == TerritoryIntendedUse::Raids ||
+          intendedUse == TerritoryIntendedUse::TreasureMapInstance ||
+          intendedUse == TerritoryIntendedUse::EventTrial;
 }
 
 bool Core::TerritoryMgr::isPrivateTerritory( uint32_t territoryTypeId ) const
@@ -311,6 +314,7 @@ Core::TerritoryMgr::InstanceIdList Core::TerritoryMgr::getInstanceContentIdList(
 bool Core::TerritoryMgr::movePlayer( uint32_t territoryId, Core::Entity::PlayerPtr pPlayer )
 {
    auto pZone = getZoneByTerriId( territoryId );
+   assert( pZone );
    return movePlayer( pZone, pPlayer );
 }
 
@@ -330,8 +334,8 @@ bool Core::TerritoryMgr::movePlayer( ZonePtr pZone, Core::Entity::PlayerPtr pPla
    // mark character as zoning in progress
    pPlayer->setLoadingComplete( false );
 
-   if( pPlayer->getLastPing() != 0 )
-      pPlayer->getCurrentZone()->removeActor( pPlayer );
+   //if( pPlayer->getLastPing() != 0 )
+   //   pPlayer->getCurrentZone()->removeActor( pPlayer );
 
    pPlayer->setCurrentZone( pZone );
    pZone->pushActor( pPlayer );
diff --git a/src/servers/sapphire_zone/Zone/TerritoryMgr.h b/src/servers/sapphire_zone/Zone/TerritoryMgr.h
index 7ed16f85..c6bcf796 100644
--- a/src/servers/sapphire_zone/Zone/TerritoryMgr.h
+++ b/src/servers/sapphire_zone/Zone/TerritoryMgr.h
@@ -53,7 +53,10 @@ namespace Core
          FreeCompanyGarrison = 30,
          PalaceOfTheDead = 31,
          TreasureMapInstance = 33,
-         EventArea = 40,
+         EventTrial = 36,
+         TheFeastArea = 37,
+         PrivateEventArea = 40,
+         //Eureka = 41, // wat
       };
 
       TerritoryMgr();
diff --git a/src/servers/sapphire_zone/Zone/Zone.cpp b/src/servers/sapphire_zone/Zone/Zone.cpp
index 85c8db59..ba5d5869 100644
--- a/src/servers/sapphire_zone/Zone/Zone.cpp
+++ b/src/servers/sapphire_zone/Zone/Zone.cpp
@@ -225,20 +225,21 @@ void Core::Zone::pushActor( Entity::ActorPtr pActor )
 
 void Core::Zone::removeActor( Entity::ActorPtr pActor )
 {
+   float mx = pActor->getPos().x;
+   float my = pActor->getPos().z;
+   uint32_t cx = getPosX( mx );
+   uint32_t cy = getPosY( my );
 
-   auto pCell = pActor->getCellPtr();
-   if( pCell )
-   {
+   Cell* pCell = getCellPtr(cx, cy);
+   if( pCell && pCell->hasActor( pActor ) )
       pCell->removeActor( pActor );
-      pCell = nullptr;
-   }
 
    if( pActor->isPlayer() )
    {
 
       // If it's a player and he's inside boundaries - update his nearby cells
       if( pActor->getPos().x <= _maxX && pActor->getPos().x >= _minX &&
-              pActor->getPos().z <= _maxY && pActor->getPos().z >= _minY )
+          pActor->getPos().z <= _maxY && pActor->getPos().z >= _minY )
       {
          uint32_t x = getPosX( pActor->getPos().x );
          uint32_t y = getPosY( pActor->getPos().z );
@@ -416,8 +417,7 @@ void Core::Zone::updateSessions( bool changedWeather )
       // this session is not linked to this area anymore, remove it from zone session list
       if( ( !pPlayer->getCurrentZone() ) || ( pPlayer->getCurrentZone() != shared_from_this() ) )
       {
-         if( pPlayer->getCellPtr() )
-            removeActor( pSession->getPlayer() );
+         removeActor( pSession->getPlayer() );
 
          it = m_sessionSet.erase(it );
          continue;
@@ -539,7 +539,11 @@ void Core::Zone::updateActorPosition( Entity::Actor &actor )
    {
 
       if( pOldCell )
+      {
+         auto pLog = g_fw.get< Logger >();
+         pLog->debug( std::string( __FUNCTION__ ) + " -> removeActor() ...moving cell..." );
          pOldCell->removeActor( actor.shared_from_this() );
+      }
 
       pCell->addActor( actor.shared_from_this() );
       actor.setCell( pCell );
diff --git a/src/tools/event_object_parser/instance.tmpl b/src/tools/event_object_parser/instance.tmpl
index f01a62da..d86b4ac5 100644
--- a/src/tools/event_object_parser/instance.tmpl
+++ b/src/tools/event_object_parser/instance.tmpl
@@ -17,7 +17,7 @@ public:
 
    }
 
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( InstanceContentPtr instance, Core::Entity::Player& player, Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
    {
 
    }