diff --git a/contrib/vmap_extract_assembler_bin/vmapextract_v2.exe b/contrib/vmap_extract_assembler_bin/vmapextract_v2.exe
index a1e982f0c..213705f6c 100644
Binary files a/contrib/vmap_extract_assembler_bin/vmapextract_v2.exe and b/contrib/vmap_extract_assembler_bin/vmapextract_v2.exe differ
diff --git a/contrib/vmap_extractor_v2/stormlib/StormPortMac.cpp b/contrib/vmap_extractor_v2/stormlib/StormPortMac.cpp
index 26f67872a..2477333ae 100644
--- a/contrib/vmap_extractor_v2/stormlib/StormPortMac.cpp
+++ b/contrib/vmap_extractor_v2/stormlib/StormPortMac.cpp
@@ -15,7 +15,7 @@
 *
 ********************************************************************/
 
-#ifndef _WIN32 || _WIN64
+#ifndef _WIN32
 #include "StormPort.h"
 #include "StormLib.h"
 
diff --git a/contrib/vmap_extractor_v2/vmapextract/adtfile.cpp b/contrib/vmap_extractor_v2/vmapextract/adtfile.cpp
index 2de3aa751..cd9ba7219 100644
--- a/contrib/vmap_extractor_v2/vmapextract/adtfile.cpp
+++ b/contrib/vmap_extractor_v2/vmapextract/adtfile.cpp
@@ -1,5 +1,6 @@
 #include "adtfile.h"
 
+#include <algorithm>
 char * GetPlainName(char * FileName)
 {
     char * szTemp;
@@ -22,6 +23,7 @@ void fixnamen(char *name, size_t len)
         }
     }
 }
+
 void fixname2(char *name, size_t len)
 {
     for (size_t i=0; i<len-3; i++)
@@ -42,10 +44,10 @@ bool ADTFile::init(char *map_id)
         return false;
 
     size_t size;
-    
+
     string xMap;
     string yMap;
-    
+
     Adtfilename.erase(Adtfilename.find(".adt"),4);
     string TempMapNumber;
     TempMapNumber = Adtfilename.substr(Adtfilename.length()-6,6);
@@ -100,18 +102,27 @@ bool ADTFile::init(char *map_id)
                     fixname2(s,strlen(s));
                     p=p+strlen(p)+1;
                     ModelInstansName[t++] = s;
-                    path.erase(path.length()-2,2);
-                    path.append("2");
-                    char* szLocalFile[512];
-                    sprintf((char*)szLocalFile, ".\\buildings\\%s", s);
-                    FILE * output = fopen((char*)szLocalFile,"rb");
+
+                    // < 3.1.0 ADT MMDX section store filename.mdx filenames for corresponded .m2 file
+                    std::string ext3 = path.size() >= 4 ? path.substr(path.size()-4,4) : "";
+                    std::transform( ext3.begin(), ext3.end(), ext3.begin(), ::tolower );
+                    if(ext3 == ".mdx")
+                    {
+                        // replace .mdx -> .m2
+                        path.erase(path.length()-2,2);
+                        path.append("2");
+                    }
+                    // >= 3.1.0 ADT MMDX section store filename.m2 filenames for corresponded .m2 file
+                    // nothing do
+
+                    char szLocalFile[MAX_PATH];
+                    sprintf(szLocalFile, ".\\buildings\\%s", s);
+                    FILE * output = fopen(szLocalFile,"rb");
                     if(!output)
                     {
                         Model * m2 = new Model(path);
                         if(m2->open())
-                        {
-                            m2->ConvertToVMAPModel((char*)szLocalFile);
-                        }
+                            m2->ConvertToVMAPModel(szLocalFile);
                         delete m2;
                     }
                     else
@@ -129,7 +140,7 @@ bool ADTFile::init(char *map_id)
                 char *p=buf;
                 int q = 0;
                 WmoInstansName = new string[size];
-                while (p<buf+size) 
+                while (p<buf+size)
                 {
                     string path(p);
                     char* s=GetPlainName(p);
@@ -171,7 +182,7 @@ bool ADTFile::init(char *map_id)
             }
         }
         //======================
-#if 0 
+#if 0
         else if (!strcmp(fourcc,"MDDF"))
         {
             if (size)
diff --git a/contrib/vmap_extractor_v2/vmapextract/adtfile.h b/contrib/vmap_extractor_v2/vmapextract/adtfile.h
index 4ce58d3c4..0ce5851ab 100644
--- a/contrib/vmap_extractor_v2/vmapextract/adtfile.h
+++ b/contrib/vmap_extractor_v2/vmapextract/adtfile.h
@@ -24,17 +24,17 @@ typedef struct
     float z;
 }svec;
 
-typedef struct
+struct vec
 {
     double x;
     double y;
     double z;
-}vec;
+};
 
-typedef struc
+struct triangle
 {
     vec v[3];
-}triangle;
+};
 
 typedef struct
 {
diff --git a/contrib/vmap_extractor_v2/vmapextract/dbcfile.cpp b/contrib/vmap_extractor_v2/vmapextract/dbcfile.cpp
index d2e05d0b4..52eb18c42 100644
--- a/contrib/vmap_extractor_v2/vmapextract/dbcfile.cpp
+++ b/contrib/vmap_extractor_v2/vmapextract/dbcfile.cpp
@@ -36,7 +36,7 @@ bool DBCFile::open()
     f.read(&nb,4); // Number of fields
     f.read(&es,4); // Size of a record
     f.read(&ss,4); // String size
-    
+
     recordSize = es;
     recordCount = na;
     fieldCount = nb;
diff --git a/contrib/vmap_extractor_v2/vmapextract/dbcfile.h b/contrib/vmap_extractor_v2/vmapextract/dbcfile.h
index 63081bca4..002e7eeeb 100644
--- a/contrib/vmap_extractor_v2/vmapextract/dbcfile.h
+++ b/contrib/vmap_extractor_v2/vmapextract/dbcfile.h
@@ -91,7 +91,7 @@ public:
     class Iterator
     {
     public:
-        Iterator(DBCFile &file, unsigned char *offset): 
+        Iterator(DBCFile &file, unsigned char *offset):
             record(file, offset) {}
         /// Advance (prefix only)
         Iterator & operator++() {
diff --git a/contrib/vmap_extractor_v2/vmapextract/mpq.cpp b/contrib/vmap_extractor_v2/vmapextract/mpq.cpp
index 333bb2f50..0d72f06a7 100644
--- a/contrib/vmap_extractor_v2/vmapextract/mpq.cpp
+++ b/contrib/vmap_extractor_v2/vmapextract/mpq.cpp
@@ -3,23 +3,16 @@
 #include "Stormlib.h"
 #define __STORMLIB_SELF__
 
-typedef std::vector<MPQArchive*> ArchiveSet;
-ArchiveSet gOpenArchives;
+MPQArchiveSet gOpenArchives;
 
+//xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 MPQArchive::MPQArchive(const char* filename)
 {
     BOOL succ = SFileOpenArchive(filename, 0, 0,&hMPQ);
     if (succ)
-    {
-        MPQArchive*ar = (MPQArchive*)(hMPQ);
         printf("Opening %s\n", filename);
-        gOpenArchives.push_back(ar);
-        succ = true;
-    }
     else
-    {
         printf("Error!!!Not open archive %s\n", filename);
-    }
 }
 
 void MPQArchive::close()
@@ -27,16 +20,35 @@ void MPQArchive::close()
     SFileCloseArchive(hMPQ);
 }
 
+bool MPQArchiveSet::Open( std::vector<std::string> const& archiveNames )
+{
+    for (size_t i=0; i < archiveNames.size(); ++i)
+    {
+        MPQArchive mpqarch(archiveNames[i].c_str());
+        if(mpqarch.isOpen())
+            archives.push_back(mpqarch);
+    }
+
+    return !archives.empty();
+}
+
+MPQArchiveSet::~MPQArchiveSet()
+{
+    // close archives
+    for (ArchiveSet::iterator ar_itr = archives.begin(); ar_itr != archives.end(); ++ar_itr)
+        ar_itr->close();
+}
+
 MPQFile::MPQFile(const char* filename):
     eof(false),
     buffer(0),
     pointer(0),
     size(0)
 {
-    for(ArchiveSet::iterator i=gOpenArchives.begin(); i!=gOpenArchives.end();++i)
+    for(ArchiveSet::const_iterator i=gOpenArchives.archives.begin(); i!=gOpenArchives.archives.end();++i)
     {
         HANDLE hFile = "";
-        MPQArchive*(hMPQ) = *i;
+        hMPQ = i->hMPQ;
         BOOL succ = SFileOpenFileEx(hMPQ,filename,0, &hFile);
         if (succ)
         {
@@ -54,7 +66,7 @@ MPQFile::MPQFile(const char* filename):
 
             eof = false;
             return;
-       }
+        }
     }
 
     eof = true;
diff --git a/contrib/vmap_extractor_v2/vmapextract/mpq.h b/contrib/vmap_extractor_v2/vmapextract/mpq.h
index 8fc885667..0d1d14851 100644
--- a/contrib/vmap_extractor_v2/vmapextract/mpq.h
+++ b/contrib/vmap_extractor_v2/vmapextract/mpq.h
@@ -17,12 +17,28 @@ typedef unsigned int uint32;
 
 class MPQArchive
 {
-public:
-    HANDLE hMPQ;
-    MPQArchive(const char* filename);
-    void close();
+    public:
+	    HANDLE hMPQ;
+	    MPQArchive(const char* filename);
+	    void close();
+        bool isOpen() const { return hMPQ != 0; }
 };
 
+typedef std::vector<MPQArchive> ArchiveSet;
+
+class MPQArchiveSet
+{
+    public:
+        MPQArchiveSet() {}
+        ~MPQArchiveSet();
+
+        bool Open(std::vector<std::string> const& archiveNames);
+
+        ArchiveSet archives;
+};
+
+extern MPQArchiveSet gOpenArchives;
+
 class MPQFile
 {
     HANDLE hFile;
diff --git a/contrib/vmap_extractor_v2/vmapextract/vec3d.h b/contrib/vmap_extractor_v2/vmapextract/vec3d.h
index fd966138d..405135521 100644
--- a/contrib/vmap_extractor_v2/vmapextract/vec3d.h
+++ b/contrib/vmap_extractor_v2/vmapextract/vec3d.h
@@ -118,7 +118,7 @@ class Vec2D
 {
 public:
     float x,y;
-    
+
     Vec2D(float x0 = 0.0f, float y0 = 0.0f) : x(x0), y(y0) {}
 
     Vec2D(const Vec2D& v) : x(v.x), y(v.y) {}
diff --git a/contrib/vmap_extractor_v2/vmapextract/vmapexport.cpp b/contrib/vmap_extractor_v2/vmapextract/vmapexport.cpp
index 24ca6414c..a96a404f6 100644
--- a/contrib/vmap_extractor_v2/vmapextract/vmapexport.cpp
+++ b/contrib/vmap_extractor_v2/vmapextract/vmapexport.cpp
@@ -90,6 +90,7 @@ static const char * GetPlainName(const char * szFileName)
 
 static void ShowProcessedFile(const char * szFileName)
 {
+/* not truncate file names in output
     char szLine[80];
     size_t nLength = strlen(szFileName);
 
@@ -100,13 +101,14 @@ static void ShowProcessedFile(const char * szFileName)
         nLength = sizeof(szLine)-1;
     memcpy(szLine, szFileName, nLength);
     printf("\r%s\n", szLine);
+*/
+    printf("\r%s\n", szFileName);
 }
 
-int ExtractWmo(const std::vector<std::string>& pArchiveNames)
+int ExtractWmo()
 {
     char* szListFile = "";
     char   szLocalFile[MAX_PATH] = "";
-    HANDLE hMpq = "";
     BOOL bResult = FALSE;
 
     //const char* ParsArchiveNames[] = {"patch-2.MPQ", "patch.MPQ", "common.MPQ", "expansion.MPQ"};
@@ -114,20 +116,14 @@ int ExtractWmo(const std::vector<std::string>& pArchiveNames)
     int nError = ERROR_SUCCESS;
     if(szListFile == NULL || *szListFile == 0)
         szListFile = NULL;
-    //char tmp[1024];
-    //for (size_t i=0; i<4; i++)
-    for (size_t i=0; i<pArchiveNames.size(); ++i)
-    {
-        //sprintf(tmp,"%s\\%s", input_path, ParsArchiveNames[i]);
-        //if(!SFileOpenArchive(tmp, 0, 0, &hMpq))
-        if(!SFileOpenArchive(pArchiveNames[i].c_str(), 0, 0, &hMpq))
-            printf("NOT open!!! %s\n",pArchiveNames[i].c_str());
 
+    for (ArchiveSet::const_iterator ar_itr = gOpenArchives.archives.begin(); ar_itr != gOpenArchives.archives.end(); ++ar_itr)
+    {
         // Copy files from archive
         if(nError == ERROR_SUCCESS)
         {
             SFILE_FIND_DATA wf;
-            HANDLE hFind = SFileFindFirstFile(hMpq,"*.wmo*", &wf, szListFile);
+            HANDLE hFind = SFileFindFirstFile(ar_itr->hMPQ,"*.wmo*", &wf, szListFile);
             bResult = TRUE;
 
             while(hFind != NULL && bResult == TRUE)
@@ -171,10 +167,10 @@ int ExtractWmo(const std::vector<std::string>& pArchiveNames)
                         {
                             for (int i=0; i<froot->nGroups; ++i)
                             {
-                                char temp[512];
+                                char temp[MAX_PATH];
                                 strcpy(temp, wf.cFileName);
                                 temp[strlen(wf.cFileName)-4] = 0;
-                                char groupFileName[512];
+                                char groupFileName[MAX_PATH];
                                 sprintf(groupFileName,"%s_%03d.wmo",temp, i);
                                 printf("%s\n",groupFileName);
                                 //printf("GroupWmo!\n");
@@ -212,12 +208,6 @@ int ExtractWmo(const std::vector<std::string>& pArchiveNames)
         }
     }
 
-    // Close both archives
-    if(hMpq != NULL)
-    {
-        //SFileCloseArchive(hMpq);
-    }
-
     if(nError == ERROR_SUCCESS)
         printf("\nExtract wmo complete (No errors)\n");
 
@@ -533,26 +523,30 @@ int main(int argc, char ** argv)
         if(nError == ERROR_ALREADY_EXISTS)
             nError = ERROR_SUCCESS;
     }
-    //xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-    // patch goes first -> fake priority handling
-    std::vector<MPQArchive*> archives;
 
-    //xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+    // prepare archive name list
     std::vector<std::string> archiveNames;
-
     fillArchiveNameVector(archiveNames);
-    for (size_t i=0; i<archiveNames.size(); ++i)
+    if(!gOpenArchives.Open(archiveNames))
     {
-        archives.push_back(new MPQArchive(archiveNames[i].c_str()));
+        printf("FATAL ERROR: None MPQ archive found by path '%s'. Use -d option with proper path.\n",input_path);
+        return 1;
     }
-    ExtractWmo(archiveNames);
 
-     //xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+    // extract data
+    ExtractWmo();
+
+    //xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
     //map.dbc
     if(nError == ERROR_SUCCESS)
     {
         DBCFile * dbc = new DBCFile("DBFilesClient\\Map.dbc");
-        dbc->open();
+        if(!dbc->open())
+        {
+            delete dbc;
+            printf("FATAL ERROR: Map.dbc not found in data file.\n");
+            return 1;
+        }
         map_count=dbc->getRecordCount ();
         map_ids=new map_id[map_count];
         for(unsigned int x=0;x<map_count;++x)
@@ -574,5 +568,6 @@ int main(int argc, char ** argv)
         printf("ERROR: Extract %s. Work NOT complete.\n   Precise vector data=%d.\nPress any key.\n",versionString, preciseVectorData);
         _getch();
     }
+
     printf("Extract %s. Work complete. No errors.",versionString);
 }
diff --git a/contrib/vmap_extractor_v2/vmapextract/wmo.cpp b/contrib/vmap_extractor_v2/vmapextract/wmo.cpp
index b56a79477..4817e14c8 100644
--- a/contrib/vmap_extractor_v2/vmapextract/wmo.cpp
+++ b/contrib/vmap_extractor_v2/vmapextract/wmo.cpp
@@ -295,7 +295,7 @@ int WMOGroup::ConvertToVMAPGroupWmo(FILE *output, bool pPreciseVectorData)
         {
             int LIQU_h[] = {0x5551494C,LiquEx_size+8,hlq_xverts,hlq_yverts};// "LIQU"
             fwrite(LIQU_h,4,4,output);
-            fwrite(LiquEx,4,LiquEx_size/4,output);    
+            fwrite(LiquEx,4,LiquEx_size/4,output);
             delete [] LiquEx;
         }
 
@@ -305,7 +305,7 @@ int WMOGroup::ConvertToVMAPGroupWmo(FILE *output, bool pPreciseVectorData)
     {
         //printf("Convert GroupWmo...\n");
         //-------GRP -------------------------------------
-        fwrite(&liquflags,sizeof(uint32),1,output); 
+        fwrite(&liquflags,sizeof(uint32),1,output);
         char GRP[] = "GRP ";
         fwrite(GRP,1,4,output);
         int k = 0;
@@ -317,7 +317,7 @@ int WMOGroup::ConvertToVMAPGroupWmo(FILE *output, bool pPreciseVectorData)
         }
         delete [] MOBA;
         int moba_size_grp = moba_batch*4+4;
-        fwrite(&moba_size_grp,4,1,output); 
+        fwrite(&moba_size_grp,4,1,output);
         fwrite(&moba_batch,4,1,output);
         fwrite(MobaEx,4,k,output);
         delete [] MobaEx;
@@ -335,7 +335,7 @@ int WMOGroup::ConvertToVMAPGroupWmo(FILE *output, bool pPreciseVectorData)
                 continue;
             // Use only this triangles
             if ((int)MOPY[i]&(WMO_MATERIAL_HINT|WMO_MATERIAL_COLLIDE_HIT))
-            {    
+            {
                 MopyEx[n] = MOPY[i];
                 MopyEx[(n+1)] = MOPY[(i+1)];
                 IndexExTr[j] = i/2;
@@ -454,7 +454,7 @@ int WMOGroup::ConvertToVMAPGroupWmo(FILE *output, bool pPreciseVectorData)
         delete [] MovtEx;
         delete [] MovtExSort;
 
-        //---------------------------------------------    
+        //---------------------------------------------
         return IndexExTr_size;
     }
 }
diff --git a/contrib/vmap_extractor_v2/vmapextract/wmo.h b/contrib/vmap_extractor_v2/vmapextract/wmo.h
index d57340855..3000050c1 100644
--- a/contrib/vmap_extractor_v2/vmapextract/wmo.h
+++ b/contrib/vmap_extractor_v2/vmapextract/wmo.h
@@ -37,7 +37,7 @@ public:
 
     WMORoot(std::string &filename);
     ~WMORoot();
-    
+
     bool open();
     bool ConvertToVMAPRootWmo(FILE *output);
 private:
diff --git a/doc/EventAI.txt b/doc/EventAI.txt
index 2390bb02c..5137c26dd 100644
--- a/doc/EventAI.txt
+++ b/doc/EventAI.txt
@@ -129,6 +129,7 @@ Params are always read from Param1, then Param2, then Param3.
 37   ACTION_T_DIE                      No Params                       Kills the creature
 38   ACTION_T_ZONE_COMBAT_PULSE        No Params                       Places all players within the instance into combat with the creature. Only works in combat and only works inside of instances.
 39   ACTION_T_CALL_FOR_HELP            Radius                          Call any friendly creatures (if its not in combat/etc) in radius attack creature target.
+40   ACTION_T_SET_SHEATH               Sheath                          Let set sheath state for creature (0-no weapon show (not used mostly by creatures), 1-melee weapon show, 2-ranged weapon show)
 
 * = Use -1 to specify that if this param is picked to do nothing. Random is constant between actions within an event. So if you have a random Yell and a random Sound they will match up (ex: param2 with param2)
 
@@ -684,6 +685,25 @@ This is commonly used if you need to Instakill the creature for one reason or an
 --------------------------------
 Places all players within the instance into combat with the creature. Only works in combat and only works inside of instances. 
 
+----------------------------
+39 = ACTION_T_CALL_FOR_HELP:
+----------------------------
+Parameter 1: Radius - All friendly (not only same faction) creatures will go to help
+
+Call any friendly creatures (if its not in combat/etc) in radius attack creature target.
+Mostly used when call to help more wide that normal aggro radius or auto-used call for assistance, and need apply at some event.
+
+-------------------------
+40   ACTION_T_SET_SHEATH:
+-------------------------
+Parameter 1: Sheath state
+0    SHEATH_STATE_UNARMED               not prepared weapon show (not used mostly by creatures)
+1    SHEATH_STATE_MELEE                 melee weapon prepared show
+2    SHEATH_STATE_RANGED                ranged weapon prepared show
+
+Let set sheath state for creature.
+Note: SHEATH_STATE_RANGED case work in combat state only if combat not start as melee commands.
+This possible setup by set ar event AI start (single used EVENT_T_TIMER_OOC set ACTION_T_COMBAT_MOVEMENT 0 for creature that prefered ranged attack)
 
 =========================================
 Target Types
diff --git a/sql/mangos.sql b/sql/mangos.sql
index 09a093fa4..8519835b6 100644
--- a/sql/mangos.sql
+++ b/sql/mangos.sql
@@ -23,7 +23,7 @@ DROP TABLE IF EXISTS `db_version`;
 CREATE TABLE `db_version` (
   `version` varchar(120) default NULL,
   `creature_ai_version` varchar(120) default NULL,
-  `required_7902_02_mangos_pool_gameobject` bit(1) default NULL
+  `required_7908_03_mangos_creature_template_addon` bit(1) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes';
 
 --
@@ -564,7 +564,6 @@ DROP TABLE IF EXISTS `creature_addon`;
 CREATE TABLE `creature_addon` (
   `guid` int(11) NOT NULL default '0',
   `mount` mediumint(8) unsigned NOT NULL default '0',
-  `bytes0` int(10) unsigned NOT NULL default '0',
   `bytes1` int(10) unsigned NOT NULL default '0',
   `bytes2` int(10) unsigned NOT NULL default '0',
   `emote` int(10) unsigned NOT NULL default '0',
@@ -813,8 +812,10 @@ CREATE TABLE `creature_template` (
   `maxdmg` float NOT NULL default '0',
   `dmgschool` tinyint(4) NOT NULL default '0',
   `attackpower` int(10) unsigned NOT NULL default '0',
+  `dmg_multiplier` float NOT NULL default '1',
   `baseattacktime` int(10) unsigned NOT NULL default '0',
   `rangeattacktime` int(10) unsigned NOT NULL default '0',
+  `unit_class` tinyint(3) unsigned NOT NULL default '0',
   `unit_flags` int(10) unsigned NOT NULL default '0',
   `dynamicflags` int(10) unsigned NOT NULL default '0',
   `family` tinyint(4) NOT NULL default '0',
@@ -864,7 +865,7 @@ CREATE TABLE `creature_template` (
 LOCK TABLES `creature_template` WRITE;
 /*!40000 ALTER TABLE `creature_template` DISABLE KEYS */;
 INSERT INTO `creature_template` VALUES
-(1,0,10045,0,10045,0,'Waypoint(Only GM can see it)','Visual',NULL,1,1,64,64,0,0,0,35,35,0,0.91,1,0,14,15,0,100,2000,2200,4096,0,0,0,0,0,0,1.76,2.42,100,8,5242886,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1.0,1.0,0,1,0,0,0x82,'');
+(1,0,10045,0,10045,0,'Waypoint(Only GM can see it)','Visual',NULL,1,1,64,64,0,0,0,35,35,0,0.91,1,0,14,15,0,100,1,2000,2200,8,4096,0,0,0,0,0,0,1.76,2.42,100,8,5242886,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1.0,1.0,0,1,0,0,0x82,'');
 /*!40000 ALTER TABLE `creature_template` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -876,7 +877,6 @@ DROP TABLE IF EXISTS `creature_template_addon`;
 CREATE TABLE `creature_template_addon` (
   `entry` mediumint(8) unsigned NOT NULL default '0',
   `mount` mediumint(8) unsigned NOT NULL default '0',
-  `bytes0` int(10) unsigned NOT NULL default '0',
   `bytes1` int(10) unsigned NOT NULL default '0',
   `bytes2` int(10) unsigned NOT NULL default '0',
   `emote` mediumint(8) unsigned NOT NULL default '0',
diff --git a/sql/updates/7886_01_mangos_petcreateinfo_spell.sql b/sql/updates/7886_01_mangos_petcreateinfo_spell.sql
index 673d1b317..7e48d476a 100644
--- a/sql/updates/7886_01_mangos_petcreateinfo_spell.sql
+++ b/sql/updates/7886_01_mangos_petcreateinfo_spell.sql
@@ -1,4 +1,3 @@
 ALTER TABLE db_version CHANGE COLUMN required_7884_02_mangos_playercreateinfo_action required_7886_01_mangos_petcreateinfo_spell bit;
 
 DROP TABLE IF EXISTS `petcreateinfo_spell`;
-
diff --git a/sql/updates/7902_01_mangos_pool_creature.sql b/sql/updates/7902_01_mangos_pool_creature.sql
index 309ca5e38..50d6f3772 100644
--- a/sql/updates/7902_01_mangos_pool_creature.sql
+++ b/sql/updates/7902_01_mangos_pool_creature.sql
@@ -1,4 +1,4 @@
 ALTER TABLE db_version CHANGE COLUMN required_7896_01_mangos_creature_template required_7902_01_mangos_pool_creature bit;
 
-ALTER TABLE `pool_creature` 
-   ADD INDEX `idx_guid`(`guid`);
\ No newline at end of file
+ALTER TABLE `pool_creature`
+    ADD INDEX `idx_guid`(`guid`);
diff --git a/sql/updates/7902_02_mangos_pool_gameobject.sql b/sql/updates/7902_02_mangos_pool_gameobject.sql
index 46524337a..09758239a 100644
--- a/sql/updates/7902_02_mangos_pool_gameobject.sql
+++ b/sql/updates/7902_02_mangos_pool_gameobject.sql
@@ -1,4 +1,4 @@
 ALTER TABLE db_version CHANGE COLUMN required_7902_01_mangos_pool_creature required_7902_02_mangos_pool_gameobject bit;
 
-ALTER TABLE `pool_gameobject` 
-   ADD INDEX `idx_guid`(`guid`);
\ No newline at end of file
+ALTER TABLE `pool_gameobject`
+    ADD INDEX `idx_guid`(`guid`);
diff --git a/sql/updates/7904_01_mangos_creature_template.sql b/sql/updates/7904_01_mangos_creature_template.sql
new file mode 100644
index 000000000..0f984b74e
--- /dev/null
+++ b/sql/updates/7904_01_mangos_creature_template.sql
@@ -0,0 +1,9 @@
+ALTER TABLE db_version CHANGE COLUMN required_7902_02_mangos_pool_gameobject required_7904_01_mangos_creature_template bit;
+
+ALTER TABLE creature_template
+  ADD COLUMN dmg_multiplier float NOT NULL default '1' AFTER attackpower;
+
+UPDATE creature_template SET mindmg      = round(mindmg + attackpower / 14);
+UPDATE creature_template SET maxdmg      = round(maxdmg + attackpower / 14);
+UPDATE creature_template SET attackpower = round((maxdmg + mindmg) * 0.3);
+UPDATE creature_template SET mindmg      = round(mindmg * 0.7), maxdmg = round(maxdmg * 0.7);
diff --git a/sql/updates/7908_01_mangos_creature_template.sql b/sql/updates/7908_01_mangos_creature_template.sql
new file mode 100644
index 000000000..ced41e185
--- /dev/null
+++ b/sql/updates/7908_01_mangos_creature_template.sql
@@ -0,0 +1,17 @@
+ALTER TABLE db_version CHANGE COLUMN required_7904_01_mangos_creature_template required_7908_01_mangos_creature_template bit;
+
+ALTER TABLE creature_template ADD COLUMN unit_class tinyint(3) unsigned NOT NULL default '0' AFTER rangeattacktime;
+
+UPDATE creature_template ct
+JOIN creature c ON ct.entry=c.id
+JOIN creature_addon ad ON c.guid=ad.guid
+SET ct.unit_class=(ad.bytes0 & 0x0000FF00) >> 8
+WHERE ct.entry=c.id AND ct.unit_class=0;
+
+UPDATE creature_template ct
+JOIN creature_template_addon ad ON ct.entry=ad.entry
+SET ct.unit_class=(ad.bytes0 & 0x0000FF00) >> 8
+WHERE ct.entry=ad.entry AND ct.unit_class=0;
+
+UPDATE creature_template a1, creature_template a2 SET a1.unit_class=a2.unit_class WHERE a1.unit_class=0 AND a2.unit_class!=0 AND a1.entry=a2.heroic_entry;
+UPDATE creature_template a1, creature_template a2 SET a1.unit_class=a2.unit_class WHERE a1.unit_class=0 AND a2.unit_class!=0 AND a2.entry=a1.heroic_entry;
diff --git a/sql/updates/7908_02_mangos_creature_addon.sql b/sql/updates/7908_02_mangos_creature_addon.sql
new file mode 100644
index 000000000..f72630957
--- /dev/null
+++ b/sql/updates/7908_02_mangos_creature_addon.sql
@@ -0,0 +1,4 @@
+ALTER TABLE db_version CHANGE COLUMN required_7908_01_mangos_creature_template required_7908_02_mangos_creature_addon bit;
+
+ALTER TABLE creature_addon
+  DROP COLUMN bytes0;
diff --git a/sql/updates/7908_03_mangos_creature_template_addon.sql b/sql/updates/7908_03_mangos_creature_template_addon.sql
new file mode 100644
index 000000000..7dcea58fe
--- /dev/null
+++ b/sql/updates/7908_03_mangos_creature_template_addon.sql
@@ -0,0 +1,4 @@
+ALTER TABLE db_version CHANGE COLUMN required_7908_02_mangos_creature_addon required_7908_03_mangos_creature_template_addon bit;
+
+ALTER TABLE creature_template_addon
+  DROP COLUMN bytes0;
diff --git a/sql/updates/Makefile.am b/sql/updates/Makefile.am
index 6e18e6493..acd664849 100644
--- a/sql/updates/Makefile.am
+++ b/sql/updates/Makefile.am
@@ -204,6 +204,10 @@ pkgdata_DATA = \
 	7902_01_mangos_pool_creature.sql \
 	7902_02_mangos_pool_gameobject.sql \
 	7903_01_characters_character_pet.sql \
+	7904_01_mangos_creature_template.sql \
+	7908_01_mangos_creature_template.sql \
+	7908_02_mangos_creature_addon.sql \
+	7908_03_mangos_creature_template_addon.sql \
 	README
 
 ## Additional files to include when running 'make dist'
@@ -388,4 +392,8 @@ EXTRA_DIST = \
 	7902_01_mangos_pool_creature.sql \
 	7902_02_mangos_pool_gameobject.sql \
 	7903_01_characters_character_pet.sql \
+	7904_01_mangos_creature_template.sql \
+	7908_01_mangos_creature_template.sql \
+	7908_02_mangos_creature_addon.sql \
+	7908_03_mangos_creature_template_addon.sql \
 	README
diff --git a/src/game/CombatHandler.cpp b/src/game/CombatHandler.cpp
index 12fedd89a..ddc6748e2 100644
--- a/src/game/CombatHandler.cpp
+++ b/src/game/CombatHandler.cpp
@@ -81,7 +81,13 @@ void WorldSession::HandleSetSheathedOpcode( WorldPacket & recv_data )
 
     //sLog.outDebug( "WORLD: Recvd CMSG_SETSHEATHED Message guidlow:%u value1:%u", GetPlayer()->GetGUIDLow(), sheathed );
 
-    GetPlayer()->SetSheath(sheathed);
+    if(sheathed >= MAX_SHEATH_STATE)
+    {
+        sLog.outError("Unknown sheath state %u ??",sheathed);
+        return;
+    }
+
+    GetPlayer()->SetSheath(SheathState(sheathed));
 }
 
 void WorldSession::SendAttackStop(Unit const* enemy)
diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index f8eade957..cee3d9c15 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -197,6 +197,12 @@ bool Creature::InitEntry(uint32 Entry, uint32 team, const CreatureData *data )
     SetEntry(Entry);                                        // normal entry always
     m_creatureInfo = cinfo;                                 // map mode related always
 
+    // equal to player Race field, but creature does not have race
+    SetByteValue(UNIT_FIELD_BYTES_0, 0, 0);
+
+    // known valid are: CLASS_WARRIOR,CLASS_PALADIN,CLASS_ROGUE,CLASS_MAGE
+    SetByteValue(UNIT_FIELD_BYTES_0, 1, uint8(cinfo->unit_class));
+
     if (cinfo->DisplayID_A == 0 || cinfo->DisplayID_H == 0) // Cancel load if no model defined
     {
         sLog.outErrorDb("Creature (Entry: %u) has no model defined for Horde or Alliance in table `creature_template`, can't load. ",Entry);
@@ -256,7 +262,7 @@ bool Creature::UpdateEntry(uint32 Entry, uint32 team, const CreatureData *data )
     m_regenHealth = GetCreatureInfo()->RegenHealth;
 
     // creatures always have melee weapon ready if any
-    SetByteValue(UNIT_FIELD_BYTES_2, 0, SHEATH_STATE_MELEE );
+    SetSheath(SHEATH_STATE_MELEE);
 
     SelectLevel(GetCreatureInfo());
     if (team == HORDE)
@@ -1204,6 +1210,8 @@ void Creature::SelectLevel(const CreatureInfo *cinfo)
     SetMaxPower(POWER_MANA, mana);                          //MAX Mana
     SetPower(POWER_MANA, mana);
 
+    // TODO: set UNIT_FIELD_POWER*, for some creature class case (energy, etc)
+
     SetModifierValue(UNIT_MOD_HEALTH, BASE_VALUE, health);
     SetModifierValue(UNIT_MOD_MANA, BASE_VALUE, mana);
 
@@ -1860,9 +1868,6 @@ bool Creature::LoadCreaturesAddon(bool reload)
     if (cainfo->mount != 0)
         Mount(cainfo->mount);
 
-    if (cainfo->bytes0 != 0)
-        SetUInt32Value(UNIT_FIELD_BYTES_0, cainfo->bytes0);
-
     if (cainfo->bytes1 != 0)
         SetUInt32Value(UNIT_FIELD_BYTES_1, cainfo->bytes1);
 
diff --git a/src/game/Creature.h b/src/game/Creature.h
index c33da87ba..5f412c208 100644
--- a/src/game/Creature.h
+++ b/src/game/Creature.h
@@ -183,8 +183,10 @@ struct CreatureInfo
     float   maxdmg;
     uint32  dmgschool;
     uint32  attackpower;
+    float   dmg_multiplier;
     uint32  baseattacktime;
     uint32  rangeattacktime;
+    uint32  unit_class;                                     // enum Classes. Note only 4 classes are known for creatures.
     uint32  unit_flags;                                     // enum UnitFlags mask values
     uint32  dynamicflags;
     uint32  family;                                         // enum CreatureFamily values (optional)
@@ -299,7 +301,6 @@ struct CreatureDataAddon
 {
     uint32 guidOrEntry;
     uint32 mount;
-    uint32 bytes0;
     uint32 bytes1;
     uint32 bytes2;
     uint32 emote;
diff --git a/src/game/CreatureEventAI.cpp b/src/game/CreatureEventAI.cpp
index 5a1cf5716..bb4b5f139 100644
--- a/src/game/CreatureEventAI.cpp
+++ b/src/game/CreatureEventAI.cpp
@@ -613,7 +613,7 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32
                 sLog.outErrorDb( "CreatureEventAI: Event %d incremented Phase above %u. Phase mask cannot be used with phases past %u. CreatureEntry = %d", EventId, MAX_PHASE-1, MAX_PHASE-1, m_creature->GetEntry());
                 Phase = MAX_PHASE-1;
             }
-            else 
+            else
                 Phase = new_phase;
 
             break;
@@ -783,6 +783,11 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32
             cell_lock->Visit(cell_lock, grid_creature_searcher, *m_creature->GetMap());
             break;
         }
+        case ACTION_T_SET_SHEATH:
+        {
+            m_creature->SetSheath(SheathState(action.set_sheath.sheath));
+            break;
+        }
     }
 }
 
diff --git a/src/game/CreatureEventAI.h b/src/game/CreatureEventAI.h
index 5f967c51d..b5b98e0ca 100644
--- a/src/game/CreatureEventAI.h
+++ b/src/game/CreatureEventAI.h
@@ -102,7 +102,7 @@ enum EventAI_ActionType
     ACTION_T_DIE                        = 37,               // No Params
     ACTION_T_ZONE_COMBAT_PULSE          = 38,               // No Params
     ACTION_T_CALL_FOR_HELP              = 39,               // Radius
-
+    ACTION_T_SET_SHEATH                 = 40,               // Sheath (0-passive,1-melee,2-ranged)
     ACTION_T_END,
 };
 
@@ -197,69 +197,69 @@ struct CreatureEventAI_Action
             uint32 modelId;
         } morph;
         // ACTION_T_SOUND                                   = 4
-        struct  
+        struct
         {
             uint32 soundId;
         } sound;
         // ACTION_T_EMOTE                                   = 5
-        struct  
+        struct
         {
             uint32 emoteId;
         } emote;
         // ACTION_T_RANDOM_SOUND                            = 9
-        struct  
+        struct
         {
             int32 soundId1;                                 // (-1 in any field means no output if randomed that field)
             int32 soundId2;
             int32 soundId3;
         } random_sound;
         // ACTION_T_RANDOM_EMOTE                            = 10
-        struct  
+        struct
         {
             int32 emoteId1;                                 // (-1 in any field means no output if randomed that field)
             int32 emoteId2;
             int32 emoteId3;
         } random_emote;
         // ACTION_T_CAST                                    = 11
-        struct  
+        struct
         {
             uint32 spellId;
             uint32 target;
             uint32 castFlags;
         } cast;
         // ACTION_T_SUMMON                                  = 12
-        struct  
+        struct
         {
             uint32 creatured;
             uint32 target;
             uint32 duration;
         } summon;
         // ACTION_T_THREAT_SINGLE_PCT                       = 13
-        struct  
+        struct
         {
             int32 percent;
             uint32 target;
         } threat_single_pct;
         // ACTION_T_THREAT_ALL_PCT                          = 14
-        struct  
+        struct
         {
             int32 percent;
         } threat_all_pct;
         // ACTION_T_QUEST_EVENT                             = 15
-        struct  
+        struct
         {
             uint32 questId;
             uint32 target;
         } quest_event;
         // ACTION_T_CAST_EVENT                              = 16
-        struct  
+        struct
         {
             uint32 creatureId;
             uint32 spellId;
             uint32 target;
         } cast_event;
         // ACTION_T_SET_UNIT_FIELD                          = 17
-        struct  
+        struct
         {
             uint32 field;
             uint32 value;
@@ -267,94 +267,94 @@ struct CreatureEventAI_Action
         } set_unit_field;
         // ACTION_T_SET_UNIT_FLAG                           = 18,  // value provided mask bits that will be set
         // ACTION_T_REMOVE_UNIT_FLAG                        = 19,  // value provided mask bits that will be clear
-        struct  
+        struct
         {
             uint32 value;
             uint32 target;
         } unit_flag;
         // ACTION_T_AUTO_ATTACK                             = 20
-        struct  
+        struct
         {
             uint32 state;                                   // 0 = stop attack, anything else means continue attacking
         } auto_attack;
         // ACTION_T_COMBAT_MOVEMENT                         = 21
-        struct  
+        struct
         {
             uint32 state;                                   // 0 = stop combat based movement, anything else continue attacking
         } combat_movement;
         // ACTION_T_SET_PHASE                               = 22
-        struct  
+        struct
         {
             uint32 phase;
         } set_phase;
         // ACTION_T_INC_PHASE                               = 23
-        struct  
+        struct
         {
             int32 step;
         } set_inc_phase;
         // ACTION_T_QUEST_EVENT_ALL                         = 26
-        struct  
+        struct
         {
             uint32 questId;
         } quest_event_all;
         // ACTION_T_CAST_EVENT_ALL                          = 27
-        struct  
+        struct
         {
             uint32 creatureId;
             uint32 spellId;
         } cast_event_all;
         // ACTION_T_REMOVEAURASFROMSPELL                    = 28
-        struct  
+        struct
         {
             uint32 target;
             uint32 spellId;
         } remove_aura;
         // ACTION_T_RANGED_MOVEMENT                         = 29
-        struct  
+        struct
         {
             uint32 distance;
             int32  angle;
         } ranged_movement;
         // ACTION_T_RANDOM_PHASE                            = 30
-        struct  
+        struct
         {
             uint32 phase1;
             uint32 phase2;
             uint32 phase3;
         } random_phase;
         // ACTION_T_RANDOM_PHASE_RANGE                      = 31
-        struct  
+        struct
         {
             uint32 phaseMin;
             uint32 phaseMax;
         } random_phase_range;
         // ACTION_T_SUMMON_ID                               = 32
-        struct  
+        struct
         {
             uint32 creatureId;
             uint32 target;
             uint32 spawnId;
         } summon_id;
         // ACTION_T_KILLED_MONSTER                          = 33
-        struct  
+        struct
         {
             uint32 creatureId;
             uint32 target;
         } killed_monster;
         // ACTION_T_SET_INST_DATA                           = 34
-        struct  
+        struct
         {
             uint32 field;
             uint32 value;
         } set_inst_data;
         // ACTION_T_SET_INST_DATA64                         = 35
-        struct  
+        struct
         {
             uint32 field;
             uint32 target;
         } set_inst_data64;
         // ACTION_T_UPDATE_TEMPLATE                         = 36
-        struct  
+        struct
         {
             uint32 creatureId;
             uint32 team;
@@ -364,6 +364,11 @@ struct CreatureEventAI_Action
         {
             uint32 radius;
         } call_for_help;
+        // ACTION_T_SET_SHEATH                              = 40
+        struct
+        {
+            uint32 sheath;
+        } set_sheath;
         // RAW
         struct
         {
@@ -497,7 +502,7 @@ struct CreatureEventAI_Event
         } receive_emote;
 
         // RAW
-        struct 
+        struct
         {
             uint32 param1;
             uint32 param2;
diff --git a/src/game/CreatureEventAIMgr.cpp b/src/game/CreatureEventAIMgr.cpp
index b3678dad6..5caaa2311 100644
--- a/src/game/CreatureEventAIMgr.cpp
+++ b/src/game/CreatureEventAIMgr.cpp
@@ -641,6 +641,13 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
                         if (!sCreatureStorage.LookupEntry<CreatureInfo>(action.update_template.creatureId))
                             sLog.outErrorDb("CreatureEventAI:  Event %u Action %u uses non-existant creature entry %u.", i, j+1, action.update_template.creatureId);
                         break;
+                    case ACTION_T_SET_SHEATH:
+                        if (action.set_sheath.sheath >= MAX_SHEATH_STATE)
+                        {
+                            sLog.outErrorDb("CreatureEventAI:  Event %u Action %u uses wrong sheath state %u.", i, j+1, action.set_sheath.sheath);
+                            action.set_sheath.sheath = SHEATH_STATE_UNARMED;
+                        }
+                        break;
                     case ACTION_T_EVADE:                    //No Params
                     case ACTION_T_FLEE_FOR_ASSIST:          //No Params
                     case ACTION_T_DIE:                      //No Params
diff --git a/src/game/GridNotifiers.h b/src/game/GridNotifiers.h
index b7b04ef5e..18de7f857 100644
--- a/src/game/GridNotifiers.h
+++ b/src/game/GridNotifiers.h
@@ -926,10 +926,10 @@ namespace MaNGOS
                     return false;
                 if(!u->CanAssistTo(i_obj,i_enemy))
                     return false;
-                    
+
                 if(!i_obj->IsWithinDistInMap(u, i_range))
                     return false;
-                
+
                 if(!i_obj->IsWithinLOSInMap(u))
                     return false;
 
diff --git a/src/game/Level1.cpp b/src/game/Level1.cpp
index 9c9623268..699cb275b 100644
--- a/src/game/Level1.cpp
+++ b/src/game/Level1.cpp
@@ -2000,7 +2000,7 @@ bool ChatHandler::HandleTeleNameCommand(const char * args)
     extractOptFirstArg((char*)args,&nameStr,&teleStr);
     if(!teleStr)
         return false;
-    
+
     Player* target;
     uint64 target_guid;
     std::string target_name;
diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp
index 3426b6bc3..aa1a392a3 100644
--- a/src/game/Level3.cpp
+++ b/src/game/Level3.cpp
@@ -3170,7 +3170,7 @@ bool ChatHandler::HandleLookupTaxiNodeCommand(const char * args)
 bool ChatHandler::HandleGuildCreateCommand(const char* args)
 {
     if(!*args)
-        return false; 
+        return false;
 
     // if not guild name only (in "") then player name
     Player* target;
@@ -3209,7 +3209,7 @@ bool ChatHandler::HandleGuildCreateCommand(const char* args)
 bool ChatHandler::HandleGuildInviteCommand(const char *args)
 {
     if(!*args)
-        return false; 
+        return false;
 
     // if not guild name only (in "") then player name
     uint64 target_guid;
diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp
index ed6656832..707b97061 100644
--- a/src/game/ObjectMgr.cpp
+++ b/src/game/ObjectMgr.cpp
@@ -491,6 +491,12 @@ void ObjectMgr::LoadCreatureTemplates()
                 continue;
             }
 
+            if(cInfo->unit_class != heroicInfo->unit_class)
+            {
+                sLog.outErrorDb("Creature (Entry: %u, class %u) has different `unit_class` in heroic mode (Entry: %u, class %u).",i, cInfo->unit_class, cInfo->HeroicEntry, heroicInfo->unit_class);
+                continue;
+            }
+
             if(cInfo->npcflag != heroicInfo->npcflag)
             {
                 sLog.outErrorDb("Creature (Entry: %u) has different `npcflag` in heroic mode (Entry: %u).",i,cInfo->HeroicEntry);
@@ -552,6 +558,9 @@ void ObjectMgr::LoadCreatureTemplates()
         if (!minfo)
             sLog.outErrorDb("Creature (Entry: %u) has non-existing modelId_H (%u)", cInfo->Entry, cInfo->DisplayID_H);
 
+        if (cInfo->unit_class && ((1 << (cInfo->unit_class-1)) & CLASSMASK_ALL_CREATURES) == 0)
+            sLog.outErrorDb("Creature (Entry: %u) has invalid unit_class(%u) for creature_template", cInfo->Entry, cInfo->unit_class);
+
         if(cInfo->dmgschool >= MAX_SPELL_SCHOOL)
         {
             sLog.outErrorDb("Creature (Entry: %u) has invalid spell school value (%u) in `dmgschool`",cInfo->Entry,cInfo->dmgschool);
diff --git a/src/game/Pet.cpp b/src/game/Pet.cpp
index 019f020a5..99e420e20 100644
--- a/src/game/Pet.cpp
+++ b/src/game/Pet.cpp
@@ -197,7 +197,7 @@ bool Pet::LoadPetFromDB( Player* owner, uint32 petentry, uint32 petnumber, bool
             break;
         case HUNTER_PET:
             SetUInt32Value(UNIT_FIELD_BYTES_0, 0x02020100);
-            SetByteValue(UNIT_FIELD_BYTES_2, 0, SHEATH_STATE_MELEE);
+            SetSheath(SHEATH_STATE_MELEE);
             SetByteValue(UNIT_FIELD_BYTES_2, 2, fields[9].GetBool() ? UNIT_RENAME_NOT_ALLOWED : UNIT_RENAME_ALLOWED);
 
             SetUInt32Value(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE);
@@ -783,7 +783,7 @@ bool Pet::CreateBaseAtCreature(Creature* creature)
     if(cinfo->type == CREATURE_TYPE_BEAST)
     {
         SetUInt32Value(UNIT_FIELD_BYTES_0, 0x02020100);
-        SetByteValue(UNIT_FIELD_BYTES_2, 0, SHEATH_STATE_MELEE );
+        SetSheath(SHEATH_STATE_MELEE);
         SetByteValue(UNIT_FIELD_BYTES_2, 2, UNIT_RENAME_ALLOWED);
         SetUInt32Value(UNIT_MOD_CAST_SPEED, creature->GetUInt32Value(UNIT_MOD_CAST_SPEED));
     }
@@ -1762,7 +1762,7 @@ bool Pet::Create(uint32 guidlow, Map *map, uint32 phaseMask, uint32 Entry, uint3
     if(!InitEntry(Entry))
         return false;
 
-    SetByteValue(UNIT_FIELD_BYTES_2, 0, SHEATH_STATE_MELEE);
+    SetSheath(SHEATH_STATE_MELEE);
 
     if(getPetType() == MINI_PET)                            // always non-attackable
         SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 3a315cbb3..76b6c6409 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -7906,7 +7906,7 @@ void Player::SetVirtualItemSlot( uint8 i, Item* item)
     }
 }
 
-void Player::SetSheath( uint32 sheathed )
+void Player::SetSheath( SheathState sheathed )
 {
     switch (sheathed)
     {
@@ -7932,7 +7932,7 @@ void Player::SetSheath( uint32 sheathed )
             SetVirtualItemSlot(2,NULL);
             break;
     }
-    SetByteValue(UNIT_FIELD_BYTES_2, 0, sheathed);          // this must visualize Sheath changing for other players...
+    Unit::SetSheath(sheathed);                              // this must visualize Sheath changing for other players...
 }
 
 uint8 Player::FindEquipSlot( ItemPrototype const* proto, uint32 slot, bool swap ) const
diff --git a/src/game/Player.h b/src/game/Player.h
index 54e5f8cdb..7d0858dda 100644
--- a/src/game/Player.h
+++ b/src/game/Player.h
@@ -1006,7 +1006,7 @@ class MANGOS_DLL_SPEC Player : public Unit
         /*********************************************************/
 
         void SetVirtualItemSlot( uint8 i, Item* item);
-        void SetSheath( uint32 sheathed );
+        void SetSheath( SheathState sheathed );             // overwrite Unit version
         uint8 FindEquipSlot( ItemPrototype const* proto, uint32 slot, bool swap ) const;
         uint32 GetItemCount( uint32 item, bool inBankAlso = false, Item* skipItem = NULL ) const;
         Item* GetItemByGuid( uint64 guid ) const;
diff --git a/src/game/SharedDefines.h b/src/game/SharedDefines.h
index 8234a9317..5e6b90b1c 100644
--- a/src/game/SharedDefines.h
+++ b/src/game/SharedDefines.h
@@ -89,6 +89,8 @@ enum Classes
     (1<<(CLASS_MAGE-1))   |(1<<(CLASS_WARLOCK-1))|(1<<(CLASS_DRUID-1)) | \
     (1<<(CLASS_DEATH_KNIGHT-1)) )
 
+#define CLASSMASK_ALL_CREATURES ((1<<(CLASS_WARRIOR-1)) | (1<<(CLASS_PALADIN-1)) | (1<<(CLASS_ROGUE-1)) | (1<<(CLASS_MAGE-1)) )
+
 #define CLASSMASK_WAND_USERS ((1<<(CLASS_PRIEST-1))|(1<<(CLASS_MAGE-1))|(1<<(CLASS_WARLOCK-1)))
 
 #define PLAYER_MAX_BATTLEGROUND_QUEUES 3
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index 523324a60..74e9446f3 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -3222,8 +3222,9 @@ void Aura::HandleModCharm(bool apply, bool Real)
                     CreatureInfo const *cinfo = ((Creature*)m_target)->GetCreatureInfo();
                     if(cinfo && cinfo->type == CREATURE_TYPE_DEMON)
                     {
+                        //does not appear to have relevance. Why code added initially? See note below at !apply
                         //to prevent client crash
-                        m_target->SetFlag(UNIT_FIELD_BYTES_0, 2048);
+                        //m_target->SetFlag(UNIT_FIELD_BYTES_0, 2048);
                         //just to enable stat window
                         charmInfo->SetPetNumber(objmgr.GeneratePetNumber(), true);
                         //if charmed two demons the same session, the 2nd gets the 1st one's name
@@ -3261,11 +3262,13 @@ void Aura::HandleModCharm(bool apply, bool Real)
                 // restore UNIT_FIELD_BYTES_0
                 if(cinfo && caster->GetTypeId() == TYPEID_PLAYER && caster->getClass() == CLASS_WARLOCK && cinfo->type == CREATURE_TYPE_DEMON)
                 {
-                    CreatureDataAddon const *cainfo = ((Creature*)m_target)->GetCreatureAddon();
+                    //does not appear to have relevance. Why code added initially? Class, gender, powertype should be same.
+                    //db field removed and replaced with better way to set class, restore using this if problems
+                    /*CreatureDataAddon const *cainfo = ((Creature*)m_target)->GetCreatureAddon();
                     if(cainfo && cainfo->bytes0 != 0)
                         m_target->SetUInt32Value(UNIT_FIELD_BYTES_0, cainfo->bytes0);
                     else
-                        m_target->RemoveFlag(UNIT_FIELD_BYTES_0, 2048);
+                        m_target->RemoveFlag(UNIT_FIELD_BYTES_0, 2048);*/
 
                     if(m_target->GetCharmInfo())
                         m_target->GetCharmInfo()->SetPetNumber(0, true);
diff --git a/src/game/StatSystem.cpp b/src/game/StatSystem.cpp
index 849f90575..8ca0ee1a8 100644
--- a/src/game/StatSystem.cpp
+++ b/src/game/StatSystem.cpp
@@ -796,18 +796,17 @@ void Creature::UpdateDamagePhysical(WeaponAttackType attType)
 
     UnitMods unitMod = UNIT_MOD_DAMAGE_MAINHAND;
 
-    float att_speed = float(GetAttackTime(BASE_ATTACK))/1000.0f;
-
-    float base_value  = GetModifierValue(unitMod, BASE_VALUE) + GetTotalAttackPowerValue(attType)/ 14.0f * att_speed;
+    float base_value  = GetModifierValue(unitMod, BASE_VALUE) + GetTotalAttackPowerValue(attType);
     float base_pct    = GetModifierValue(unitMod, BASE_PCT);
     float total_value = GetModifierValue(unitMod, TOTAL_VALUE);
     float total_pct   = GetModifierValue(unitMod, TOTAL_PCT);
+    float dmg_multiplier = GetCreatureInfo()->dmg_multiplier;
 
     float weapon_mindamage = GetWeaponDamageRange(BASE_ATTACK, MINDAMAGE);
     float weapon_maxdamage = GetWeaponDamageRange(BASE_ATTACK, MAXDAMAGE);
 
-    float mindamage = ((base_value + weapon_mindamage) * base_pct + total_value) * total_pct ;
-    float maxdamage = ((base_value + weapon_maxdamage) * base_pct + total_value) * total_pct ;
+    float mindamage = ((base_value + weapon_mindamage) * base_pct + total_value) * total_pct * dmg_multiplier;
+    float maxdamage = ((base_value + weapon_maxdamage) * base_pct + total_value) * total_pct * dmg_multiplier;
 
     SetStatFloatValue(UNIT_FIELD_MINDAMAGE, mindamage);
     SetStatFloatValue(UNIT_FIELD_MAXDAMAGE, maxdamage);
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 407314ed7..3883bbfb0 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -10420,7 +10420,7 @@ bool CharmInfo::AddSpellToActionBar(uint32 spell_id, ActiveStates newstate)
         }
     }
 
-    // or use empty slot in other case 
+    // or use empty slot in other case
     for(uint8 i = 0; i < MAX_UNIT_ACTION_BAR_INDEX; ++i)
     {
         if (!PetActionBar[i].SpellOrAction && PetActionBar[i].IsActionBarForSpell())
diff --git a/src/game/Unit.h b/src/game/Unit.h
index cc7627600..b54c96317 100644
--- a/src/game/Unit.h
+++ b/src/game/Unit.h
@@ -191,6 +191,8 @@ enum SheathState
     SHEATH_STATE_RANGED   = 2                               // prepared ranged weapon
 };
 
+#define MAX_SHEATH_STATE    3
+
 // byte (1 from 0..3) of UNIT_FIELD_BYTES_2
 enum UnitBytes2_Flags
 {
@@ -967,6 +969,9 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
         void ApplyAttackTimePercentMod(WeaponAttackType att,float val, bool apply);
         void ApplyCastTimePercentMod(float val, bool apply);
 
+        SheathState GetSheath() const { return SheathState(GetByteValue(UNIT_FIELD_BYTES_2, 0)); }
+        virtual void SetSheath( SheathState sheathed ) { SetByteValue(UNIT_FIELD_BYTES_2, 0, sheathed); }
+
         // faction template id
         uint32 getFaction() const { return GetUInt32Value(UNIT_FIELD_FACTIONTEMPLATE); }
         void setFaction(uint32 faction) { SetUInt32Value(UNIT_FIELD_FACTIONTEMPLATE, faction ); }
diff --git a/src/shared/Database/SQLStorage.cpp b/src/shared/Database/SQLStorage.cpp
index 9c552516d..06ffbee9f 100644
--- a/src/shared/Database/SQLStorage.cpp
+++ b/src/shared/Database/SQLStorage.cpp
@@ -25,11 +25,11 @@ extern DatabasePostgre  WorldDatabase;
 extern DatabaseMysql  WorldDatabase;
 #endif
 
-const char CreatureInfosrcfmt[]="iiiiiiiisssiiiiiiiiiiffiffiiiiiiiiiiiffiiiiiiiiiiiiiiiiiiisiiffliiiiiliiis";
-const char CreatureInfodstfmt[]="iiiiiiiisssiiiiiiiiiiffiffiiiiiiiiiiiffiiiiiiiiiiiiiiiiiiisiiffliiiiiliiii";
-const char CreatureDataAddonInfofmt[]="iiiiiiis";
+const char CreatureInfosrcfmt[]="iiiiiiiisssiiiiiiiiiiffiffiifiiiiiiiiiffiiiiiiiiiiiiiiiiiiisiiffliiiiiliiis";
+const char CreatureInfodstfmt[]="iiiiiiiisssiiiiiiiiiiffiffiifiiiiiiiiiffiiiiiiiiiiiiiiiiiiisiiffliiiiiliiii";
+const char CreatureDataAddonInfofmt[]="iiiiiis";
 const char CreatureModelfmt[]="iffbi";
-const char CreatureInfoAddonInfofmt[]="iiiiiiis";
+const char CreatureInfoAddonInfofmt[]="iiiiiis";
 const char EquipmentInfofmt[]="iiii";
 const char GameObjectInfosrcfmt[]="iiissssiifiiiiiiiiiiiiiiiiiiiiiiiiiiiis";
 const char GameObjectInfodstfmt[]="iiissssiifiiiiiiiiiiiiiiiiiiiiiiiiiiiii";
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index de1b34343..f19858cdd 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "7903"
+ #define REVISION_NR "7910"
 #endif // __REVISION_NR_H__