diff --git a/data/sql/updates/pending_db_world/rev_1481933990013483700.sql b/data/sql/updates/db_world/2017_05_01_00.sql
similarity index 95%
rename from data/sql/updates/pending_db_world/rev_1481933990013483700.sql
rename to data/sql/updates/db_world/2017_05_01_00.sql
index 5243dce90..449d0abcb 100644
--- a/data/sql/updates/pending_db_world/rev_1481933990013483700.sql
+++ b/data/sql/updates/db_world/2017_05_01_00.sql
@@ -1,3 +1,18 @@
+-- DB update 2017_03_04_20 -> 2017_05_01_00
+DROP PROCEDURE IF EXISTS `updateDb`;
+DELIMITER //
+CREATE PROCEDURE updateDb ()
+proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE';
+SELECT COUNT(*) INTO @COLEXISTS
+FROM information_schema.COLUMNS
+WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'version_db_world' AND COLUMN_NAME = '2017_03_04_20';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2017_03_04_20 2017_05_01_00 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1481933990013483700'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
 INSERT INTO version_db_world (`sql_rev`) VALUES ('1481933990013483700');
 
 UPDATE `creature_template` SET `ScriptName`='npc_scarlet_guard' WHERE `entry`=4295;
@@ -147,4 +162,12 @@ INSERT INTO `npc_text` (`ID`, `text0_0`) VALUES
 (100113, "The blade and Mograine were a singular entity. Do you understand? This act corrupted the blade and lead to Mograine's own corruption as a death knight of Kel'Thuzad. I swore that if I lived, I would expose the perpetrators of this heinous crime. For two days I remained under the rot and contagion of Scourge - gathering as much strength as possible to escape the razed city."),
 (100114, "Aye, I did. Much to the dismay of the lesser Mograine, I made my way back to the Scarlet Monastery. I shouted and screamed. I told the tale to any that would listen. And I would be murdered in cold blood for my actions, dragged to this chamber - the dark secret of the order. But some did listen... some heard my words. Thus was born the Argent Dawn..."),
 (100115, "I'm afraid that the blade which you hold in your hands is beyond saving. The hatred runs too deep. But do not lose hope, hero. Where one chapter has ended, a new one begins. $B Find his son - a more devout and pious man you may never meet.It is rumored that he is able to build the Ashbringer anew, without requiring the old, tainted blade."),
-(100116, "<High Inquisitor Fairbanks shakes his head.>\n\nNo, $C; only one of his sons is dead. The other lives...\n\n<High Inquisitor Fairbanks points to the sky>\n\nThe Outland... Find him there...");
\ No newline at end of file
+(100116, "<High Inquisitor Fairbanks shakes his head.>\n\nNo, $C; only one of his sons is dead. The other lives...\n\n<High Inquisitor Fairbanks points to the sky>\n\nThe Outland... Find him there...");--
+-- END UPDATING QUERIES
+--
+COMMIT;
+END;
+//
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/pending_db_world/rev_1489225360977584500.sql b/data/sql/updates/db_world/2017_05_01_01.sql
similarity index 64%
rename from data/sql/updates/pending_db_world/rev_1489225360977584500.sql
rename to data/sql/updates/db_world/2017_05_01_01.sql
index 2ce99ae4f..89f956e94 100644
--- a/data/sql/updates/pending_db_world/rev_1489225360977584500.sql
+++ b/data/sql/updates/db_world/2017_05_01_01.sql
@@ -1,3 +1,18 @@
+-- DB update 2017_05_01_00 -> 2017_05_01_01
+DROP PROCEDURE IF EXISTS `updateDb`;
+DELIMITER //
+CREATE PROCEDURE updateDb ()
+proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE';
+SELECT COUNT(*) INTO @COLEXISTS
+FROM information_schema.COLUMNS
+WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'version_db_world' AND COLUMN_NAME = '2017_05_01_00';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2017_05_01_00 2017_05_01_01 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1489225360977584500'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
 INSERT INTO version_db_world (`sql_rev`) VALUES ('1489225360977584500');
 
 -- Command disable
@@ -18,3 +33,12 @@ INSERT INTO `command` (`name`,`security`,`help`) VALUES
 ('disable remove spell',3,'Syntax: .disable remove spell $entry'),
 ('disable remove outdoorpvp',3,'Syntax: .disable remove outdoorpvp $entry'),
 ('disable remove vmap',3,'Syntax: .disable remove vmap $entry');
+--
+-- END UPDATING QUERIES
+--
+COMMIT;
+END;
+//
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_05_01_02.sql b/data/sql/updates/db_world/2017_05_01_02.sql
new file mode 100644
index 000000000..ec0a81888
--- /dev/null
+++ b/data/sql/updates/db_world/2017_05_01_02.sql
@@ -0,0 +1,42 @@
+-- DB update 2017_05_01_01 -> 2017_05_01_02
+DROP PROCEDURE IF EXISTS `updateDb`;
+DELIMITER //
+CREATE PROCEDURE updateDb ()
+proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE';
+SELECT COUNT(*) INTO @COLEXISTS
+FROM information_schema.COLUMNS
+WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'version_db_world' AND COLUMN_NAME = '2017_05_01_01';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2017_05_01_01 2017_05_01_02 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1489592591354258700'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+INSERT INTO version_db_world (`sql_rev`) VALUES ('1489592591354258700');
+DELETE FROM `item_loot_template` WHERE `Entry` IN (50301,54218);
+INSERT INTO `item_loot_template` (`Entry`,`Item`,`ChanceOrQuestChance`,`LootMode`,`GroupId`,`mincountOrRef`,`maxcount`) VALUES
+(50301,46779,36.36,1,1,50,50),
+(50301,35223,36.36,1,1,50,50),
+(50301,45047,27.28,1,1,50,50),
+(50301,32588,0.45,1,2,1,1),
+(50301,38050,0.45,1,2,1,1),
+(50301,34493,0.10,1,2,1,1),
+(54218,46779,36.36,1,1,50,50),
+(54218,35223,36.36,1,1,50,50),
+(54218,45047,27.28,1,1,50,50),
+(54218,23720,0.50,1,2,1,1),
+(54218,49284,0.30,1,2,1,1),
+(54218,49283,0.30,1,2,1,1),
+(54218,49286,0.30,1,2,1,1),
+(54218,49285,0.10,1,2,1,1),
+(54218,49282,0.20,1,2,1,1);
+--
+-- END UPDATING QUERIES
+--
+COMMIT;
+END;
+//
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_05_01_03.sql b/data/sql/updates/db_world/2017_05_01_03.sql
new file mode 100644
index 000000000..84222f015
--- /dev/null
+++ b/data/sql/updates/db_world/2017_05_01_03.sql
@@ -0,0 +1,36 @@
+-- DB update 2017_05_01_02 -> 2017_05_01_03
+DROP PROCEDURE IF EXISTS `updateDb`;
+DELIMITER //
+CREATE PROCEDURE updateDb ()
+proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE';
+SELECT COUNT(*) INTO @COLEXISTS
+FROM information_schema.COLUMNS
+WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'version_db_world' AND COLUMN_NAME = '2017_05_01_02';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2017_05_01_02 2017_05_01_03 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1490055987207415200'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+INSERT INTO version_db_world (`sql_rev`) VALUES ('1490055987207415200');
+-- DIFF `gameobject` of id 2040
+DELETE FROM `gameobject` WHERE (id = 2040) AND (guid IN (7304, 7321));
+
+-- DIFF `gameobject` of id 1732
+DELETE FROM `gameobject` WHERE (id = 1732) AND (guid IN (5503, 5535, 5666));
+
+-- DIFF `gameobject` of id 1734
+DELETE FROM `gameobject` WHERE (id = 1734) AND (guid IN (5907));
+
+-- DIFF `gameobject` of id 73941
+DELETE FROM `gameobject` WHERE (id = 73941) AND (guid IN (14685));
+--
+-- END UPDATING QUERIES
+--
+COMMIT;
+END;
+//
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2017_05_01_04.sql b/data/sql/updates/db_world/2017_05_01_04.sql
new file mode 100644
index 000000000..7e84f2f20
--- /dev/null
+++ b/data/sql/updates/db_world/2017_05_01_04.sql
@@ -0,0 +1,31 @@
+-- DB update 2017_05_01_03 -> 2017_05_01_04
+DROP PROCEDURE IF EXISTS `updateDb`;
+DELIMITER //
+CREATE PROCEDURE updateDb ()
+proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE';
+SELECT COUNT(*) INTO @COLEXISTS
+FROM information_schema.COLUMNS
+WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'version_db_world' AND COLUMN_NAME = '2017_05_01_03';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2017_05_01_03 2017_05_01_04 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1490714789186172000'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+INSERT INTO version_db_world (`sql_rev`) VALUES ('1490714789186172000');
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_gen_blade_warding';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(64440, 'spell_gen_blade_warding');
+
+-- no cooldown
+UPDATE `spell_proc` SET `Cooldown`=0 WHERE `SpellId`=64440;
+--
+-- END UPDATING QUERIES
+--
+COMMIT;
+END;
+//
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/pending_db_world/rev_1490985497792697600.sql b/data/sql/updates/db_world/2017_05_01_05.sql
similarity index 93%
rename from data/sql/updates/pending_db_world/rev_1490985497792697600.sql
rename to data/sql/updates/db_world/2017_05_01_05.sql
index 32e2a7739..b22bb3ce6 100644
--- a/data/sql/updates/pending_db_world/rev_1490985497792697600.sql
+++ b/data/sql/updates/db_world/2017_05_01_05.sql
@@ -1,3 +1,18 @@
+-- DB update 2017_05_01_04 -> 2017_05_01_05
+DROP PROCEDURE IF EXISTS `updateDb`;
+DELIMITER //
+CREATE PROCEDURE updateDb ()
+proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE';
+SELECT COUNT(*) INTO @COLEXISTS
+FROM information_schema.COLUMNS
+WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'version_db_world' AND COLUMN_NAME = '2017_05_01_04';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2017_05_01_04 2017_05_01_05 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1490985497792697600'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
 INSERT INTO version_db_world (`sql_rev`) VALUES ('1490985497792697600');
 
 -- Crusader Lamoof SAI
@@ -63,3 +78,12 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_
 (28136, 0, 15, 16, 61, 0, 100, 0, 0, 0, 0, 0, 53, 0, 28136, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Crusader Jonathan - On Waypoint 5 Reached - Start Waypoint (No Repeat)'),
 (28136, 0, 16, 0, 61, 0, 100, 0, 0, 0, 0, 0, 83, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Crusader Jonathan - On Waypoint 5 Reached - Remove Npc Flag Gossip (No Repeat)');
 
+--
+-- END UPDATING QUERIES
+--
+COMMIT;
+END;
+//
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/pending_db_world/rev_1489592591354258700.sql b/data/sql/updates/pending_db_world/rev_1489592591354258700.sql
deleted file mode 100644
index eb9751b89..000000000
--- a/data/sql/updates/pending_db_world/rev_1489592591354258700.sql
+++ /dev/null
@@ -1,18 +0,0 @@
-INSERT INTO version_db_world (`sql_rev`) VALUES ('1489592591354258700');
-DELETE FROM `item_loot_template` WHERE `Entry` IN (50301,54218);
-INSERT INTO `item_loot_template` (`Entry`,`Item`,`ChanceOrQuestChance`,`LootMode`,`GroupId`,`mincountOrRef`,`maxcount`) VALUES
-(50301,46779,36.36,1,1,50,50),
-(50301,35223,36.36,1,1,50,50),
-(50301,45047,27.28,1,1,50,50),
-(50301,32588,0.45,1,2,1,1),
-(50301,38050,0.45,1,2,1,1),
-(50301,34493,0.10,1,2,1,1),
-(54218,46779,36.36,1,1,50,50),
-(54218,35223,36.36,1,1,50,50),
-(54218,45047,27.28,1,1,50,50),
-(54218,23720,0.50,1,2,1,1),
-(54218,49284,0.30,1,2,1,1),
-(54218,49283,0.30,1,2,1,1),
-(54218,49286,0.30,1,2,1,1),
-(54218,49285,0.10,1,2,1,1),
-(54218,49282,0.20,1,2,1,1);
diff --git a/data/sql/updates/pending_db_world/rev_1490055987207415200.sql b/data/sql/updates/pending_db_world/rev_1490055987207415200.sql
deleted file mode 100644
index 0b026e073..000000000
--- a/data/sql/updates/pending_db_world/rev_1490055987207415200.sql
+++ /dev/null
@@ -1,12 +0,0 @@
-INSERT INTO version_db_world (`sql_rev`) VALUES ('1490055987207415200');
--- DIFF `gameobject` of id 2040
-DELETE FROM `gameobject` WHERE (id = 2040) AND (guid IN (7304, 7321));
-
--- DIFF `gameobject` of id 1732
-DELETE FROM `gameobject` WHERE (id = 1732) AND (guid IN (5503, 5535, 5666));
-
--- DIFF `gameobject` of id 1734
-DELETE FROM `gameobject` WHERE (id = 1734) AND (guid IN (5907));
-
--- DIFF `gameobject` of id 73941
-DELETE FROM `gameobject` WHERE (id = 73941) AND (guid IN (14685));
diff --git a/data/sql/updates/pending_db_world/rev_1490714789186172000.sql b/data/sql/updates/pending_db_world/rev_1490714789186172000.sql
deleted file mode 100644
index 3c8e01d2b..000000000
--- a/data/sql/updates/pending_db_world/rev_1490714789186172000.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-INSERT INTO version_db_world (`sql_rev`) VALUES ('1490714789186172000');
-DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_gen_blade_warding';
-INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
-(64440, 'spell_gen_blade_warding');
-
--- no cooldown
-UPDATE `spell_proc` SET `Cooldown`=0 WHERE `SpellId`=64440;