#define EXPECTED_REALMD_CLIENT_BUILD    \
{                    \
      11159,  /* 3.3.0a and higher */     \
      8606,   /* 2.4.3  */                \
      6005,   /* 1.12.2 */                \
      5875,   /* 1.12.1 */                \
      0                    \
}

diff --git a/Map.cpp b/Map.cpp
index dd24b93..11b649c 100644
--- a/Map.cpp
+++ b/Map.cpp
@@ -907,11 +907,38 @@ Map::CreatureRelocation(Creature *creature, float x, float y, float z, float ang
            #endif
            AddCreatureToMoveList(creature,x,y,z,ang);
            // in diffcell/diffgrid case notifiers called at finishing move creature in Map::MoveAllCreaturesInMoveList
+        // test hack
+        if (creature->isCharmed())
+        {
+            NGridType* oldGrid = getNGrid(old_cell.GridX(), old_cell.GridY());
+            RemoveFromGrid(creature->GetCharmerOrOwnerPlayerOrPlayerItself(), oldGrid,old_cell);
+            if( !old_cell.DiffGrid(new_cell) )
+                AddToGrid(creature->GetCharmerOrOwnerPlayerOrPlayerItself(), oldGrid,new_cell);
+            else
+                EnsureGridLoadedAtEnter(new_cell, creature->GetCharmerOrOwnerPlayerOrPlayerItself());
+        }
        }
        else
        {
            creature->Relocate(x, y, z, ang);
            CreatureRelocationNotify(creature,new_cell,new_val);
+        // begin temp test hack
+        if (creature->isCharmed())
+        {
+            UpdatePlayerVisibility(creature->GetCharmerOrOwnerPlayerOrPlayerItself(),new_cell,new_val)  ;
+            UpdateObjectsVisibilityFor(creature->GetCharmerOrOwnerPlayerOrPlayerItself(),new_cell,new_val);
+            PlayerRelocationNotify(creature->GetCharmerOrOwnerPlayerOrPlayerItself(),new_cell,new_val);
+            // test hack part 2
+            bool same_cell = (new_cell == old_cell);
+            NGridType* newGrid = getNGrid(new_cell.GridX(), new_cell.GridY());
+               
+            if( !same_cell && newGrid->GetGridState()!= GRID_STATE_ACTIVE )
+            {
+                ResetGridExpiry(*newGrid, 0.1f);
+                newGrid->SetGridState(GRID_STATE_ACTIVE);
+            }
+        }
+        // end temp test hack
        }
        assert(CheckGridIntegrity(creature,true));
    }
diff --git a/Object.cpp b/Object.cpp
index 67bb63a..b69bd16 100644
--- a/Object.cpp
+++ b/Object.cpp
@@ -1432,7 +1432,11 @@ void WorldObject::MonsterTextEmote(const char* text, uint64 TargetGuid, bool IsB
    {
        WorldPacket data(SMSG_MESSAGECHAT, 200);
        BuildMonsterChat(&data,IsBossEmote ? CHAT_MSG_RAID_BOSS_EMOTE : CHAT_MSG_MONSTER_EMOTE,text,LANG_UNIVERSAL,GetName(),TargetGuid);
-    SendMessageToSetInRange(&data,sWorld.getConfig(IsBossEmote ? CONFIG_LISTEN_RANGE_YELL : CONFIG_LISTEN_RANGE_TEXTEMOTE),true);
+    Unit * eye = Unit::GetUnit((*this), TargetGuid);
+    if (eye && eye->isCharmed() && eye->GetEntry() == 28511)
+        SendMessageToSet(&data, true);
+    else
+        SendMessageToSetInRange(&data,sWorld.getConfig(IsBossEmote ? CONFIG_LISTEN_RANGE_YELL : CONFIG_LISTEN_RANGE_TEXTEMOTE),true);
    }
       
    void WorldObject::MonsterWhisper(const char* text, uint64 receiver, bool IsBossWhisper)
diff --git a/SpellEffects.cpp b/SpellEffects.cpp
index 4429072..52598ac 100644
--- a/SpellEffects.cpp
+++ b/SpellEffects.cpp
@@ -1231,6 +1231,47 @@ void Spell::EffectDummy(uint32 i)
                        return;
       
                    }
+                case 51858:                    // Siphon of Acherus - Complete Quest
+                {
+                    if (!unitTarget || !unitTarget->isAlive())
+                        return;
+
+                    Player * player = m_caster->GetCharmerOrOwnerPlayerOrPlayerItself();
+
+                    switch(unitTarget->GetEntry())
+                    {
+                        case 28525:                    // Forge of New Avalon
+                            if (player)
+                            {
+                    player->KilledMonsterCredit(28525, unitTarget->GetGUID());
+                    ((Creature*)unitTarget)->ForcedDespawn();
+                            }
+                            break;         
+                        case 28543:                    // New Avalon Town Hall
+                            if (player)
+                            {
+                    player->KilledMonsterCredit(28543, unitTarget->GetGUID());
+                    ((Creature*)unitTarget)->ForcedDespawn();
+                            }                        
+                            break;         
+                        case 28542:                    // Scarlet Hold
+                            if (player)
+                            {
+                    player->KilledMonsterCredit(28542, unitTarget->GetGUID());
+                    ((Creature*)unitTarget)->ForcedDespawn();
+                            }                       
+                            break;         
+                        case 28544:                    // Chapel of the Crimson Flame
+                            if (player)
+                            {
+                    player->KilledMonsterCredit(28544, unitTarget->GetGUID());
+                    ((Creature*)unitTarget)->ForcedDespawn();
+                            }                        
+                            break;         
+                        default:
+                          return;
+                    }
+                }
                    case 52308:                    // Take Sputum Sample
                    {
                        switch(i)
@@ -3300,8 +3341,6 @@ void Spell::EffectSummonType(uint32 i)
        switch(m_spellInfo->EffectMiscValueB[i])
        {
            case SUMMON_TYPE_GUARDIAN:
-        case SUMMON_TYPE_POSESSED:
-        case SUMMON_TYPE_POSESSED2:
            case SUMMON_TYPE_FORCE_OF_NATURE:
            case SUMMON_TYPE_GUARDIAN2:
            case SUMMON_TYPE_GUARDIAN3:
@@ -3311,6 +3350,10 @@ void Spell::EffectSummonType(uint32 i)
                else
                    EffectSummonGuardian(i);
                break;
+        case SUMMON_TYPE_POSESSED:
+        case SUMMON_TYPE_POSESSED2:
+            EffectSummonPosessed(i);
+            break;
            case SUMMON_TYPE_WILD:
            case SUMMON_TYPE_QUEST_WILD:
            case SUMMON_TYPE_CREATURE:
@@ -3751,6 +3794,70 @@ void Spell::EffectSummonWild(uint32 i)
        }
    }
       
+void Spell::EffectSummonPosessed(uint32 i)
+{
+    uint32 creature_entry = m_spellInfo->EffectMiscValue[i];
+    if(!creature_entry)
+        return;
+
+    // set timer for unsummon
+    int32 duration = GetSpellDuration(m_spellInfo);
+
+    // in another case summon new
+    uint32 level = m_caster->getLevel();
+
+    float px, py, pz;
+    // If dest location if present
+    if (m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION)
+    {
+        // Summon 1 unit in dest location
+        px = m_targets.m_destX;
+        py = m_targets.m_destY;
+        pz = m_targets.m_destZ;
+    }
+    // Summon if dest location not present near caster
+    else
+        m_caster->GetClosePoint(px,py,pz,1.0f);
+
+    TempSummonType summonType = (duration == 0) ? TEMPSUMMON_DEAD_DESPAWN : TEMPSUMMON_TIMED_OR_DEAD_DESPAWN;
+
+    Creature *spawnCreature = m_caster->SummonCreature(creature_entry,px,py,pz,m_caster->GetOrientation(),summonType,duration);
+    //spawnCreature->Relocate(px,py,pz,m_caster->GetOrientation());
+
+    if(!spawnCreature->IsPositionValid())
+    {
+        sLog.outError("Pet (guidlow %d, entry %d) not created base at creature. Suggested coordinates isn't valid (X: %f Y: %f)",
+        spawnCreature->GetGUIDLow(), spawnCreature->GetEntry(), spawnCreature->GetPositionX(), spawnCreature->GetPositionY());
+        delete spawnCreature;
+        return;
+    }
+
+    spawnCreature->SetCharmerGUID(m_caster->GetGUID());
+    spawnCreature->SetCreatorGUID(m_caster->GetGUID());
+
+    if(m_caster->GetTypeId()==TYPEID_PLAYER)
+    {
+        ((Player*)m_caster)->SetCharm(spawnCreature);
+        ((Player*)m_caster)->SetFarSightGUID(spawnCreature->GetGUID());
+        ((Player*)m_caster)->SetClientControl(spawnCreature, 1);
+        ((Player*)m_caster)->SetMover(spawnCreature);
+    }
+
+    spawnCreature->SetUInt32Value(UNIT_FIELD_FACTIONTEMPLATE,m_caster->getFaction());
+    spawnCreature->SetUInt32Value(UNIT_FIELD_FLAGS,16777224);
+    spawnCreature->SetUInt32Value(UNIT_FIELD_FLAGS_2,162048);
+    spawnCreature->SetUInt32Value(UNIT_FIELD_BYTES_2,1);
+    spawnCreature->SetUInt32Value(UNIT_CREATED_BY_SPELL, m_spellInfo->Id);
+
+    //spawnCreature->AIM_Initialize();
+
+    if(CharmInfo *charmInfo = spawnCreature->InitCharmInfo(spawnCreature))
+        charmInfo->InitPossessCreateSpells();
+
+    if(m_caster->GetTypeId()==TYPEID_PLAYER)
+        ((Player*)m_caster)->PossessSpellInitialize();
+}
+
    void Spell::EffectSummonGuardian(uint32 i)
    {
        uint32 pet_entry = m_spellInfo->EffectMiscValue[i];
@@ -5098,6 +5205,37 @@ void Spell::EffectScriptEffect(uint32 effIndex)
                        unitTarget->CastSpell(unitTarget, damage, false);
                        break;
                    }
+                case 52694:                    // Recall Eye of Acherus
+                {
+                    if(!m_caster || m_caster->GetTypeId() != TYPEID_UNIT)
+                        return;
+                       
+                    Unit *target = m_caster->GetCharmer();
+                       
+                    if(!target || target->GetTypeId() != TYPEID_PLAYER)
+                        return;
+
+                    m_caster->SetCharmerGUID(0);                            
+                    target->RemoveAurasDueToSpell(51852);       // Remove The Eye of Acherus
+                    target->SetSpeed(MOVE_WALK,1.0f,true);
+                    target->SetSpeed(MOVE_FLIGHT,1.0f,true);
+                       
+                    target->SetCharm(NULL);
+
+                    ((Player*)target)->SetFarSightGUID(0);
+                    ((Player*)target)->SetClientControl(m_caster,0);
+                    ((Player*)target)->SetMover(NULL);
+
+                    WorldPacket data(SMSG_PET_SPELLS, 8+4);
+                    data << uint64(0);
+                    data << uint32(0);
+                    ((Player*)target)->GetSession()->SendPacket(&data);
+
+                    m_caster->CleanupsBeforeDelete();
+                    m_caster->AddObjectToRemoveList();
+
+                    return;
+                }
                    // Winged Steed of the Ebon Blade
                    case 54729:
                    {
diff --git a/SpellMgr.cpp b/SpellMgr.cpp
index bd67ab9..66f53e0 100644
--- a/SpellMgr.cpp
+++ b/SpellMgr.cpp
@@ -1355,6 +1355,16 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2) cons
                            (spellInfo_2->Id == 8326 && spellInfo_1->Id == 20584) )
                             return false;
       
+                    // Eye of Acherus
+                    if( (spellInfo_1->Id == 51890 && spellInfo_2->Id == 51852) ||
+                        (spellInfo_2->Id == 51852 && spellInfo_1->Id == 51890) )
+                        return false;
+
+     // Eye of Acherus 1
+                    if( (spellInfo_1->Id == 51890 && spellInfo_2->Id == 51923) ||
+                        (spellInfo_2->Id == 51923 && spellInfo_1->Id == 51890) )
+                        return false;
+
                        break;
                    }
                    case SPELLFAMILY_MAGE:

UPDATE `creature_template` SET `modelid_A`='16925', `modelid_H`='16925', `scale`='2.5', `unit_flags`='33554432' WHERE `entry`='28525';
UPDATE `creature_template_addon` SET `auras`='64328 0' WHERE `entry`='28525';

UPDATE `creature_template` SET `modelid_A`='16925', `modelid_H`='16925', `scale`='2.5', `unit_flags`='33554432' WHERE `entry`='28542';
UPDATE `creature_template_addon` SET `auras`='64328 0' WHERE `entry`='28542';

UPDATE `creature_template` SET `modelid_A`='16925', `modelid_H`='16925', `scale`='2.5', `unit_flags`='33554432' WHERE `entry`='28543';
UPDATE `creature_template_addon` SET `auras`='64328 0' WHERE `entry`='28543';

UPDATE `creature_template` SET `modelid_A`='16925', `modelid_H`='16925', `scale`='2.5', `unit_flags`='33554432' WHERE `entry`='28544';
UPDATE `creature_template_addon` SET `auras`='64328 0' WHERE `entry`='28544';

UPDATE `creature` SET `PhaseMask`='2' WHERE `entry` IN (28525,28542,28543,28544);

INSERT INTO `spell_script_target` VALUES (51858, 1, 28525);
INSERT INTO `spell_script_target` VALUES (51858, 1, 28542);
INSERT INTO `spell_script_target` VALUES (51858, 1, 28543);
INSERT INTO `spell_script_target` VALUES (51858, 1, 28544);