From 8e76b4772d64a3d91c6111fbcd67a17037f3549c Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Thu, 3 May 2018 22:30:45 +0000
Subject: [PATCH] Retail like builder messages. Adapted from: L2jUnity free
 files.

---
 .../dist/game/config/AdminCommands.xml        |  12 +-
 .../dist/game/config/General.ini              |   9 ++
 .../dist/game/data/html/admin/gm_menu.htm     |  10 +-
 .../data/scripts/handlers/MasterHandler.java  |   6 +
 .../L2PcInstanceActionShift.java              |   7 +-
 .../L2SummonActionShift.java                  |   7 +-
 .../admincommandhandlers/AdminEffects.java    |  33 -----
 .../admincommandhandlers/AdminGmSpeed.java    | 119 +++++++++++++++
 .../admincommandhandlers/AdminHide.java       |  87 +++++++++++
 .../admincommandhandlers/AdminMenu.java       |  19 +--
 .../admincommandhandlers/AdminSummon.java     |  29 +---
 .../admincommandhandlers/AdminSuperHaste.java |  92 ++++++++++++
 .../java/com/l2jmobius/Config.java            |   4 +
 .../handler/AdminCommandHandler.java          |  95 +++++++++++-
 .../model/actor/instance/L2PcInstance.java    |  50 +------
 .../network/clientpackets/DlgAnswer.java      |  17 +--
 .../network/clientpackets/EnterWorld.java     |  72 ++++++----
 .../clientpackets/RequestBypassToServer.java  |   3 +-
 .../clientpackets/RequestDestroyItem.java     |   3 +-
 .../RequestTutorialLinkHtml.java              |   3 +-
 .../RequestTutorialPassCmdToServer.java       |   3 +-
 .../clientpackets/SendBypassBuildCmd.java     |  33 +----
 .../network/clientpackets/UseItem.java        |   3 +-
 .../gameserver/util/BuilderUtil.java          |  72 ++++++++++
 .../util/TimeAmountInterpreter.java           | 136 ++++++++++++++++++
 .../dist/game/config/AdminCommands.xml        |  12 +-
 .../dist/game/config/General.ini              |   9 ++
 .../dist/game/data/html/admin/gm_menu.htm     |  10 +-
 .../data/scripts/handlers/MasterHandler.java  |   6 +
 .../L2PcInstanceActionShift.java              |   7 +-
 .../L2SummonActionShift.java                  |   7 +-
 .../admincommandhandlers/AdminEffects.java    |  33 -----
 .../admincommandhandlers/AdminGmSpeed.java    | 119 +++++++++++++++
 .../admincommandhandlers/AdminHide.java       |  87 +++++++++++
 .../admincommandhandlers/AdminMenu.java       |  19 +--
 .../admincommandhandlers/AdminSummon.java     |  29 +---
 .../admincommandhandlers/AdminSuperHaste.java |  92 ++++++++++++
 .../java/com/l2jmobius/Config.java            |   4 +
 .../handler/AdminCommandHandler.java          |  95 +++++++++++-
 .../model/actor/instance/L2PcInstance.java    |  50 +------
 .../network/clientpackets/DlgAnswer.java      |  17 +--
 .../network/clientpackets/EnterWorld.java     |  72 ++++++----
 .../clientpackets/RequestBypassToServer.java  |   3 +-
 .../clientpackets/RequestDestroyItem.java     |   3 +-
 .../RequestTutorialLinkHtml.java              |   3 +-
 .../RequestTutorialPassCmdToServer.java       |   3 +-
 .../clientpackets/SendBypassBuildCmd.java     |  33 +----
 .../network/clientpackets/UseItem.java        |   3 +-
 .../gameserver/util/BuilderUtil.java          |  72 ++++++++++
 .../util/TimeAmountInterpreter.java           | 136 ++++++++++++++++++
 .../dist/game/config/AdminCommands.xml        |  12 +-
 .../dist/game/config/General.ini              |   9 ++
 .../dist/game/data/html/admin/gm_menu.htm     |  10 +-
 .../data/scripts/handlers/MasterHandler.java  |   6 +
 .../L2PcInstanceActionShift.java              |   7 +-
 .../L2SummonActionShift.java                  |   7 +-
 .../admincommandhandlers/AdminEffects.java    |  33 -----
 .../admincommandhandlers/AdminGmSpeed.java    | 119 +++++++++++++++
 .../admincommandhandlers/AdminHide.java       |  87 +++++++++++
 .../admincommandhandlers/AdminMenu.java       |  19 +--
 .../admincommandhandlers/AdminSummon.java     |  29 +---
 .../admincommandhandlers/AdminSuperHaste.java |  92 ++++++++++++
 .../java/com/l2jmobius/Config.java            |   4 +
 .../handler/AdminCommandHandler.java          |  95 +++++++++++-
 .../model/actor/instance/L2PcInstance.java    |  50 +------
 .../network/clientpackets/DlgAnswer.java      |  17 +--
 .../network/clientpackets/EnterWorld.java     |  72 ++++++----
 .../clientpackets/RequestBypassToServer.java  |   3 +-
 .../clientpackets/RequestDestroyItem.java     |   3 +-
 .../RequestTutorialLinkHtml.java              |   3 +-
 .../RequestTutorialPassCmdToServer.java       |   3 +-
 .../clientpackets/SendBypassBuildCmd.java     |  33 +----
 .../network/clientpackets/UseItem.java        |   3 +-
 .../gameserver/util/BuilderUtil.java          |  72 ++++++++++
 .../util/TimeAmountInterpreter.java           | 136 ++++++++++++++++++
 .../dist/game/config/AdminCommands.xml        |  12 +-
 .../dist/game/config/General.ini              |   9 ++
 .../dist/game/data/html/admin/gm_menu.htm     |  10 +-
 .../data/scripts/handlers/MasterHandler.java  |   6 +
 .../L2PcInstanceActionShift.java              |   7 +-
 .../L2SummonActionShift.java                  |   7 +-
 .../admincommandhandlers/AdminEffects.java    |  33 -----
 .../admincommandhandlers/AdminGmSpeed.java    | 119 +++++++++++++++
 .../admincommandhandlers/AdminHide.java       |  87 +++++++++++
 .../admincommandhandlers/AdminMenu.java       |  19 +--
 .../admincommandhandlers/AdminSummon.java     |  29 +---
 .../admincommandhandlers/AdminSuperHaste.java |  92 ++++++++++++
 .../java/com/l2jmobius/Config.java            |   4 +
 .../handler/AdminCommandHandler.java          |  95 +++++++++++-
 .../model/actor/instance/L2PcInstance.java    |  50 +------
 .../network/clientpackets/DlgAnswer.java      |  17 +--
 .../network/clientpackets/EnterWorld.java     |  72 ++++++----
 .../clientpackets/RequestBypassToServer.java  |   3 +-
 .../clientpackets/RequestDestroyItem.java     |   3 +-
 .../RequestTutorialLinkHtml.java              |   3 +-
 .../RequestTutorialPassCmdToServer.java       |   3 +-
 .../clientpackets/SendBypassBuildCmd.java     |  33 +----
 .../network/clientpackets/UseItem.java        |   3 +-
 .../gameserver/util/BuilderUtil.java          |  72 ++++++++++
 .../util/TimeAmountInterpreter.java           | 136 ++++++++++++++++++
 .../sql/game/admin_command_access_rights.sql  |   7 +-
 .../dist/game/config/main/access.ini          |  23 ++-
 .../dist/game/data/html/admin/main_menu.htm   |  12 +-
 .../dist/game/data/html/admin/move.htm        |  12 +-
 .../java/com/l2jmobius/Config.java            |  34 +++--
 .../handler/AdminCommandHandler.java          |   6 +
 .../admincommandhandlers/AdminEffects.java    |  34 -----
 .../admincommandhandlers/AdminGmSpeed.java    | 133 +++++++++++++++++
 .../admincommandhandlers/AdminHide.java       |  87 +++++++++++
 .../admincommandhandlers/AdminSuperHaste.java |  97 +++++++++++++
 .../model/actor/instance/L2PcInstance.java    |  28 ++--
 .../gameserver/model/actor/stat/CharStat.java |  16 ++-
 .../network/clientpackets/EnterWorld.java     |  66 +++++----
 .../gameserver/util/BuilderUtil.java          |  67 +++++++++
 .../util/TimeAmountInterpreter.java           | 136 ++++++++++++++++++
 .../com/l2jmobius/gameserver/util/Util.java   |  63 ++++++++
 .../dist/game/config/AdminCommands.xml        |  12 +-
 .../dist/game/config/General.ini              |   9 ++
 .../dist/game/data/html/admin/gm_menu.htm     |  10 +-
 .../data/scripts/handlers/MasterHandler.java  |   6 +
 .../L2PcInstanceActionShift.java              |   7 +-
 .../L2SummonActionShift.java                  |   7 +-
 .../admincommandhandlers/AdminEffects.java    |  27 ----
 .../admincommandhandlers/AdminGmSpeed.java    | 109 ++++++++++++++
 .../admincommandhandlers/AdminHide.java       |  87 +++++++++++
 .../admincommandhandlers/AdminMenu.java       |  19 +--
 .../admincommandhandlers/AdminSummon.java     |  29 +---
 .../admincommandhandlers/AdminSuperHaste.java |  92 ++++++++++++
 .../java/com/l2jmobius/Config.java            |   4 +
 .../handler/AdminCommandHandler.java          |  95 +++++++++++-
 .../model/actor/instance/L2PcInstance.java    |   3 +-
 .../gameserver/model/actor/stat/CharStat.java |  15 +-
 .../network/clientpackets/DlgAnswer.java      |  16 +--
 .../network/clientpackets/EnterWorld.java     |  70 +++++----
 .../clientpackets/RequestBypassToServer.java  |  45 +-----
 .../clientpackets/SendBypassBuildCmd.java     |  33 +----
 .../gameserver/util/BuilderUtil.java          |  70 +++++++++
 .../util/TimeAmountInterpreter.java           | 136 ++++++++++++++++++
 .../dist/game/config/AdminCommands.xml        |  12 +-
 .../dist/game/config/General.ini              |   9 ++
 .../dist/game/data/html/admin/gm_menu.htm     |  10 +-
 .../data/scripts/handlers/MasterHandler.java  |   6 +
 .../L2PcInstanceActionShift.java              |   7 +-
 .../L2SummonActionShift.java                  |   7 +-
 .../admincommandhandlers/AdminEffects.java    |  33 -----
 .../admincommandhandlers/AdminGmSpeed.java    | 119 +++++++++++++++
 .../admincommandhandlers/AdminHide.java       |  87 +++++++++++
 .../admincommandhandlers/AdminMenu.java       |  19 +--
 .../admincommandhandlers/AdminSummon.java     |  29 +---
 .../admincommandhandlers/AdminSuperHaste.java |  92 ++++++++++++
 .../java/com/l2jmobius/Config.java            |   4 +
 .../handler/AdminCommandHandler.java          |  95 +++++++++++-
 .../model/actor/instance/L2PcInstance.java    |  50 +------
 .../network/clientpackets/DlgAnswer.java      |  17 +--
 .../network/clientpackets/EnterWorld.java     |  72 ++++++----
 .../clientpackets/RequestBypassToServer.java  |   3 +-
 .../clientpackets/RequestDestroyItem.java     |   3 +-
 .../RequestTutorialLinkHtml.java              |   3 +-
 .../RequestTutorialPassCmdToServer.java       |   3 +-
 .../clientpackets/SendBypassBuildCmd.java     |  33 +----
 .../network/clientpackets/UseItem.java        |   3 +-
 .../gameserver/util/BuilderUtil.java          |  72 ++++++++++
 .../util/TimeAmountInterpreter.java           | 136 ++++++++++++++++++
 .../dist/game/config/AdminCommands.xml        |  12 +-
 .../dist/game/config/General.ini              |   9 ++
 .../dist/game/data/html/admin/gm_menu.htm     |  10 +-
 .../data/scripts/handlers/MasterHandler.java  |   6 +
 .../L2PcInstanceActionShift.java              |   7 +-
 .../L2SummonActionShift.java                  |   7 +-
 .../admincommandhandlers/AdminEffects.java    |  33 -----
 .../admincommandhandlers/AdminGmSpeed.java    | 119 +++++++++++++++
 .../admincommandhandlers/AdminHide.java       |  87 +++++++++++
 .../admincommandhandlers/AdminMenu.java       |  19 +--
 .../admincommandhandlers/AdminSummon.java     |  29 +---
 .../admincommandhandlers/AdminSuperHaste.java |  92 ++++++++++++
 .../java/com/l2jmobius/Config.java            |   4 +
 .../handler/AdminCommandHandler.java          |  95 +++++++++++-
 .../model/actor/instance/L2PcInstance.java    |  50 +------
 .../network/clientpackets/DlgAnswer.java      |  17 +--
 .../network/clientpackets/EnterWorld.java     |  72 ++++++----
 .../clientpackets/RequestBypassToServer.java  |   3 +-
 .../clientpackets/RequestDestroyItem.java     |   3 +-
 .../RequestTutorialLinkHtml.java              |   3 +-
 .../RequestTutorialPassCmdToServer.java       |   3 +-
 .../clientpackets/SendBypassBuildCmd.java     |  33 +----
 .../network/clientpackets/UseItem.java        |   3 +-
 .../gameserver/util/BuilderUtil.java          |  72 ++++++++++
 .../util/TimeAmountInterpreter.java           | 136 ++++++++++++++++++
 188 files changed, 5621 insertions(+), 1645 deletions(-)
 create mode 100644 L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmSpeed.java
 create mode 100644 L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminHide.java
 create mode 100644 L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminSuperHaste.java
 create mode 100644 L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/BuilderUtil.java
 create mode 100644 L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/TimeAmountInterpreter.java
 create mode 100644 L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmSpeed.java
 create mode 100644 L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminHide.java
 create mode 100644 L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminSuperHaste.java
 create mode 100644 L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/BuilderUtil.java
 create mode 100644 L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/TimeAmountInterpreter.java
 create mode 100644 L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmSpeed.java
 create mode 100644 L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminHide.java
 create mode 100644 L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminSuperHaste.java
 create mode 100644 L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/BuilderUtil.java
 create mode 100644 L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/TimeAmountInterpreter.java
 create mode 100644 L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmSpeed.java
 create mode 100644 L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminHide.java
 create mode 100644 L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminSuperHaste.java
 create mode 100644 L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/util/BuilderUtil.java
 create mode 100644 L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/util/TimeAmountInterpreter.java
 create mode 100644 L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminGmSpeed.java
 create mode 100644 L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminHide.java
 create mode 100644 L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminSuperHaste.java
 create mode 100644 L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/util/BuilderUtil.java
 create mode 100644 L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/util/TimeAmountInterpreter.java
 create mode 100644 L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmSpeed.java
 create mode 100644 L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminHide.java
 create mode 100644 L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSuperHaste.java
 create mode 100644 L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/BuilderUtil.java
 create mode 100644 L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/TimeAmountInterpreter.java
 create mode 100644 L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmSpeed.java
 create mode 100644 L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminHide.java
 create mode 100644 L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminSuperHaste.java
 create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/BuilderUtil.java
 create mode 100644 L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/TimeAmountInterpreter.java
 create mode 100644 L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmSpeed.java
 create mode 100644 L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminHide.java
 create mode 100644 L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminSuperHaste.java
 create mode 100644 L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/util/BuilderUtil.java
 create mode 100644 L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/util/TimeAmountInterpreter.java

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/config/AdminCommands.xml b/L2J_Mobius_1.0_Ertheia/dist/game/config/AdminCommands.xml
index 14882ea07a..8b4096bd34 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/config/AdminCommands.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/config/AdminCommands.xml
@@ -158,8 +158,6 @@
 	<admin command="admin_earthquake_menu" accessLevel="100" />
 	<admin command="admin_bighead" accessLevel="100" />
 	<admin command="admin_shrinkhead" accessLevel="100" />
-	<admin command="admin_gmspeed" accessLevel="100" />
-	<admin command="admin_gmspeed_menu" accessLevel="100" />
 	<admin command="admin_unpara_all" accessLevel="100" />
 	<admin command="admin_para_all" accessLevel="100" />
 	<admin command="admin_unpara" accessLevel="100" />
@@ -189,6 +187,13 @@
 	<admin command="admin_set_displayeffect_menu" accessLevel="100" />
 	<admin command="admin_playmovie" accessLevel="100" />
 
+	<!-- ADMIN SPEED -->
+	<admin command="admin_gmspeed" accessLevel="100" />
+	<admin command="admin_superhaste" accessLevel="100" />
+	<admin command="admin_superhaste_menu" accessLevel="100" />
+	<admin command="admin_speed" accessLevel="100" />
+	<admin command="admin_speed_menu" accessLevel="100" />
+	
 	<!-- ADMIN ELEMENT -->
 	<admin command="admin_setlh" accessLevel="100" />
 	<admin command="admin_setlc" accessLevel="100" />
@@ -615,4 +620,7 @@
 	<admin command="banchat" accessLevel="100" />
 	<admin command="debug" accessLevel="100" />
 	<admin command="unbanchat" accessLevel="100" />
+
+	<!-- HIDE -->
+	<admin command="admin_hide" accessLevel="100" />
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/config/General.ini b/L2J_Mobius_1.0_Ertheia/dist/game/config/General.ini
index 5d0c257de2..8bf34b3e81 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/config/General.ini
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/config/General.ini
@@ -25,6 +25,10 @@ ServerGMOnly = False
 # Default: False
 GMHeroAura = False
 
+# Whether GM logins in builder hide mode by default.
+# Default: True
+GMStartupBuilderHide = True
+
 # Auto set invulnerable status to a GM on login.
 # Default: False
 GMStartupInvulnerable = True
@@ -79,6 +83,11 @@ GMGiveSpecialSkills = False
 # Default: False
 GMGiveSpecialAuraSkills = False
 
+# In case you are not satisfied with the retail-like implementation of //gmspeed",
+# with this config you can rollback it to the old custom L2J version of the GM Speed.
+# Default: False
+UseSuperHasteAsGMSpeed = False
+
 
 # ---------------------------------------------------------------------------
 # Server Security
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/gm_menu.htm b/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/gm_menu.htm
index ffe3e3d025..5a8f77eaba 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/gm_menu.htm
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/gm_menu.htm
@@ -38,11 +38,11 @@
 </table><br1>
 <table width=270><tr>
 <td><font color="LEVEL">Super Haste:</font></td>
-<td><button value="1" action="bypass -h admin_gmspeed_menu 1" width=35 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="2" action="bypass -h admin_gmspeed_menu 2" width=35 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="3" action="bypass -h admin_gmspeed_menu 3" width=35 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="4" action="bypass -h admin_gmspeed_menu 4" width=35 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="Off" action="bypass -h admin_gmspeed_menu 0" width=35 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="1" action="bypass -h admin_superhaste 1" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="2" action="bypass -h admin_superhaste 2" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="3" action="bypass -h admin_superhaste 3" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="4" action="bypass -h admin_superhaste 4" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="Off" action="bypass -h admin_superhaste 0" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr></table><br>
 <center><multiedit var="new_announcement" width=250 height=50></center>
 <table width="160"><tr>
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/MasterHandler.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/MasterHandler.java
index 920e4b5023..bd1994f812 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/MasterHandler.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/MasterHandler.java
@@ -84,9 +84,11 @@ import handlers.admincommandhandlers.AdminFortSiege;
 import handlers.admincommandhandlers.AdminGeodata;
 import handlers.admincommandhandlers.AdminGm;
 import handlers.admincommandhandlers.AdminGmChat;
+import handlers.admincommandhandlers.AdminGmSpeed;
 import handlers.admincommandhandlers.AdminGraciaSeeds;
 import handlers.admincommandhandlers.AdminGrandBoss;
 import handlers.admincommandhandlers.AdminHeal;
+import handlers.admincommandhandlers.AdminHide;
 import handlers.admincommandhandlers.AdminHtml;
 import handlers.admincommandhandlers.AdminHwid;
 import handlers.admincommandhandlers.AdminInstance;
@@ -126,6 +128,7 @@ import handlers.admincommandhandlers.AdminShutdown;
 import handlers.admincommandhandlers.AdminSkill;
 import handlers.admincommandhandlers.AdminSpawn;
 import handlers.admincommandhandlers.AdminSummon;
+import handlers.admincommandhandlers.AdminSuperHaste;
 import handlers.admincommandhandlers.AdminTarget;
 import handlers.admincommandhandlers.AdminTargetSay;
 import handlers.admincommandhandlers.AdminTeleport;
@@ -413,9 +416,11 @@ public class MasterHandler
 			AdminGeodata.class,
 			AdminGm.class,
 			AdminGmChat.class,
+			AdminGmSpeed.class,
 			AdminGraciaSeeds.class,
 			AdminGrandBoss.class,
 			AdminHeal.class,
+			AdminHide.class,
 			AdminHtml.class,
 			AdminHwid.class,
 			AdminInstance.class,
@@ -455,6 +460,7 @@ public class MasterHandler
 			AdminSkill.class,
 			AdminSpawn.class,
 			AdminSummon.class,
+			AdminSuperHaste.class,
 			AdminTarget.class,
 			AdminTargetSay.class,
 			AdminTeleport.class,
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/actionshifthandlers/L2PcInstanceActionShift.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/actionshifthandlers/L2PcInstanceActionShift.java
index 6b1bb7ac43..72c01c3cf8 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/actionshifthandlers/L2PcInstanceActionShift.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/actionshifthandlers/L2PcInstanceActionShift.java
@@ -19,7 +19,6 @@ package handlers.actionshifthandlers;
 import com.l2jmobius.gameserver.enums.InstanceType;
 import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.IActionShiftHandler;
-import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 
@@ -37,11 +36,7 @@ public class L2PcInstanceActionShift implements IActionShiftHandler
 				activeChar.setTarget(target);
 			}
 			
-			final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler("admin_character_info");
-			if (ach != null)
-			{
-				ach.useAdminCommand("admin_character_info " + target.getName(), activeChar);
-			}
+			AdminCommandHandler.getInstance().useAdminCommand(activeChar, "admin_character_info " + target.getName(), true);
 		}
 		return true;
 	}
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/actionshifthandlers/L2SummonActionShift.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/actionshifthandlers/L2SummonActionShift.java
index 67d403c9b3..6ee8a1173e 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/actionshifthandlers/L2SummonActionShift.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/actionshifthandlers/L2SummonActionShift.java
@@ -19,7 +19,6 @@ package handlers.actionshifthandlers;
 import com.l2jmobius.gameserver.enums.InstanceType;
 import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.IActionShiftHandler;
-import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 
@@ -36,11 +35,7 @@ public class L2SummonActionShift implements IActionShiftHandler
 				activeChar.setTarget(target);
 			}
 			
-			final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler("admin_summon_info");
-			if (ach != null)
-			{
-				ach.useAdminCommand("admin_summon_info", activeChar);
-			}
+			AdminCommandHandler.getInstance().useAdminCommand(activeChar, "admin_summon_info", true);
 		}
 		return true;
 	}
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
index 6c2b00db74..467875568d 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
@@ -19,7 +19,6 @@ package handlers.admincommandhandlers;
 import java.util.Arrays;
 import java.util.StringTokenizer;
 
-import com.l2jmobius.gameserver.data.xml.impl.SkillData;
 import com.l2jmobius.gameserver.enums.Movie;
 import com.l2jmobius.gameserver.enums.Team;
 import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
@@ -34,7 +33,6 @@ import com.l2jmobius.gameserver.model.html.PageBuilder;
 import com.l2jmobius.gameserver.model.html.PageResult;
 import com.l2jmobius.gameserver.model.html.styles.ButtonsStyle;
 import com.l2jmobius.gameserver.model.skills.AbnormalVisualEffect;
-import com.l2jmobius.gameserver.model.skills.Skill;
 import com.l2jmobius.gameserver.network.SystemMessageId;
 import com.l2jmobius.gameserver.network.serverpackets.Earthquake;
 import com.l2jmobius.gameserver.network.serverpackets.ExRedSky;
@@ -81,8 +79,6 @@ public class AdminEffects implements IAdminCommandHandler
 		"admin_earthquake_menu",
 		"admin_bighead",
 		"admin_shrinkhead",
-		"admin_gmspeed",
-		"admin_gmspeed_menu",
 		"admin_unpara_all",
 		"admin_para_all",
 		"admin_unpara",
@@ -351,35 +347,6 @@ public class AdminEffects implements IAdminCommandHandler
 			{
 			}
 		}
-		else if (command.startsWith("admin_gmspeed"))
-		{
-			try
-			{
-				final int val = Integer.parseInt(st.nextToken());
-				final boolean sendMessage = activeChar.isAffectedBySkill(7029);
-				activeChar.stopSkillEffects((val == 0) && sendMessage, 7029);
-				if ((val >= 1) && (val <= 4))
-				{
-					int time = 0;
-					if (st.hasMoreTokens())
-					{
-						time = Integer.parseInt(st.nextToken());
-					}
-					
-					final Skill gmSpeedSkill = SkillData.getInstance().getSkill(7029, val);
-					gmSpeedSkill.applyEffects(activeChar, activeChar, true, time);
-				}
-			}
-			catch (Exception e)
-			{
-				activeChar.sendMessage("Usage: //gmspeed <Effect level (0-4)> <Time in seconds>");
-			}
-			if (command.contains("_menu"))
-			{
-				command = "";
-				AdminHtml.showAdminHtml(activeChar, "gm_menu.htm");
-			}
-		}
 		else if (command.startsWith("admin_polyself"))
 		{
 			try
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmSpeed.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmSpeed.java
new file mode 100644
index 0000000000..5ab5f39a9b
--- /dev/null
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmSpeed.java
@@ -0,0 +1,119 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.admincommandhandlers;
+
+import java.util.EnumSet;
+import java.util.Set;
+import java.util.StringTokenizer;
+
+import com.l2jmobius.Config;
+import com.l2jmobius.gameserver.handler.AdminCommandHandler;
+import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
+import com.l2jmobius.gameserver.model.L2Object;
+import com.l2jmobius.gameserver.model.actor.L2Character;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.model.stats.Stats;
+import com.l2jmobius.gameserver.util.BuilderUtil;
+import com.l2jmobius.gameserver.util.Util;
+
+/**
+ * A retail-like implementation of //gmspeed builder command.
+ * @author lord_rex
+ */
+public final class AdminGmSpeed implements IAdminCommandHandler
+{
+	private static final String[] ADMIN_COMMANDS =
+	{
+		"admin_gmspeed",
+	};
+	
+	private static final Set<Stats> SPEED_STATS = EnumSet.of(Stats.RUN_SPEED, Stats.WALK_SPEED, Stats.SWIM_RUN_SPEED, Stats.SWIM_WALK_SPEED, Stats.FLY_RUN_SPEED, Stats.FLY_WALK_SPEED);
+	
+	@Override
+	public boolean useAdminCommand(String command, L2PcInstance player)
+	{
+		final StringTokenizer st = new StringTokenizer(command);
+		final String cmd = st.nextToken();
+		
+		if (cmd.equals("admin_gmspeed"))
+		{
+			if (!st.hasMoreTokens())
+			{
+				BuilderUtil.sendSysMessage(player, "//gmspeed [0...10]");
+				return false;
+			}
+			final String token = st.nextToken();
+			
+			// Rollback feature for old custom way, in order to make everyone happy.
+			if (Config.USE_SUPER_HASTE_AS_GM_SPEED)
+			{
+				AdminCommandHandler.getInstance().useAdminCommand(player, AdminSuperHaste.ADMIN_COMMANDS[0] + " " + token, false);
+				return true;
+			}
+			
+			if (!Util.isDouble(token))
+			{
+				BuilderUtil.sendSysMessage(player, "//gmspeed [0...10]");
+				return false;
+			}
+			final double runSpeedBoost = Double.parseDouble(token);
+			if ((runSpeedBoost < 0) || (runSpeedBoost > 10))
+			{
+				// Custom limit according to SDW's request - real retail limit is unknown.
+				BuilderUtil.sendSysMessage(player, "//gmspeed [0...10]");
+				return false;
+			}
+			
+			final L2Character targetCharacter;
+			final L2Object target = player.getTarget();
+			if ((target != null) && target.isCharacter())
+			{
+				targetCharacter = (L2Character) target;
+			}
+			else
+			{
+				// If there is no target, let's use the command executer.
+				targetCharacter = player;
+			}
+			
+			SPEED_STATS.forEach(speedStat -> targetCharacter.getStat().removeFixedValue(speedStat));
+			if (runSpeedBoost > 0)
+			{
+				SPEED_STATS.forEach(speedStat -> targetCharacter.getStat().addFixedValue(speedStat, targetCharacter.getTemplate().getBaseValue(speedStat, 120) * runSpeedBoost));
+			}
+			
+			targetCharacter.getStat().recalculateStats(false);
+			if (targetCharacter.isPlayer())
+			{
+				((L2PcInstance) targetCharacter).broadcastUserInfo();
+			}
+			else
+			{
+				targetCharacter.broadcastInfo();
+			}
+			
+			BuilderUtil.sendSysMessage(player, "[" + targetCharacter.getName() + "] speed is [" + (runSpeedBoost * 100) + "0]% fast.");
+		}
+		return true;
+	}
+	
+	@Override
+	public String[] getAdminCommandList()
+	{
+		return ADMIN_COMMANDS;
+	}
+}
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminHide.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminHide.java
new file mode 100644
index 0000000000..600cbe1639
--- /dev/null
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminHide.java
@@ -0,0 +1,87 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.admincommandhandlers;
+
+import java.util.StringTokenizer;
+
+import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.util.BuilderUtil;
+
+/**
+ * @author lord_rex
+ */
+public final class AdminHide implements IAdminCommandHandler
+{
+	private static final String[] ADMIN_COMMANDS =
+	{
+		"admin_hide"
+	};
+	
+	@Override
+	public boolean useAdminCommand(String command, L2PcInstance player)
+	{
+		final StringTokenizer st = new StringTokenizer(command);
+		st.nextToken();
+		
+		try
+		{
+			final String param = st.nextToken();
+			switch (param)
+			{
+				case "on":
+				{
+					if (!BuilderUtil.setHiding(player, true))
+					{
+						BuilderUtil.sendSysMessage(player, "Currently, you cannot be seen.");
+						return true;
+					}
+					
+					BuilderUtil.sendSysMessage(player, "Now, you cannot be seen.");
+					return true;
+				}
+				case "off":
+				{
+					if (!BuilderUtil.setHiding(player, false))
+					{
+						BuilderUtil.sendSysMessage(player, "Currently, you can be seen.");
+						return true;
+					}
+					
+					BuilderUtil.sendSysMessage(player, "Now, you can be seen.");
+					return true;
+				}
+				default:
+				{
+					BuilderUtil.sendSysMessage(player, "//hide [on|off]");
+					return true;
+				}
+			}
+		}
+		catch (final Exception e)
+		{
+			BuilderUtil.sendSysMessage(player, "//hide [on|off]");
+			return true;
+		}
+	}
+	
+	@Override
+	public String[] getAdminCommandList()
+	{
+		return ADMIN_COMMANDS;
+	}
+}
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java
index 5ab19d4b39..8c735f4265 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java
@@ -21,7 +21,6 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.gameserver.data.xml.impl.AdminData;
 import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.model.L2Clan;
@@ -187,14 +186,7 @@ public class AdminMenu implements IAdminCommandHandler
 			if (st.countTokens() > 1)
 			{
 				final String subCommand = "admin_ban_char";
-				if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel()))
-				{
-					activeChar.sendMessage("You don't have the access right to use this command!");
-					LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!");
-					return false;
-				}
-				final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand);
-				ach.useAdminCommand(subCommand + command.substring(14), activeChar);
+				AdminCommandHandler.getInstance().useAdminCommand(activeChar, subCommand + command.substring(14), true);
 			}
 			showMainPage(activeChar);
 		}
@@ -204,14 +196,7 @@ public class AdminMenu implements IAdminCommandHandler
 			if (st.countTokens() > 1)
 			{
 				final String subCommand = "admin_unban_char";
-				if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel()))
-				{
-					activeChar.sendMessage("You don't have the access right to use this command!");
-					LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!");
-					return false;
-				}
-				final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand);
-				ach.useAdminCommand(subCommand + command.substring(16), activeChar);
+				AdminCommandHandler.getInstance().useAdminCommand(activeChar, subCommand + command.substring(16), true);
 			}
 			showMainPage(activeChar);
 		}
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java
index a818e7f3d3..f27d63e949 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java
@@ -16,9 +16,6 @@
  */
 package handlers.admincommandhandlers;
 
-import java.util.logging.Logger;
-
-import com.l2jmobius.gameserver.data.xml.impl.AdminData;
 import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -28,8 +25,6 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
  */
 public class AdminSummon implements IAdminCommandHandler
 {
-	private static final Logger LOGGER = Logger.getLogger(AdminSummon.class.getName());
-	
 	public static final String[] ADMIN_COMMANDS =
 	{
 		"admin_summon"
@@ -62,34 +57,24 @@ public class AdminSummon implements IAdminCommandHandler
 			return false;
 		}
 		
-		String subCommand;
+		final String subCommand;
 		if (id < 1000000)
 		{
 			subCommand = "admin_create_item";
-			if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel()))
-			{
-				activeChar.sendMessage("You don't have the access right to use this command!");
-				LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!");
-				return false;
-			}
-			final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand);
-			ach.useAdminCommand(subCommand + " " + id + " " + count, activeChar);
 		}
 		else
 		{
 			subCommand = "admin_spawn_once";
-			if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel()))
-			{
-				activeChar.sendMessage("You don't have the access right to use this command!");
-				LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!");
-				return false;
-			}
-			final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand);
 			
 			activeChar.sendMessage("This is only a temporary spawn.  The mob(s) will NOT respawn.");
 			id -= 1000000;
-			ach.useAdminCommand(subCommand + " " + id + " " + count, activeChar);
 		}
+		
+		if ((id > 0) && (count > 0))
+		{
+			AdminCommandHandler.getInstance().useAdminCommand(activeChar, subCommand + " " + id + " " + count, true);
+		}
+		
 		return true;
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminSuperHaste.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminSuperHaste.java
new file mode 100644
index 0000000000..4a3eb0c809
--- /dev/null
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminSuperHaste.java
@@ -0,0 +1,92 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.admincommandhandlers;
+
+import java.util.StringTokenizer;
+
+import com.l2jmobius.gameserver.data.xml.impl.SkillData;
+import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.model.skills.Skill;
+
+/**
+ * The classical custom L2J implementation of the old //gmspeed GM command.
+ * @author lord_rex (No, it wasn't me at all. Eclipse added my name there.)
+ */
+public final class AdminSuperHaste implements IAdminCommandHandler
+{
+	public static final String[] ADMIN_COMMANDS =
+	{
+		"admin_superhaste",
+		"admin_superhaste_menu",
+		"admin_speed",
+		"admin_speed_menu",
+	};
+	
+	private static final int SUPER_HASTE_ID = 7029;
+	
+	@Override
+	public boolean useAdminCommand(String command, L2PcInstance player)
+	{
+		final StringTokenizer st = new StringTokenizer(command);
+		final String cmd = st.nextToken();
+		switch (cmd)
+		{
+			case "admin_superhaste":
+			case "admin_speed":
+			{
+				try
+				{
+					final int val = Integer.parseInt(st.nextToken());
+					final boolean sendMessage = player.isAffectedBySkill(SUPER_HASTE_ID);
+					player.stopSkillEffects((val == 0) && sendMessage, SUPER_HASTE_ID);
+					if ((val >= 1) && (val <= 4))
+					{
+						int time = 0;
+						if (st.hasMoreTokens())
+						{
+							time = Integer.parseInt(st.nextToken());
+						}
+						
+						final Skill superHasteSkill = SkillData.getInstance().getSkill(SUPER_HASTE_ID, val);
+						superHasteSkill.applyEffects(player, player, true, time);
+					}
+				}
+				catch (final Exception e)
+				{
+					player.sendMessage("Usage: //superhaste <Effect level (0-4)> <Time in seconds>");
+				}
+				
+				break;
+			}
+			case "admin_superhaste_menu":
+			case "admin_speed_menu":
+			{
+				AdminHtml.showAdminHtml(player, "gm_menu.htm");
+				break;
+			}
+		}
+		
+		return true;
+	}
+	
+	@Override
+	public String[] getAdminCommandList()
+	{
+		return ADMIN_COMMANDS;
+	}
+}
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/Config.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/Config.java
index 1ce14e1091..dfa4fd730d 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/Config.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/Config.java
@@ -394,6 +394,7 @@ public final class Config
 	public static int DEFAULT_ACCESS_LEVEL;
 	public static boolean SERVER_GMONLY;
 	public static boolean GM_HERO_AURA;
+	public static boolean GM_STARTUP_BUILDER_HIDE;
 	public static boolean GM_STARTUP_INVULNERABLE;
 	public static boolean GM_STARTUP_INVISIBLE;
 	public static boolean GM_STARTUP_SILENCE;
@@ -407,6 +408,7 @@ public final class Config
 	public static boolean GM_CRITANNOUNCER_NAME;
 	public static boolean GM_GIVE_SPECIAL_SKILLS;
 	public static boolean GM_GIVE_SPECIAL_AURA_SKILLS;
+	public static boolean USE_SUPER_HASTE_AS_GM_SPEED;
 	public static boolean GAMEGUARD_ENFORCE;
 	public static boolean GAMEGUARD_PROHIBITACTION;
 	public static boolean LOG_CHAT;
@@ -1799,6 +1801,7 @@ public final class Config
 			DEFAULT_ACCESS_LEVEL = General.getInt("DefaultAccessLevel", 0);
 			SERVER_GMONLY = General.getBoolean("ServerGMOnly", false);
 			GM_HERO_AURA = General.getBoolean("GMHeroAura", false);
+			GM_STARTUP_BUILDER_HIDE = General.getBoolean("GMStartupBuilderHide", false);
 			GM_STARTUP_INVULNERABLE = General.getBoolean("GMStartupInvulnerable", false);
 			GM_STARTUP_INVISIBLE = General.getBoolean("GMStartupInvisible", false);
 			GM_STARTUP_SILENCE = General.getBoolean("GMStartupSilence", false);
@@ -1812,6 +1815,7 @@ public final class Config
 			GM_CRITANNOUNCER_NAME = General.getBoolean("GMShowCritAnnouncerName", false);
 			GM_GIVE_SPECIAL_SKILLS = General.getBoolean("GMGiveSpecialSkills", false);
 			GM_GIVE_SPECIAL_AURA_SKILLS = General.getBoolean("GMGiveSpecialAuraSkills", false);
+			USE_SUPER_HASTE_AS_GM_SPEED = General.getBoolean("UseSuperHasteAsGMSpeed", false);
 			GAMEGUARD_ENFORCE = General.getBoolean("GameGuardEnforce", false);
 			GAMEGUARD_PROHIBITACTION = General.getBoolean("GameGuardProhibitAction", false);
 			LOG_CHAT = General.getBoolean("LogChat", false);
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
index adf6462b78..c4faf3bd6d 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
@@ -18,12 +18,26 @@ package com.l2jmobius.gameserver.handler;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.logging.Logger;
+
+import com.l2jmobius.Config;
+import com.l2jmobius.commons.concurrent.ThreadPool;
+import com.l2jmobius.gameserver.data.xml.impl.AdminData;
+import com.l2jmobius.gameserver.enums.PlayerAction;
+import com.l2jmobius.gameserver.model.L2Object;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.SystemMessageId;
+import com.l2jmobius.gameserver.network.serverpackets.ConfirmDlg;
+import com.l2jmobius.gameserver.util.GMAudit;
+import com.l2jmobius.gameserver.util.TimeAmountInterpreter;
 
 /**
  * @author UnAfraid
  */
 public class AdminCommandHandler implements IHandler<IAdminCommandHandler, String>
 {
+	private static final Logger LOGGER = Logger.getLogger(AdminCommandHandler.class.getName());
+	
 	private final Map<String, IAdminCommandHandler> _datatable;
 	
 	protected AdminCommandHandler()
@@ -49,10 +63,85 @@ public class AdminCommandHandler implements IHandler<IAdminCommandHandler, Strin
 		}
 	}
 	
+	/**
+	 * WARNING: Please use {@link #useAdminCommand(L2PcInstance, String, boolean)} instead.
+	 */
 	@Override
 	public IAdminCommandHandler getHandler(String adminCommand)
 	{
-		return _datatable.get(adminCommand.contains(" ") ? adminCommand.substring(0, adminCommand.indexOf(" ")) : adminCommand);
+		String command = adminCommand;
+		if (adminCommand.contains(" "))
+		{
+			command = adminCommand.substring(0, adminCommand.indexOf(" "));
+		}
+		return _datatable.get(command);
+	}
+	
+	public void useAdminCommand(L2PcInstance player, String fullCommand, boolean useConfirm)
+	{
+		final String command = fullCommand.split(" ")[0];
+		final String commandNoPrefix = command.substring(6);
+		
+		final IAdminCommandHandler handler = getHandler(command);
+		if (handler == null)
+		{
+			if (player.isGM())
+			{
+				player.sendMessage("The command '" + commandNoPrefix + "' does not exist!");
+			}
+			LOGGER.warning("No handler registered for admin command '" + command + "'");
+			return;
+		}
+		
+		if (!AdminData.getInstance().hasAccess(command, player.getAccessLevel()))
+		{
+			player.sendMessage("You don't have the access rights to use this command!");
+			LOGGER.warning("Player " + player.getName() + " tried to use admin command '" + command + "', without proper access level!");
+			return;
+		}
+		
+		if (useConfirm && AdminData.getInstance().requireConfirm(command))
+		{
+			player.setAdminConfirmCmd(fullCommand);
+			final ConfirmDlg dlg = new ConfirmDlg(SystemMessageId.S1_3);
+			dlg.addString("Are you sure you want execute command '" + commandNoPrefix + "' ?");
+			player.addAction(PlayerAction.ADMIN_COMMAND);
+			player.sendPacket(dlg);
+		}
+		else
+		{
+			// Admin Commands must run through a long running task, otherwise a command that takes too much time will freeze the server, this way you'll feel only a minor spike.
+			ThreadPool.execute(() ->
+			{
+				final long begin = System.currentTimeMillis();
+				try
+				{
+					if (Config.GMAUDIT)
+					{
+						final L2Object target = player.getTarget();
+						GMAudit.auditGMAction(player.getName() + " [" + player.getObjectId() + "]", fullCommand, (target != null ? target.getName() : "no-target"));
+					}
+					
+					handler.useAdminCommand(fullCommand, player);
+				}
+				catch (RuntimeException e)
+				{
+					player.sendMessage("Exception during execution of  '" + fullCommand + "': " + e.toString());
+					LOGGER.warning("Exception during execution of " + fullCommand + " " + e);
+				}
+				finally
+				{
+					final long runtime = System.currentTimeMillis() - begin;
+					
+					if (runtime < 5000)
+					{
+						return;
+					}
+					
+					player.sendMessage("The execution of '" + fullCommand + "' took " + TimeAmountInterpreter.consolidateMillis(runtime) + ".");
+				}
+			});
+		}
 	}
 	
 	@Override
@@ -63,11 +152,11 @@ public class AdminCommandHandler implements IHandler<IAdminCommandHandler, Strin
 	
 	public static AdminCommandHandler getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final AdminCommandHandler _instance = new AdminCommandHandler();
+		protected static final AdminCommandHandler INSTANCE = new AdminCommandHandler();
 	}
 }
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
index aa25ab77e5..84ada1c5e4 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
@@ -97,8 +97,6 @@ import com.l2jmobius.gameserver.enums.SubclassInfoType;
 import com.l2jmobius.gameserver.enums.Team;
 import com.l2jmobius.gameserver.enums.UserInfoType;
 import com.l2jmobius.gameserver.geoengine.GeoEngine;
-import com.l2jmobius.gameserver.handler.AdminCommandHandler;
-import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.handler.IItemHandler;
 import com.l2jmobius.gameserver.handler.ItemHandler;
 import com.l2jmobius.gameserver.idfactory.IdFactory;
@@ -336,7 +334,6 @@ import com.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
 import com.l2jmobius.gameserver.util.Broadcast;
 import com.l2jmobius.gameserver.util.EnumIntBitmask;
 import com.l2jmobius.gameserver.util.FloodProtectors;
-import com.l2jmobius.gameserver.util.GMAudit;
 import com.l2jmobius.gameserver.util.Util;
 
 /**
@@ -10048,8 +10045,9 @@ public final class L2PcInstance extends L2Playable
 	{
 		startWarnUserTakeBreak();
 		
-		if (isGM())
+		if (isGM() && !Config.GM_STARTUP_BUILDER_HIDE)
 		{
+			// Bleah, see L2J custom below.
 			if (isInvul())
 			{
 				sendMessage("Entering world in Invulnerable mode.");
@@ -13782,50 +13780,6 @@ public final class L2PcInstance extends L2Playable
 		return (super.isVisibleFor(player) || ((player.getParty() != null) && (player.getParty() == getParty())));
 	}
 	
-	/**
-	 * @param fullCommand
-	 */
-	public void useAdminCommand(String fullCommand)
-	{
-		final String command = fullCommand.split(" ")[0];
-		
-		final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(command);
-		if (ach == null)
-		{
-			if (isGM())
-			{
-				sendMessage("The command " + command.substring(6) + " does not exist!");
-			}
-			LOGGER.warning("No handler registered for admin command '" + command + "'");
-			return;
-		}
-		
-		if (!AdminData.getInstance().hasAccess(command, getAccessLevel()))
-		{
-			sendMessage("You don't have the access rights to use this command!");
-			LOGGER.warning("Character " + getName() + " tried to use admin command " + command + ", without proper access level!");
-			return;
-		}
-		
-		if (AdminData.getInstance().requireConfirm(command))
-		{
-			setAdminConfirmCmd(fullCommand);
-			final ConfirmDlg dlg = new ConfirmDlg(SystemMessageId.S1_3);
-			dlg.addString("Are you sure you want execute command " + fullCommand.substring(6) + " ?");
-			addAction(PlayerAction.ADMIN_COMMAND);
-			sendPacket(dlg);
-		}
-		else
-		{
-			if (Config.GMAUDIT)
-			{
-				GMAudit.auditGMAction(getName() + " [" + getObjectId() + "]", fullCommand, (getTarget() != null ? getTarget().getName() : "no-target"));
-			}
-			
-			ach.useAdminCommand(fullCommand, this);
-		}
-	}
-	
 	/**
 	 * Set the Quest zone ID.
 	 * @param id the quest zone ID
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java
index f1eefdc748..2dd69a67f8 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java
@@ -16,12 +16,9 @@
  */
 package com.l2jmobius.gameserver.network.clientpackets;
 
-import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketReader;
-import com.l2jmobius.gameserver.data.xml.impl.AdminData;
 import com.l2jmobius.gameserver.enums.PlayerAction;
 import com.l2jmobius.gameserver.handler.AdminCommandHandler;
-import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.events.EventDispatcher;
 import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerDlgAnswer;
@@ -30,7 +27,6 @@ import com.l2jmobius.gameserver.model.holders.DoorRequestHolder;
 import com.l2jmobius.gameserver.model.holders.SummonRequestHolder;
 import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.util.GMAudit;
 
 /**
  * @author Dezmond_snz
@@ -75,16 +71,9 @@ public final class DlgAnswer implements IClientIncomingPacket
 				{
 					return;
 				}
-				final String command = cmd.split(" ")[0];
-				final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(command);
-				if (AdminData.getInstance().hasAccess(command, activeChar.getAccessLevel()))
-				{
-					if (Config.GMAUDIT)
-					{
-						GMAudit.auditGMAction(activeChar.getName() + " [" + activeChar.getObjectId() + "]", cmd, (activeChar.getTarget() != null ? activeChar.getTarget().getName() : "no-target"));
-					}
-					ach.useAdminCommand(cmd, activeChar);
-				}
+				
+				// The 'useConfirm' must be disabled here, as we don't want to repeat that process.
+				AdminCommandHandler.getInstance().useAdminCommand(activeChar, cmd, false);
 			}
 		}
 		else if ((_messageId == SystemMessageId.C1_IS_ATTEMPTING_TO_DO_A_RESURRECTION_THAT_RESTORES_S2_S3_XP_ACCEPT.getId()) || (_messageId == SystemMessageId.YOUR_CHARM_OF_COURAGE_IS_TRYING_TO_RESURRECT_YOU_WOULD_YOU_LIKE_TO_RESURRECT_NOW.getId()))
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 2a17c1f259..c42047fc80 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -98,6 +98,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SkillList;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import com.l2jmobius.gameserver.network.serverpackets.ability.ExAcquireAPSkillList;
 import com.l2jmobius.gameserver.network.serverpackets.friend.L2FriendList;
+import com.l2jmobius.gameserver.util.BuilderUtil;
 
 /**
  * Enter World Packet Handler
@@ -205,35 +206,50 @@ public class EnterWorld implements IClientIncomingPacket
 		// Apply special GM properties to the GM when entering
 		if (activeChar.isGM())
 		{
-			if (Config.GM_STARTUP_INVULNERABLE && AdminData.getInstance().hasAccess("admin_invul", activeChar.getAccessLevel()))
+			gmStartupProcess:
 			{
-				activeChar.setIsInvul(true);
-			}
-			
-			if (Config.GM_STARTUP_INVISIBLE && AdminData.getInstance().hasAccess("admin_invisible", activeChar.getAccessLevel()))
-			{
-				activeChar.setInvisible(true);
-				activeChar.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.STEALTH);
-			}
-			
-			if (Config.GM_STARTUP_SILENCE && AdminData.getInstance().hasAccess("admin_silence", activeChar.getAccessLevel()))
-			{
-				activeChar.setSilenceMode(true);
-			}
-			
-			if (Config.GM_STARTUP_DIET_MODE && AdminData.getInstance().hasAccess("admin_diet", activeChar.getAccessLevel()))
-			{
-				activeChar.setDietMode(true);
-				activeChar.refreshOverloaded(true);
-			}
-			
-			if (Config.GM_STARTUP_AUTO_LIST && AdminData.getInstance().hasAccess("admin_gmliston", activeChar.getAccessLevel()))
-			{
-				AdminData.getInstance().addGm(activeChar, false);
-			}
-			else
-			{
-				AdminData.getInstance().addGm(activeChar, true);
+				if (Config.GM_STARTUP_BUILDER_HIDE && AdminData.getInstance().hasAccess("admin_hide", activeChar.getAccessLevel()))
+				{
+					BuilderUtil.setHiding(activeChar, true);
+					
+					BuilderUtil.sendSysMessage(activeChar, "hide is default for builder.");
+					BuilderUtil.sendSysMessage(activeChar, "FriendAddOff is default for builder.");
+					BuilderUtil.sendSysMessage(activeChar, "whisperoff is default for builder.");
+					
+					// It isn't recommend to use the below custom L2J GMStartup functions together with retail-like GMStartupBuilderHide, so breaking the process at that stage.
+					break gmStartupProcess;
+				}
+				
+				if (Config.GM_STARTUP_INVULNERABLE && AdminData.getInstance().hasAccess("admin_invul", activeChar.getAccessLevel()))
+				{
+					activeChar.setIsInvul(true);
+				}
+				
+				if (Config.GM_STARTUP_INVISIBLE && AdminData.getInstance().hasAccess("admin_invisible", activeChar.getAccessLevel()))
+				{
+					activeChar.setInvisible(true);
+					activeChar.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.STEALTH);
+				}
+				
+				if (Config.GM_STARTUP_SILENCE && AdminData.getInstance().hasAccess("admin_silence", activeChar.getAccessLevel()))
+				{
+					activeChar.setSilenceMode(true);
+				}
+				
+				if (Config.GM_STARTUP_DIET_MODE && AdminData.getInstance().hasAccess("admin_diet", activeChar.getAccessLevel()))
+				{
+					activeChar.setDietMode(true);
+					activeChar.refreshOverloaded(true);
+				}
+				
+				if (Config.GM_STARTUP_AUTO_LIST && AdminData.getInstance().hasAccess("admin_gmliston", activeChar.getAccessLevel()))
+				{
+					AdminData.getInstance().addGm(activeChar, false);
+				}
+				else
+				{
+					AdminData.getInstance().addGm(activeChar, true);
+				}
 			}
 			
 			if (Config.GM_GIVE_SPECIAL_SKILLS)
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java
index 7621a7029e..27753dcf85 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java
@@ -23,6 +23,7 @@ import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.data.xml.impl.MultisellData;
+import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.BypassHandler;
 import com.l2jmobius.gameserver.handler.CommunityBoardHandler;
 import com.l2jmobius.gameserver.handler.IBypassHandler;
@@ -133,7 +134,7 @@ public final class RequestBypassToServer implements IClientIncomingPacket
 		{
 			if (_command.startsWith("admin_"))
 			{
-				activeChar.useAdminCommand(_command);
+				AdminCommandHandler.getInstance().useAdminCommand(activeChar, _command, true);
 			}
 			else if (CommunityBoardHandler.getInstance().isCommunityBoardCommand(_command))
 			{
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
index 9805ae3e39..b6b85e45d9 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
@@ -24,6 +24,7 @@ import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.enums.PrivateStoreType;
+import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.instancemanager.CursedWeaponsManager;
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.L2World;
@@ -107,7 +108,7 @@ public final class RequestDestroyItem implements IClientIncomingPacket
 					{
 						count = ((L2ItemInstance) obj).getCount();
 					}
-					activeChar.useAdminCommand("admin_delete_item " + _objectId + " " + count);
+					AdminCommandHandler.getInstance().useAdminCommand(activeChar, "admin_delete_item " + _objectId + " " + count, true);
 				}
 				return;
 			}
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialLinkHtml.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialLinkHtml.java
index e230c6ec10..eac5eea401 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialLinkHtml.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialLinkHtml.java
@@ -17,6 +17,7 @@
 package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
+import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.BypassHandler;
 import com.l2jmobius.gameserver.handler.IBypassHandler;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -45,7 +46,7 @@ public class RequestTutorialLinkHtml implements IClientIncomingPacket
 		
 		if (_bypass.startsWith("admin_"))
 		{
-			player.useAdminCommand(_bypass);
+			AdminCommandHandler.getInstance().useAdminCommand(player, _bypass, true);
 		}
 		else
 		{
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialPassCmdToServer.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialPassCmdToServer.java
index 3b9d386e05..dc2e10cc02 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialPassCmdToServer.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialPassCmdToServer.java
@@ -17,6 +17,7 @@
 package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
+import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.BypassHandler;
 import com.l2jmobius.gameserver.handler.IBypassHandler;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -46,7 +47,7 @@ public class RequestTutorialPassCmdToServer implements IClientIncomingPacket
 		
 		if (_bypass.startsWith("admin_"))
 		{
-			player.useAdminCommand(_bypass);
+			AdminCommandHandler.getInstance().useAdminCommand(player, _bypass, true);
 		}
 		else
 		{
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java
index 2255ca3502..2487fbe4a4 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java
@@ -16,14 +16,10 @@
  */
 package com.l2jmobius.gameserver.network.clientpackets;
 
-import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketReader;
-import com.l2jmobius.gameserver.data.xml.impl.AdminData;
 import com.l2jmobius.gameserver.handler.AdminCommandHandler;
-import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.network.L2GameClient;
-import com.l2jmobius.gameserver.util.GMAudit;
 
 /**
  * This class handles all GM commands triggered by //command
@@ -56,33 +52,6 @@ public final class SendBypassBuildCmd implements IClientIncomingPacket
 			return;
 		}
 		
-		final String command = "admin_" + _command.split(" ")[0];
-		
-		final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(command);
-		
-		if (ach == null)
-		{
-			if (activeChar.isGM())
-			{
-				activeChar.sendMessage("The command " + command.substring(6) + " does not exists!");
-			}
-			
-			LOGGER.warning("No handler registered for admin command '" + command + "'");
-			return;
-		}
-		
-		if (!AdminData.getInstance().hasAccess(command, activeChar.getAccessLevel()))
-		{
-			activeChar.sendMessage("You don't have the access right to use this command!");
-			LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + command + ", but have no access to it!");
-			return;
-		}
-		
-		if (Config.GMAUDIT)
-		{
-			GMAudit.auditGMAction(activeChar.getName() + " [" + activeChar.getObjectId() + "]", _command, (activeChar.getTarget() != null ? activeChar.getTarget().getName() : "no-target"));
-		}
-		
-		ach.useAdminCommand("admin_" + _command, activeChar);
+		AdminCommandHandler.getInstance().useAdminCommand(activeChar, "admin_" + _command, true);
 	}
 }
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java
index 8ae98bd315..274245a42a 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java
@@ -27,6 +27,7 @@ import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.ai.NextAction;
 import com.l2jmobius.gameserver.enums.ItemSkillType;
 import com.l2jmobius.gameserver.enums.PrivateStoreType;
+import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.IItemHandler;
 import com.l2jmobius.gameserver.handler.ItemHandler;
 import com.l2jmobius.gameserver.instancemanager.FortSiegeManager;
@@ -95,7 +96,7 @@ public final class UseItem implements IClientIncomingPacket
 				final L2Object obj = L2World.getInstance().findObject(_objectId);
 				if (obj instanceof L2ItemInstance)
 				{
-					activeChar.useAdminCommand("admin_use_item " + _objectId);
+					AdminCommandHandler.getInstance().useAdminCommand(activeChar, "admin_use_item " + _objectId, true);
 				}
 			}
 			return;
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/BuilderUtil.java
new file mode 100644
index 0000000000..5d813d36b4
--- /dev/null
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/BuilderUtil.java
@@ -0,0 +1,72 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jmobius.gameserver.util;
+
+import com.l2jmobius.gameserver.enums.ChatType;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.serverpackets.CreatureSay;
+import com.l2jmobius.gameserver.network.serverpackets.ExUserInfoAbnormalVisualEffect;
+
+/**
+ * @author lord_rex
+ */
+public final class BuilderUtil
+{
+	private BuilderUtil()
+	{
+		// utility class
+	}
+	
+	/**
+	 * Sends builder system message to the player.
+	 * @param player
+	 * @param message
+	 */
+	public static void sendSysMessage(L2PcInstance player, String message)
+	{
+		player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "SYS", message));
+	}
+	
+	/**
+	 * Changes player's hiding state.
+	 * @param player
+	 * @param hide
+	 * @return {@code true} if hide state was changed, otherwise {@code false}
+	 */
+	public static boolean setHiding(L2PcInstance player, boolean hide)
+	{
+		if (player.isInvisible() && hide)
+		{
+			// already hiding
+			return false;
+		}
+		
+		if (!player.isInvisible() && !hide)
+		{
+			// already visible
+			return false;
+		}
+		
+		player.setSilenceMode(hide);
+		player.setIsInvul(hide);
+		player.setInvisible(hide);
+		
+		player.broadcastUserInfo();
+		player.sendPacket(new ExUserInfoAbnormalVisualEffect(player));
+		return true;
+	}
+}
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/TimeAmountInterpreter.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/TimeAmountInterpreter.java
new file mode 100644
index 0000000000..a9f8029b98
--- /dev/null
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/TimeAmountInterpreter.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 1999 CERN - European Organization for Nuclear Research.
+ * 
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear in
+ * supporting documentation. CERN makes no representations about the
+ * suitability of this software for any purpose. It is provided "as is"
+ * without expressed or implied warranty.
+ */
+package com.l2jmobius.gameserver.util;
+
+import static java.util.concurrent.TimeUnit.DAYS;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
+
+import java.io.IOException;
+import java.util.Locale;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Allows to present time intervals in a standardized, user friendly manner.
+ * @author _dev_
+ */
+public class TimeAmountInterpreter
+{
+	private static final TimeUnit[] UNIT_CACHE = TimeUnit.values();
+	
+	private TimeAmountInterpreter()
+	{
+		// utility class
+	}
+	
+	/**
+	 * Calls {@link #consolidate(long, TimeUnit)} with {@link TimeUnit#NANOSECONDS}.
+	 * @param timeAmountInNanos amount of time in nanoseconds
+	 * @return an user-friendly description of the given time amount
+	 */
+	public static String consolidateNanos(long timeAmountInNanos)
+	{
+		return consolidate(timeAmountInNanos, NANOSECONDS);
+	}
+	
+	/**
+	 * Calls {@link #consolidate(long, TimeUnit)} with {@link TimeUnit#MILLISECONDS}.
+	 * @param timeAmountInMillis amount of time in milliseconds
+	 * @return an user-friendly description of the given time amount
+	 */
+	public static String consolidateMillis(long timeAmountInMillis)
+	{
+		return consolidate(timeAmountInMillis, MILLISECONDS);
+	}
+	
+	/**
+	 * Constructs an user-friendly description of the given amount of time, specifying the number of days (if any), hours (if any), minutes (if any), seconds (if any) and milliseconds (if any). Otherwise, returns the string value {@code 0}.
+	 * @param timeAmount amount of time to be written
+	 * @param timeUnit unit of the given amount
+	 * @return an user-friendly description of the given time amount
+	 */
+	public static String consolidate(long timeAmount, TimeUnit timeUnit)
+	{
+		return consolidate(timeAmount, timeUnit, timeUnit, DAYS, "0 " + timeUnit.name().toLowerCase(Locale.ENGLISH));
+	}
+	
+	/**
+	 * Constructs an user-friendly description of the given amount of time.
+	 * @param timeAmount amount of time to be written
+	 * @param timeUnit unit of the given amount
+	 * @param minConsolidationUnit smallest unit to be included within the description
+	 * @param maxConsolidationUnit largest unit to be included within the description
+	 * @param noTimeUsedIndicator text to be written if the amount is not positive
+	 * @return an user-friendly description of the given time amount
+	 */
+	public static String consolidate(long timeAmount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator)
+	{
+		return appendConsolidated(new StringBuilder(), timeAmount, timeUnit, minConsolidationUnit, maxConsolidationUnit, noTimeUsedIndicator).toString();
+	}
+	
+	/**
+	 * Appends an user-friendly description of the given amount of time to the specified text builder.<BR>
+	 * <BR>
+	 * Please keep in mind, that this method is primarily designed to be used with heap text builders. Therefore, if the given text builder throws an {@link IOException}, this exception will be wrapped in a {@link RuntimeException} and returned to the caller as an unchecked exception.
+	 * @param <T>
+	 * @param textBuilder a character sequence builder
+	 * @param timeAmount amount of time to be written
+	 * @param timeUnit unit of the given amount
+	 * @param minConsolidationUnit smallest unit to be included within the description
+	 * @param maxConsolidationUnit largest unit to be included within the description
+	 * @param noTimeUsedIndicator text to be written if the amount is not positive
+	 * @return {@code textBuilder}
+	 * @throws RuntimeException if {@code textBuilder} throws an {@link IOException}
+	 */
+	@SuppressWarnings("unchecked")
+	public static <T extends Appendable & CharSequence> T appendConsolidated(T textBuilder, long timeAmount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator) throws RuntimeException
+	{
+		try
+		{
+			if (timeAmount < 1)
+			{
+				return (T) textBuilder.append(noTimeUsedIndicator);
+			}
+			
+			final int len = textBuilder.length();
+			for (int i = maxConsolidationUnit.ordinal(); i >= minConsolidationUnit.ordinal(); --i)
+			{
+				final TimeUnit activeUnit = UNIT_CACHE[i];
+				final long num = activeUnit.convert(timeAmount, timeUnit);
+				if (num == 0)
+				{
+					continue;
+				}
+				
+				if (textBuilder.length() > len)
+				{
+					textBuilder.append(", ");
+				}
+				textBuilder.append(String.valueOf(num)).append(' ');
+				final String unit = activeUnit.name().toLowerCase(Locale.ENGLISH);
+				textBuilder.append(unit, 0, num == 1 ? unit.length() - 1 : unit.length());
+				
+				timeAmount -= timeUnit.convert(num, activeUnit);
+			}
+			
+			if (textBuilder.length() == len)
+			{
+				return (T) textBuilder.append(noTimeUsedIndicator).append(' ').append(minConsolidationUnit.name().toLowerCase(Locale.ENGLISH));
+			}
+		}
+		catch (IOException e)
+		{
+			throw new RuntimeException(e);
+		}
+		return textBuilder;
+	}
+}
diff --git a/L2J_Mobius_2.5_Underground/dist/game/config/AdminCommands.xml b/L2J_Mobius_2.5_Underground/dist/game/config/AdminCommands.xml
index 14882ea07a..8b4096bd34 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/config/AdminCommands.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/config/AdminCommands.xml
@@ -158,8 +158,6 @@
 	<admin command="admin_earthquake_menu" accessLevel="100" />
 	<admin command="admin_bighead" accessLevel="100" />
 	<admin command="admin_shrinkhead" accessLevel="100" />
-	<admin command="admin_gmspeed" accessLevel="100" />
-	<admin command="admin_gmspeed_menu" accessLevel="100" />
 	<admin command="admin_unpara_all" accessLevel="100" />
 	<admin command="admin_para_all" accessLevel="100" />
 	<admin command="admin_unpara" accessLevel="100" />
@@ -189,6 +187,13 @@
 	<admin command="admin_set_displayeffect_menu" accessLevel="100" />
 	<admin command="admin_playmovie" accessLevel="100" />
 
+	<!-- ADMIN SPEED -->
+	<admin command="admin_gmspeed" accessLevel="100" />
+	<admin command="admin_superhaste" accessLevel="100" />
+	<admin command="admin_superhaste_menu" accessLevel="100" />
+	<admin command="admin_speed" accessLevel="100" />
+	<admin command="admin_speed_menu" accessLevel="100" />
+	
 	<!-- ADMIN ELEMENT -->
 	<admin command="admin_setlh" accessLevel="100" />
 	<admin command="admin_setlc" accessLevel="100" />
@@ -615,4 +620,7 @@
 	<admin command="banchat" accessLevel="100" />
 	<admin command="debug" accessLevel="100" />
 	<admin command="unbanchat" accessLevel="100" />
+
+	<!-- HIDE -->
+	<admin command="admin_hide" accessLevel="100" />
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_2.5_Underground/dist/game/config/General.ini b/L2J_Mobius_2.5_Underground/dist/game/config/General.ini
index 832fb08b17..106b6e6078 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/config/General.ini
+++ b/L2J_Mobius_2.5_Underground/dist/game/config/General.ini
@@ -25,6 +25,10 @@ ServerGMOnly = False
 # Default: False
 GMHeroAura = False
 
+# Whether GM logins in builder hide mode by default.
+# Default: True
+GMStartupBuilderHide = True
+
 # Auto set invulnerable status to a GM on login.
 # Default: False
 GMStartupInvulnerable = True
@@ -79,6 +83,11 @@ GMGiveSpecialSkills = False
 # Default: False
 GMGiveSpecialAuraSkills = False
 
+# In case you are not satisfied with the retail-like implementation of //gmspeed",
+# with this config you can rollback it to the old custom L2J version of the GM Speed.
+# Default: False
+UseSuperHasteAsGMSpeed = False
+
 
 # ---------------------------------------------------------------------------
 # Server Security
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/gm_menu.htm b/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/gm_menu.htm
index ffe3e3d025..5a8f77eaba 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/gm_menu.htm
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/gm_menu.htm
@@ -38,11 +38,11 @@
 </table><br1>
 <table width=270><tr>
 <td><font color="LEVEL">Super Haste:</font></td>
-<td><button value="1" action="bypass -h admin_gmspeed_menu 1" width=35 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="2" action="bypass -h admin_gmspeed_menu 2" width=35 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="3" action="bypass -h admin_gmspeed_menu 3" width=35 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="4" action="bypass -h admin_gmspeed_menu 4" width=35 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="Off" action="bypass -h admin_gmspeed_menu 0" width=35 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="1" action="bypass -h admin_superhaste 1" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="2" action="bypass -h admin_superhaste 2" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="3" action="bypass -h admin_superhaste 3" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="4" action="bypass -h admin_superhaste 4" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="Off" action="bypass -h admin_superhaste 0" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr></table><br>
 <center><multiedit var="new_announcement" width=250 height=50></center>
 <table width="160"><tr>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/MasterHandler.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/MasterHandler.java
index 4736bff5de..413ea22833 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/MasterHandler.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/MasterHandler.java
@@ -84,9 +84,11 @@ import handlers.admincommandhandlers.AdminFortSiege;
 import handlers.admincommandhandlers.AdminGeodata;
 import handlers.admincommandhandlers.AdminGm;
 import handlers.admincommandhandlers.AdminGmChat;
+import handlers.admincommandhandlers.AdminGmSpeed;
 import handlers.admincommandhandlers.AdminGraciaSeeds;
 import handlers.admincommandhandlers.AdminGrandBoss;
 import handlers.admincommandhandlers.AdminHeal;
+import handlers.admincommandhandlers.AdminHide;
 import handlers.admincommandhandlers.AdminHtml;
 import handlers.admincommandhandlers.AdminHwid;
 import handlers.admincommandhandlers.AdminInstance;
@@ -126,6 +128,7 @@ import handlers.admincommandhandlers.AdminShutdown;
 import handlers.admincommandhandlers.AdminSkill;
 import handlers.admincommandhandlers.AdminSpawn;
 import handlers.admincommandhandlers.AdminSummon;
+import handlers.admincommandhandlers.AdminSuperHaste;
 import handlers.admincommandhandlers.AdminTarget;
 import handlers.admincommandhandlers.AdminTargetSay;
 import handlers.admincommandhandlers.AdminTeleport;
@@ -414,9 +417,11 @@ public class MasterHandler
 			AdminGeodata.class,
 			AdminGm.class,
 			AdminGmChat.class,
+			AdminGmSpeed.class,
 			AdminGraciaSeeds.class,
 			AdminGrandBoss.class,
 			AdminHeal.class,
+			AdminHide.class,
 			AdminHtml.class,
 			AdminHwid.class,
 			AdminInstance.class,
@@ -456,6 +461,7 @@ public class MasterHandler
 			AdminSkill.class,
 			AdminSpawn.class,
 			AdminSummon.class,
+			AdminSuperHaste.class,
 			AdminTarget.class,
 			AdminTargetSay.class,
 			AdminTeleport.class,
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/actionshifthandlers/L2PcInstanceActionShift.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/actionshifthandlers/L2PcInstanceActionShift.java
index 6b1bb7ac43..72c01c3cf8 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/actionshifthandlers/L2PcInstanceActionShift.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/actionshifthandlers/L2PcInstanceActionShift.java
@@ -19,7 +19,6 @@ package handlers.actionshifthandlers;
 import com.l2jmobius.gameserver.enums.InstanceType;
 import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.IActionShiftHandler;
-import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 
@@ -37,11 +36,7 @@ public class L2PcInstanceActionShift implements IActionShiftHandler
 				activeChar.setTarget(target);
 			}
 			
-			final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler("admin_character_info");
-			if (ach != null)
-			{
-				ach.useAdminCommand("admin_character_info " + target.getName(), activeChar);
-			}
+			AdminCommandHandler.getInstance().useAdminCommand(activeChar, "admin_character_info " + target.getName(), true);
 		}
 		return true;
 	}
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/actionshifthandlers/L2SummonActionShift.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/actionshifthandlers/L2SummonActionShift.java
index 67d403c9b3..6ee8a1173e 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/actionshifthandlers/L2SummonActionShift.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/actionshifthandlers/L2SummonActionShift.java
@@ -19,7 +19,6 @@ package handlers.actionshifthandlers;
 import com.l2jmobius.gameserver.enums.InstanceType;
 import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.IActionShiftHandler;
-import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 
@@ -36,11 +35,7 @@ public class L2SummonActionShift implements IActionShiftHandler
 				activeChar.setTarget(target);
 			}
 			
-			final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler("admin_summon_info");
-			if (ach != null)
-			{
-				ach.useAdminCommand("admin_summon_info", activeChar);
-			}
+			AdminCommandHandler.getInstance().useAdminCommand(activeChar, "admin_summon_info", true);
 		}
 		return true;
 	}
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
index 6c2b00db74..467875568d 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
@@ -19,7 +19,6 @@ package handlers.admincommandhandlers;
 import java.util.Arrays;
 import java.util.StringTokenizer;
 
-import com.l2jmobius.gameserver.data.xml.impl.SkillData;
 import com.l2jmobius.gameserver.enums.Movie;
 import com.l2jmobius.gameserver.enums.Team;
 import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
@@ -34,7 +33,6 @@ import com.l2jmobius.gameserver.model.html.PageBuilder;
 import com.l2jmobius.gameserver.model.html.PageResult;
 import com.l2jmobius.gameserver.model.html.styles.ButtonsStyle;
 import com.l2jmobius.gameserver.model.skills.AbnormalVisualEffect;
-import com.l2jmobius.gameserver.model.skills.Skill;
 import com.l2jmobius.gameserver.network.SystemMessageId;
 import com.l2jmobius.gameserver.network.serverpackets.Earthquake;
 import com.l2jmobius.gameserver.network.serverpackets.ExRedSky;
@@ -81,8 +79,6 @@ public class AdminEffects implements IAdminCommandHandler
 		"admin_earthquake_menu",
 		"admin_bighead",
 		"admin_shrinkhead",
-		"admin_gmspeed",
-		"admin_gmspeed_menu",
 		"admin_unpara_all",
 		"admin_para_all",
 		"admin_unpara",
@@ -351,35 +347,6 @@ public class AdminEffects implements IAdminCommandHandler
 			{
 			}
 		}
-		else if (command.startsWith("admin_gmspeed"))
-		{
-			try
-			{
-				final int val = Integer.parseInt(st.nextToken());
-				final boolean sendMessage = activeChar.isAffectedBySkill(7029);
-				activeChar.stopSkillEffects((val == 0) && sendMessage, 7029);
-				if ((val >= 1) && (val <= 4))
-				{
-					int time = 0;
-					if (st.hasMoreTokens())
-					{
-						time = Integer.parseInt(st.nextToken());
-					}
-					
-					final Skill gmSpeedSkill = SkillData.getInstance().getSkill(7029, val);
-					gmSpeedSkill.applyEffects(activeChar, activeChar, true, time);
-				}
-			}
-			catch (Exception e)
-			{
-				activeChar.sendMessage("Usage: //gmspeed <Effect level (0-4)> <Time in seconds>");
-			}
-			if (command.contains("_menu"))
-			{
-				command = "";
-				AdminHtml.showAdminHtml(activeChar, "gm_menu.htm");
-			}
-		}
 		else if (command.startsWith("admin_polyself"))
 		{
 			try
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmSpeed.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmSpeed.java
new file mode 100644
index 0000000000..5ab5f39a9b
--- /dev/null
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmSpeed.java
@@ -0,0 +1,119 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.admincommandhandlers;
+
+import java.util.EnumSet;
+import java.util.Set;
+import java.util.StringTokenizer;
+
+import com.l2jmobius.Config;
+import com.l2jmobius.gameserver.handler.AdminCommandHandler;
+import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
+import com.l2jmobius.gameserver.model.L2Object;
+import com.l2jmobius.gameserver.model.actor.L2Character;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.model.stats.Stats;
+import com.l2jmobius.gameserver.util.BuilderUtil;
+import com.l2jmobius.gameserver.util.Util;
+
+/**
+ * A retail-like implementation of //gmspeed builder command.
+ * @author lord_rex
+ */
+public final class AdminGmSpeed implements IAdminCommandHandler
+{
+	private static final String[] ADMIN_COMMANDS =
+	{
+		"admin_gmspeed",
+	};
+	
+	private static final Set<Stats> SPEED_STATS = EnumSet.of(Stats.RUN_SPEED, Stats.WALK_SPEED, Stats.SWIM_RUN_SPEED, Stats.SWIM_WALK_SPEED, Stats.FLY_RUN_SPEED, Stats.FLY_WALK_SPEED);
+	
+	@Override
+	public boolean useAdminCommand(String command, L2PcInstance player)
+	{
+		final StringTokenizer st = new StringTokenizer(command);
+		final String cmd = st.nextToken();
+		
+		if (cmd.equals("admin_gmspeed"))
+		{
+			if (!st.hasMoreTokens())
+			{
+				BuilderUtil.sendSysMessage(player, "//gmspeed [0...10]");
+				return false;
+			}
+			final String token = st.nextToken();
+			
+			// Rollback feature for old custom way, in order to make everyone happy.
+			if (Config.USE_SUPER_HASTE_AS_GM_SPEED)
+			{
+				AdminCommandHandler.getInstance().useAdminCommand(player, AdminSuperHaste.ADMIN_COMMANDS[0] + " " + token, false);
+				return true;
+			}
+			
+			if (!Util.isDouble(token))
+			{
+				BuilderUtil.sendSysMessage(player, "//gmspeed [0...10]");
+				return false;
+			}
+			final double runSpeedBoost = Double.parseDouble(token);
+			if ((runSpeedBoost < 0) || (runSpeedBoost > 10))
+			{
+				// Custom limit according to SDW's request - real retail limit is unknown.
+				BuilderUtil.sendSysMessage(player, "//gmspeed [0...10]");
+				return false;
+			}
+			
+			final L2Character targetCharacter;
+			final L2Object target = player.getTarget();
+			if ((target != null) && target.isCharacter())
+			{
+				targetCharacter = (L2Character) target;
+			}
+			else
+			{
+				// If there is no target, let's use the command executer.
+				targetCharacter = player;
+			}
+			
+			SPEED_STATS.forEach(speedStat -> targetCharacter.getStat().removeFixedValue(speedStat));
+			if (runSpeedBoost > 0)
+			{
+				SPEED_STATS.forEach(speedStat -> targetCharacter.getStat().addFixedValue(speedStat, targetCharacter.getTemplate().getBaseValue(speedStat, 120) * runSpeedBoost));
+			}
+			
+			targetCharacter.getStat().recalculateStats(false);
+			if (targetCharacter.isPlayer())
+			{
+				((L2PcInstance) targetCharacter).broadcastUserInfo();
+			}
+			else
+			{
+				targetCharacter.broadcastInfo();
+			}
+			
+			BuilderUtil.sendSysMessage(player, "[" + targetCharacter.getName() + "] speed is [" + (runSpeedBoost * 100) + "0]% fast.");
+		}
+		return true;
+	}
+	
+	@Override
+	public String[] getAdminCommandList()
+	{
+		return ADMIN_COMMANDS;
+	}
+}
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminHide.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminHide.java
new file mode 100644
index 0000000000..600cbe1639
--- /dev/null
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminHide.java
@@ -0,0 +1,87 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.admincommandhandlers;
+
+import java.util.StringTokenizer;
+
+import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.util.BuilderUtil;
+
+/**
+ * @author lord_rex
+ */
+public final class AdminHide implements IAdminCommandHandler
+{
+	private static final String[] ADMIN_COMMANDS =
+	{
+		"admin_hide"
+	};
+	
+	@Override
+	public boolean useAdminCommand(String command, L2PcInstance player)
+	{
+		final StringTokenizer st = new StringTokenizer(command);
+		st.nextToken();
+		
+		try
+		{
+			final String param = st.nextToken();
+			switch (param)
+			{
+				case "on":
+				{
+					if (!BuilderUtil.setHiding(player, true))
+					{
+						BuilderUtil.sendSysMessage(player, "Currently, you cannot be seen.");
+						return true;
+					}
+					
+					BuilderUtil.sendSysMessage(player, "Now, you cannot be seen.");
+					return true;
+				}
+				case "off":
+				{
+					if (!BuilderUtil.setHiding(player, false))
+					{
+						BuilderUtil.sendSysMessage(player, "Currently, you can be seen.");
+						return true;
+					}
+					
+					BuilderUtil.sendSysMessage(player, "Now, you can be seen.");
+					return true;
+				}
+				default:
+				{
+					BuilderUtil.sendSysMessage(player, "//hide [on|off]");
+					return true;
+				}
+			}
+		}
+		catch (final Exception e)
+		{
+			BuilderUtil.sendSysMessage(player, "//hide [on|off]");
+			return true;
+		}
+	}
+	
+	@Override
+	public String[] getAdminCommandList()
+	{
+		return ADMIN_COMMANDS;
+	}
+}
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java
index 5ab19d4b39..8c735f4265 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java
@@ -21,7 +21,6 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.gameserver.data.xml.impl.AdminData;
 import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.model.L2Clan;
@@ -187,14 +186,7 @@ public class AdminMenu implements IAdminCommandHandler
 			if (st.countTokens() > 1)
 			{
 				final String subCommand = "admin_ban_char";
-				if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel()))
-				{
-					activeChar.sendMessage("You don't have the access right to use this command!");
-					LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!");
-					return false;
-				}
-				final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand);
-				ach.useAdminCommand(subCommand + command.substring(14), activeChar);
+				AdminCommandHandler.getInstance().useAdminCommand(activeChar, subCommand + command.substring(14), true);
 			}
 			showMainPage(activeChar);
 		}
@@ -204,14 +196,7 @@ public class AdminMenu implements IAdminCommandHandler
 			if (st.countTokens() > 1)
 			{
 				final String subCommand = "admin_unban_char";
-				if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel()))
-				{
-					activeChar.sendMessage("You don't have the access right to use this command!");
-					LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!");
-					return false;
-				}
-				final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand);
-				ach.useAdminCommand(subCommand + command.substring(16), activeChar);
+				AdminCommandHandler.getInstance().useAdminCommand(activeChar, subCommand + command.substring(16), true);
 			}
 			showMainPage(activeChar);
 		}
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java
index a818e7f3d3..f27d63e949 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java
@@ -16,9 +16,6 @@
  */
 package handlers.admincommandhandlers;
 
-import java.util.logging.Logger;
-
-import com.l2jmobius.gameserver.data.xml.impl.AdminData;
 import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -28,8 +25,6 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
  */
 public class AdminSummon implements IAdminCommandHandler
 {
-	private static final Logger LOGGER = Logger.getLogger(AdminSummon.class.getName());
-	
 	public static final String[] ADMIN_COMMANDS =
 	{
 		"admin_summon"
@@ -62,34 +57,24 @@ public class AdminSummon implements IAdminCommandHandler
 			return false;
 		}
 		
-		String subCommand;
+		final String subCommand;
 		if (id < 1000000)
 		{
 			subCommand = "admin_create_item";
-			if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel()))
-			{
-				activeChar.sendMessage("You don't have the access right to use this command!");
-				LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!");
-				return false;
-			}
-			final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand);
-			ach.useAdminCommand(subCommand + " " + id + " " + count, activeChar);
 		}
 		else
 		{
 			subCommand = "admin_spawn_once";
-			if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel()))
-			{
-				activeChar.sendMessage("You don't have the access right to use this command!");
-				LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!");
-				return false;
-			}
-			final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand);
 			
 			activeChar.sendMessage("This is only a temporary spawn.  The mob(s) will NOT respawn.");
 			id -= 1000000;
-			ach.useAdminCommand(subCommand + " " + id + " " + count, activeChar);
 		}
+		
+		if ((id > 0) && (count > 0))
+		{
+			AdminCommandHandler.getInstance().useAdminCommand(activeChar, subCommand + " " + id + " " + count, true);
+		}
+		
 		return true;
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminSuperHaste.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminSuperHaste.java
new file mode 100644
index 0000000000..4a3eb0c809
--- /dev/null
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminSuperHaste.java
@@ -0,0 +1,92 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.admincommandhandlers;
+
+import java.util.StringTokenizer;
+
+import com.l2jmobius.gameserver.data.xml.impl.SkillData;
+import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.model.skills.Skill;
+
+/**
+ * The classical custom L2J implementation of the old //gmspeed GM command.
+ * @author lord_rex (No, it wasn't me at all. Eclipse added my name there.)
+ */
+public final class AdminSuperHaste implements IAdminCommandHandler
+{
+	public static final String[] ADMIN_COMMANDS =
+	{
+		"admin_superhaste",
+		"admin_superhaste_menu",
+		"admin_speed",
+		"admin_speed_menu",
+	};
+	
+	private static final int SUPER_HASTE_ID = 7029;
+	
+	@Override
+	public boolean useAdminCommand(String command, L2PcInstance player)
+	{
+		final StringTokenizer st = new StringTokenizer(command);
+		final String cmd = st.nextToken();
+		switch (cmd)
+		{
+			case "admin_superhaste":
+			case "admin_speed":
+			{
+				try
+				{
+					final int val = Integer.parseInt(st.nextToken());
+					final boolean sendMessage = player.isAffectedBySkill(SUPER_HASTE_ID);
+					player.stopSkillEffects((val == 0) && sendMessage, SUPER_HASTE_ID);
+					if ((val >= 1) && (val <= 4))
+					{
+						int time = 0;
+						if (st.hasMoreTokens())
+						{
+							time = Integer.parseInt(st.nextToken());
+						}
+						
+						final Skill superHasteSkill = SkillData.getInstance().getSkill(SUPER_HASTE_ID, val);
+						superHasteSkill.applyEffects(player, player, true, time);
+					}
+				}
+				catch (final Exception e)
+				{
+					player.sendMessage("Usage: //superhaste <Effect level (0-4)> <Time in seconds>");
+				}
+				
+				break;
+			}
+			case "admin_superhaste_menu":
+			case "admin_speed_menu":
+			{
+				AdminHtml.showAdminHtml(player, "gm_menu.htm");
+				break;
+			}
+		}
+		
+		return true;
+	}
+	
+	@Override
+	public String[] getAdminCommandList()
+	{
+		return ADMIN_COMMANDS;
+	}
+}
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/Config.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/Config.java
index 436c7acaef..695c880245 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/Config.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/Config.java
@@ -400,6 +400,7 @@ public final class Config
 	public static int DEFAULT_ACCESS_LEVEL;
 	public static boolean SERVER_GMONLY;
 	public static boolean GM_HERO_AURA;
+	public static boolean GM_STARTUP_BUILDER_HIDE;
 	public static boolean GM_STARTUP_INVULNERABLE;
 	public static boolean GM_STARTUP_INVISIBLE;
 	public static boolean GM_STARTUP_SILENCE;
@@ -413,6 +414,7 @@ public final class Config
 	public static boolean GM_CRITANNOUNCER_NAME;
 	public static boolean GM_GIVE_SPECIAL_SKILLS;
 	public static boolean GM_GIVE_SPECIAL_AURA_SKILLS;
+	public static boolean USE_SUPER_HASTE_AS_GM_SPEED;
 	public static boolean GAMEGUARD_ENFORCE;
 	public static boolean GAMEGUARD_PROHIBITACTION;
 	public static boolean LOG_CHAT;
@@ -1814,6 +1816,7 @@ public final class Config
 			DEFAULT_ACCESS_LEVEL = General.getInt("DefaultAccessLevel", 0);
 			SERVER_GMONLY = General.getBoolean("ServerGMOnly", false);
 			GM_HERO_AURA = General.getBoolean("GMHeroAura", false);
+			GM_STARTUP_BUILDER_HIDE = General.getBoolean("GMStartupBuilderHide", false);
 			GM_STARTUP_INVULNERABLE = General.getBoolean("GMStartupInvulnerable", false);
 			GM_STARTUP_INVISIBLE = General.getBoolean("GMStartupInvisible", false);
 			GM_STARTUP_SILENCE = General.getBoolean("GMStartupSilence", false);
@@ -1827,6 +1830,7 @@ public final class Config
 			GM_CRITANNOUNCER_NAME = General.getBoolean("GMShowCritAnnouncerName", false);
 			GM_GIVE_SPECIAL_SKILLS = General.getBoolean("GMGiveSpecialSkills", false);
 			GM_GIVE_SPECIAL_AURA_SKILLS = General.getBoolean("GMGiveSpecialAuraSkills", false);
+			USE_SUPER_HASTE_AS_GM_SPEED = General.getBoolean("UseSuperHasteAsGMSpeed", false);
 			GAMEGUARD_ENFORCE = General.getBoolean("GameGuardEnforce", false);
 			GAMEGUARD_PROHIBITACTION = General.getBoolean("GameGuardProhibitAction", false);
 			LOG_CHAT = General.getBoolean("LogChat", false);
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
index adf6462b78..c4faf3bd6d 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
@@ -18,12 +18,26 @@ package com.l2jmobius.gameserver.handler;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.logging.Logger;
+
+import com.l2jmobius.Config;
+import com.l2jmobius.commons.concurrent.ThreadPool;
+import com.l2jmobius.gameserver.data.xml.impl.AdminData;
+import com.l2jmobius.gameserver.enums.PlayerAction;
+import com.l2jmobius.gameserver.model.L2Object;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.SystemMessageId;
+import com.l2jmobius.gameserver.network.serverpackets.ConfirmDlg;
+import com.l2jmobius.gameserver.util.GMAudit;
+import com.l2jmobius.gameserver.util.TimeAmountInterpreter;
 
 /**
  * @author UnAfraid
  */
 public class AdminCommandHandler implements IHandler<IAdminCommandHandler, String>
 {
+	private static final Logger LOGGER = Logger.getLogger(AdminCommandHandler.class.getName());
+	
 	private final Map<String, IAdminCommandHandler> _datatable;
 	
 	protected AdminCommandHandler()
@@ -49,10 +63,85 @@ public class AdminCommandHandler implements IHandler<IAdminCommandHandler, Strin
 		}
 	}
 	
+	/**
+	 * WARNING: Please use {@link #useAdminCommand(L2PcInstance, String, boolean)} instead.
+	 */
 	@Override
 	public IAdminCommandHandler getHandler(String adminCommand)
 	{
-		return _datatable.get(adminCommand.contains(" ") ? adminCommand.substring(0, adminCommand.indexOf(" ")) : adminCommand);
+		String command = adminCommand;
+		if (adminCommand.contains(" "))
+		{
+			command = adminCommand.substring(0, adminCommand.indexOf(" "));
+		}
+		return _datatable.get(command);
+	}
+	
+	public void useAdminCommand(L2PcInstance player, String fullCommand, boolean useConfirm)
+	{
+		final String command = fullCommand.split(" ")[0];
+		final String commandNoPrefix = command.substring(6);
+		
+		final IAdminCommandHandler handler = getHandler(command);
+		if (handler == null)
+		{
+			if (player.isGM())
+			{
+				player.sendMessage("The command '" + commandNoPrefix + "' does not exist!");
+			}
+			LOGGER.warning("No handler registered for admin command '" + command + "'");
+			return;
+		}
+		
+		if (!AdminData.getInstance().hasAccess(command, player.getAccessLevel()))
+		{
+			player.sendMessage("You don't have the access rights to use this command!");
+			LOGGER.warning("Player " + player.getName() + " tried to use admin command '" + command + "', without proper access level!");
+			return;
+		}
+		
+		if (useConfirm && AdminData.getInstance().requireConfirm(command))
+		{
+			player.setAdminConfirmCmd(fullCommand);
+			final ConfirmDlg dlg = new ConfirmDlg(SystemMessageId.S1_3);
+			dlg.addString("Are you sure you want execute command '" + commandNoPrefix + "' ?");
+			player.addAction(PlayerAction.ADMIN_COMMAND);
+			player.sendPacket(dlg);
+		}
+		else
+		{
+			// Admin Commands must run through a long running task, otherwise a command that takes too much time will freeze the server, this way you'll feel only a minor spike.
+			ThreadPool.execute(() ->
+			{
+				final long begin = System.currentTimeMillis();
+				try
+				{
+					if (Config.GMAUDIT)
+					{
+						final L2Object target = player.getTarget();
+						GMAudit.auditGMAction(player.getName() + " [" + player.getObjectId() + "]", fullCommand, (target != null ? target.getName() : "no-target"));
+					}
+					
+					handler.useAdminCommand(fullCommand, player);
+				}
+				catch (RuntimeException e)
+				{
+					player.sendMessage("Exception during execution of  '" + fullCommand + "': " + e.toString());
+					LOGGER.warning("Exception during execution of " + fullCommand + " " + e);
+				}
+				finally
+				{
+					final long runtime = System.currentTimeMillis() - begin;
+					
+					if (runtime < 5000)
+					{
+						return;
+					}
+					
+					player.sendMessage("The execution of '" + fullCommand + "' took " + TimeAmountInterpreter.consolidateMillis(runtime) + ".");
+				}
+			});
+		}
 	}
 	
 	@Override
@@ -63,11 +152,11 @@ public class AdminCommandHandler implements IHandler<IAdminCommandHandler, Strin
 	
 	public static AdminCommandHandler getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final AdminCommandHandler _instance = new AdminCommandHandler();
+		protected static final AdminCommandHandler INSTANCE = new AdminCommandHandler();
 	}
 }
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
index 2c57c3631d..45237d59bf 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
@@ -98,8 +98,6 @@ import com.l2jmobius.gameserver.enums.SubclassInfoType;
 import com.l2jmobius.gameserver.enums.Team;
 import com.l2jmobius.gameserver.enums.UserInfoType;
 import com.l2jmobius.gameserver.geoengine.GeoEngine;
-import com.l2jmobius.gameserver.handler.AdminCommandHandler;
-import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.handler.IItemHandler;
 import com.l2jmobius.gameserver.handler.ItemHandler;
 import com.l2jmobius.gameserver.idfactory.IdFactory;
@@ -338,7 +336,6 @@ import com.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
 import com.l2jmobius.gameserver.util.Broadcast;
 import com.l2jmobius.gameserver.util.EnumIntBitmask;
 import com.l2jmobius.gameserver.util.FloodProtectors;
-import com.l2jmobius.gameserver.util.GMAudit;
 import com.l2jmobius.gameserver.util.Util;
 
 /**
@@ -10055,8 +10052,9 @@ public final class L2PcInstance extends L2Playable
 	{
 		startWarnUserTakeBreak();
 		
-		if (isGM())
+		if (isGM() && !Config.GM_STARTUP_BUILDER_HIDE)
 		{
+			// Bleah, see L2J custom below.
 			if (isInvul())
 			{
 				sendMessage("Entering world in Invulnerable mode.");
@@ -13789,50 +13787,6 @@ public final class L2PcInstance extends L2Playable
 		return (super.isVisibleFor(player) || ((player.getParty() != null) && (player.getParty() == getParty())));
 	}
 	
-	/**
-	 * @param fullCommand
-	 */
-	public void useAdminCommand(String fullCommand)
-	{
-		final String command = fullCommand.split(" ")[0];
-		
-		final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(command);
-		if (ach == null)
-		{
-			if (isGM())
-			{
-				sendMessage("The command " + command.substring(6) + " does not exist!");
-			}
-			LOGGER.warning("No handler registered for admin command '" + command + "'");
-			return;
-		}
-		
-		if (!AdminData.getInstance().hasAccess(command, getAccessLevel()))
-		{
-			sendMessage("You don't have the access rights to use this command!");
-			LOGGER.warning("Character " + getName() + " tried to use admin command " + command + ", without proper access level!");
-			return;
-		}
-		
-		if (AdminData.getInstance().requireConfirm(command))
-		{
-			setAdminConfirmCmd(fullCommand);
-			final ConfirmDlg dlg = new ConfirmDlg(SystemMessageId.S1_3);
-			dlg.addString("Are you sure you want execute command " + fullCommand.substring(6) + " ?");
-			addAction(PlayerAction.ADMIN_COMMAND);
-			sendPacket(dlg);
-		}
-		else
-		{
-			if (Config.GMAUDIT)
-			{
-				GMAudit.auditGMAction(getName() + " [" + getObjectId() + "]", fullCommand, (getTarget() != null ? getTarget().getName() : "no-target"));
-			}
-			
-			ach.useAdminCommand(fullCommand, this);
-		}
-	}
-	
 	/**
 	 * Set the Quest zone ID.
 	 * @param id the quest zone ID
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java
index f1eefdc748..2dd69a67f8 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java
@@ -16,12 +16,9 @@
  */
 package com.l2jmobius.gameserver.network.clientpackets;
 
-import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketReader;
-import com.l2jmobius.gameserver.data.xml.impl.AdminData;
 import com.l2jmobius.gameserver.enums.PlayerAction;
 import com.l2jmobius.gameserver.handler.AdminCommandHandler;
-import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.events.EventDispatcher;
 import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerDlgAnswer;
@@ -30,7 +27,6 @@ import com.l2jmobius.gameserver.model.holders.DoorRequestHolder;
 import com.l2jmobius.gameserver.model.holders.SummonRequestHolder;
 import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.util.GMAudit;
 
 /**
  * @author Dezmond_snz
@@ -75,16 +71,9 @@ public final class DlgAnswer implements IClientIncomingPacket
 				{
 					return;
 				}
-				final String command = cmd.split(" ")[0];
-				final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(command);
-				if (AdminData.getInstance().hasAccess(command, activeChar.getAccessLevel()))
-				{
-					if (Config.GMAUDIT)
-					{
-						GMAudit.auditGMAction(activeChar.getName() + " [" + activeChar.getObjectId() + "]", cmd, (activeChar.getTarget() != null ? activeChar.getTarget().getName() : "no-target"));
-					}
-					ach.useAdminCommand(cmd, activeChar);
-				}
+				
+				// The 'useConfirm' must be disabled here, as we don't want to repeat that process.
+				AdminCommandHandler.getInstance().useAdminCommand(activeChar, cmd, false);
 			}
 		}
 		else if ((_messageId == SystemMessageId.C1_IS_ATTEMPTING_TO_DO_A_RESURRECTION_THAT_RESTORES_S2_S3_XP_ACCEPT.getId()) || (_messageId == SystemMessageId.YOUR_CHARM_OF_COURAGE_IS_TRYING_TO_RESURRECT_YOU_WOULD_YOU_LIKE_TO_RESURRECT_NOW.getId()))
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 78d79fd27b..04512f5f2b 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -103,6 +103,7 @@ import com.l2jmobius.gameserver.network.serverpackets.attendance.ExVipAttendance
 import com.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward;
 import com.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList;
 import com.l2jmobius.gameserver.network.serverpackets.friend.L2FriendList;
+import com.l2jmobius.gameserver.util.BuilderUtil;
 
 /**
  * Enter World Packet Handler
@@ -210,35 +211,50 @@ public class EnterWorld implements IClientIncomingPacket
 		// Apply special GM properties to the GM when entering
 		if (activeChar.isGM())
 		{
-			if (Config.GM_STARTUP_INVULNERABLE && AdminData.getInstance().hasAccess("admin_invul", activeChar.getAccessLevel()))
+			gmStartupProcess:
 			{
-				activeChar.setIsInvul(true);
-			}
-			
-			if (Config.GM_STARTUP_INVISIBLE && AdminData.getInstance().hasAccess("admin_invisible", activeChar.getAccessLevel()))
-			{
-				activeChar.setInvisible(true);
-				activeChar.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.STEALTH);
-			}
-			
-			if (Config.GM_STARTUP_SILENCE && AdminData.getInstance().hasAccess("admin_silence", activeChar.getAccessLevel()))
-			{
-				activeChar.setSilenceMode(true);
-			}
-			
-			if (Config.GM_STARTUP_DIET_MODE && AdminData.getInstance().hasAccess("admin_diet", activeChar.getAccessLevel()))
-			{
-				activeChar.setDietMode(true);
-				activeChar.refreshOverloaded(true);
-			}
-			
-			if (Config.GM_STARTUP_AUTO_LIST && AdminData.getInstance().hasAccess("admin_gmliston", activeChar.getAccessLevel()))
-			{
-				AdminData.getInstance().addGm(activeChar, false);
-			}
-			else
-			{
-				AdminData.getInstance().addGm(activeChar, true);
+				if (Config.GM_STARTUP_BUILDER_HIDE && AdminData.getInstance().hasAccess("admin_hide", activeChar.getAccessLevel()))
+				{
+					BuilderUtil.setHiding(activeChar, true);
+					
+					BuilderUtil.sendSysMessage(activeChar, "hide is default for builder.");
+					BuilderUtil.sendSysMessage(activeChar, "FriendAddOff is default for builder.");
+					BuilderUtil.sendSysMessage(activeChar, "whisperoff is default for builder.");
+					
+					// It isn't recommend to use the below custom L2J GMStartup functions together with retail-like GMStartupBuilderHide, so breaking the process at that stage.
+					break gmStartupProcess;
+				}
+				
+				if (Config.GM_STARTUP_INVULNERABLE && AdminData.getInstance().hasAccess("admin_invul", activeChar.getAccessLevel()))
+				{
+					activeChar.setIsInvul(true);
+				}
+				
+				if (Config.GM_STARTUP_INVISIBLE && AdminData.getInstance().hasAccess("admin_invisible", activeChar.getAccessLevel()))
+				{
+					activeChar.setInvisible(true);
+					activeChar.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.STEALTH);
+				}
+				
+				if (Config.GM_STARTUP_SILENCE && AdminData.getInstance().hasAccess("admin_silence", activeChar.getAccessLevel()))
+				{
+					activeChar.setSilenceMode(true);
+				}
+				
+				if (Config.GM_STARTUP_DIET_MODE && AdminData.getInstance().hasAccess("admin_diet", activeChar.getAccessLevel()))
+				{
+					activeChar.setDietMode(true);
+					activeChar.refreshOverloaded(true);
+				}
+				
+				if (Config.GM_STARTUP_AUTO_LIST && AdminData.getInstance().hasAccess("admin_gmliston", activeChar.getAccessLevel()))
+				{
+					AdminData.getInstance().addGm(activeChar, false);
+				}
+				else
+				{
+					AdminData.getInstance().addGm(activeChar, true);
+				}
 			}
 			
 			if (Config.GM_GIVE_SPECIAL_SKILLS)
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java
index 7621a7029e..27753dcf85 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java
@@ -23,6 +23,7 @@ import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.data.xml.impl.MultisellData;
+import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.BypassHandler;
 import com.l2jmobius.gameserver.handler.CommunityBoardHandler;
 import com.l2jmobius.gameserver.handler.IBypassHandler;
@@ -133,7 +134,7 @@ public final class RequestBypassToServer implements IClientIncomingPacket
 		{
 			if (_command.startsWith("admin_"))
 			{
-				activeChar.useAdminCommand(_command);
+				AdminCommandHandler.getInstance().useAdminCommand(activeChar, _command, true);
 			}
 			else if (CommunityBoardHandler.getInstance().isCommunityBoardCommand(_command))
 			{
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
index 9805ae3e39..b6b85e45d9 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
@@ -24,6 +24,7 @@ import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.enums.PrivateStoreType;
+import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.instancemanager.CursedWeaponsManager;
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.L2World;
@@ -107,7 +108,7 @@ public final class RequestDestroyItem implements IClientIncomingPacket
 					{
 						count = ((L2ItemInstance) obj).getCount();
 					}
-					activeChar.useAdminCommand("admin_delete_item " + _objectId + " " + count);
+					AdminCommandHandler.getInstance().useAdminCommand(activeChar, "admin_delete_item " + _objectId + " " + count, true);
 				}
 				return;
 			}
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialLinkHtml.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialLinkHtml.java
index e230c6ec10..eac5eea401 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialLinkHtml.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialLinkHtml.java
@@ -17,6 +17,7 @@
 package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
+import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.BypassHandler;
 import com.l2jmobius.gameserver.handler.IBypassHandler;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -45,7 +46,7 @@ public class RequestTutorialLinkHtml implements IClientIncomingPacket
 		
 		if (_bypass.startsWith("admin_"))
 		{
-			player.useAdminCommand(_bypass);
+			AdminCommandHandler.getInstance().useAdminCommand(player, _bypass, true);
 		}
 		else
 		{
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialPassCmdToServer.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialPassCmdToServer.java
index 3b9d386e05..dc2e10cc02 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialPassCmdToServer.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialPassCmdToServer.java
@@ -17,6 +17,7 @@
 package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
+import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.BypassHandler;
 import com.l2jmobius.gameserver.handler.IBypassHandler;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -46,7 +47,7 @@ public class RequestTutorialPassCmdToServer implements IClientIncomingPacket
 		
 		if (_bypass.startsWith("admin_"))
 		{
-			player.useAdminCommand(_bypass);
+			AdminCommandHandler.getInstance().useAdminCommand(player, _bypass, true);
 		}
 		else
 		{
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java
index 2255ca3502..2487fbe4a4 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java
@@ -16,14 +16,10 @@
  */
 package com.l2jmobius.gameserver.network.clientpackets;
 
-import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketReader;
-import com.l2jmobius.gameserver.data.xml.impl.AdminData;
 import com.l2jmobius.gameserver.handler.AdminCommandHandler;
-import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.network.L2GameClient;
-import com.l2jmobius.gameserver.util.GMAudit;
 
 /**
  * This class handles all GM commands triggered by //command
@@ -56,33 +52,6 @@ public final class SendBypassBuildCmd implements IClientIncomingPacket
 			return;
 		}
 		
-		final String command = "admin_" + _command.split(" ")[0];
-		
-		final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(command);
-		
-		if (ach == null)
-		{
-			if (activeChar.isGM())
-			{
-				activeChar.sendMessage("The command " + command.substring(6) + " does not exists!");
-			}
-			
-			LOGGER.warning("No handler registered for admin command '" + command + "'");
-			return;
-		}
-		
-		if (!AdminData.getInstance().hasAccess(command, activeChar.getAccessLevel()))
-		{
-			activeChar.sendMessage("You don't have the access right to use this command!");
-			LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + command + ", but have no access to it!");
-			return;
-		}
-		
-		if (Config.GMAUDIT)
-		{
-			GMAudit.auditGMAction(activeChar.getName() + " [" + activeChar.getObjectId() + "]", _command, (activeChar.getTarget() != null ? activeChar.getTarget().getName() : "no-target"));
-		}
-		
-		ach.useAdminCommand("admin_" + _command, activeChar);
+		AdminCommandHandler.getInstance().useAdminCommand(activeChar, "admin_" + _command, true);
 	}
 }
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java
index 8ae98bd315..274245a42a 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java
@@ -27,6 +27,7 @@ import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.ai.NextAction;
 import com.l2jmobius.gameserver.enums.ItemSkillType;
 import com.l2jmobius.gameserver.enums.PrivateStoreType;
+import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.IItemHandler;
 import com.l2jmobius.gameserver.handler.ItemHandler;
 import com.l2jmobius.gameserver.instancemanager.FortSiegeManager;
@@ -95,7 +96,7 @@ public final class UseItem implements IClientIncomingPacket
 				final L2Object obj = L2World.getInstance().findObject(_objectId);
 				if (obj instanceof L2ItemInstance)
 				{
-					activeChar.useAdminCommand("admin_use_item " + _objectId);
+					AdminCommandHandler.getInstance().useAdminCommand(activeChar, "admin_use_item " + _objectId, true);
 				}
 			}
 			return;
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/BuilderUtil.java
new file mode 100644
index 0000000000..5d813d36b4
--- /dev/null
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/BuilderUtil.java
@@ -0,0 +1,72 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jmobius.gameserver.util;
+
+import com.l2jmobius.gameserver.enums.ChatType;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.serverpackets.CreatureSay;
+import com.l2jmobius.gameserver.network.serverpackets.ExUserInfoAbnormalVisualEffect;
+
+/**
+ * @author lord_rex
+ */
+public final class BuilderUtil
+{
+	private BuilderUtil()
+	{
+		// utility class
+	}
+	
+	/**
+	 * Sends builder system message to the player.
+	 * @param player
+	 * @param message
+	 */
+	public static void sendSysMessage(L2PcInstance player, String message)
+	{
+		player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "SYS", message));
+	}
+	
+	/**
+	 * Changes player's hiding state.
+	 * @param player
+	 * @param hide
+	 * @return {@code true} if hide state was changed, otherwise {@code false}
+	 */
+	public static boolean setHiding(L2PcInstance player, boolean hide)
+	{
+		if (player.isInvisible() && hide)
+		{
+			// already hiding
+			return false;
+		}
+		
+		if (!player.isInvisible() && !hide)
+		{
+			// already visible
+			return false;
+		}
+		
+		player.setSilenceMode(hide);
+		player.setIsInvul(hide);
+		player.setInvisible(hide);
+		
+		player.broadcastUserInfo();
+		player.sendPacket(new ExUserInfoAbnormalVisualEffect(player));
+		return true;
+	}
+}
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/TimeAmountInterpreter.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/TimeAmountInterpreter.java
new file mode 100644
index 0000000000..a9f8029b98
--- /dev/null
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/TimeAmountInterpreter.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 1999 CERN - European Organization for Nuclear Research.
+ * 
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear in
+ * supporting documentation. CERN makes no representations about the
+ * suitability of this software for any purpose. It is provided "as is"
+ * without expressed or implied warranty.
+ */
+package com.l2jmobius.gameserver.util;
+
+import static java.util.concurrent.TimeUnit.DAYS;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
+
+import java.io.IOException;
+import java.util.Locale;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Allows to present time intervals in a standardized, user friendly manner.
+ * @author _dev_
+ */
+public class TimeAmountInterpreter
+{
+	private static final TimeUnit[] UNIT_CACHE = TimeUnit.values();
+	
+	private TimeAmountInterpreter()
+	{
+		// utility class
+	}
+	
+	/**
+	 * Calls {@link #consolidate(long, TimeUnit)} with {@link TimeUnit#NANOSECONDS}.
+	 * @param timeAmountInNanos amount of time in nanoseconds
+	 * @return an user-friendly description of the given time amount
+	 */
+	public static String consolidateNanos(long timeAmountInNanos)
+	{
+		return consolidate(timeAmountInNanos, NANOSECONDS);
+	}
+	
+	/**
+	 * Calls {@link #consolidate(long, TimeUnit)} with {@link TimeUnit#MILLISECONDS}.
+	 * @param timeAmountInMillis amount of time in milliseconds
+	 * @return an user-friendly description of the given time amount
+	 */
+	public static String consolidateMillis(long timeAmountInMillis)
+	{
+		return consolidate(timeAmountInMillis, MILLISECONDS);
+	}
+	
+	/**
+	 * Constructs an user-friendly description of the given amount of time, specifying the number of days (if any), hours (if any), minutes (if any), seconds (if any) and milliseconds (if any). Otherwise, returns the string value {@code 0}.
+	 * @param timeAmount amount of time to be written
+	 * @param timeUnit unit of the given amount
+	 * @return an user-friendly description of the given time amount
+	 */
+	public static String consolidate(long timeAmount, TimeUnit timeUnit)
+	{
+		return consolidate(timeAmount, timeUnit, timeUnit, DAYS, "0 " + timeUnit.name().toLowerCase(Locale.ENGLISH));
+	}
+	
+	/**
+	 * Constructs an user-friendly description of the given amount of time.
+	 * @param timeAmount amount of time to be written
+	 * @param timeUnit unit of the given amount
+	 * @param minConsolidationUnit smallest unit to be included within the description
+	 * @param maxConsolidationUnit largest unit to be included within the description
+	 * @param noTimeUsedIndicator text to be written if the amount is not positive
+	 * @return an user-friendly description of the given time amount
+	 */
+	public static String consolidate(long timeAmount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator)
+	{
+		return appendConsolidated(new StringBuilder(), timeAmount, timeUnit, minConsolidationUnit, maxConsolidationUnit, noTimeUsedIndicator).toString();
+	}
+	
+	/**
+	 * Appends an user-friendly description of the given amount of time to the specified text builder.<BR>
+	 * <BR>
+	 * Please keep in mind, that this method is primarily designed to be used with heap text builders. Therefore, if the given text builder throws an {@link IOException}, this exception will be wrapped in a {@link RuntimeException} and returned to the caller as an unchecked exception.
+	 * @param <T>
+	 * @param textBuilder a character sequence builder
+	 * @param timeAmount amount of time to be written
+	 * @param timeUnit unit of the given amount
+	 * @param minConsolidationUnit smallest unit to be included within the description
+	 * @param maxConsolidationUnit largest unit to be included within the description
+	 * @param noTimeUsedIndicator text to be written if the amount is not positive
+	 * @return {@code textBuilder}
+	 * @throws RuntimeException if {@code textBuilder} throws an {@link IOException}
+	 */
+	@SuppressWarnings("unchecked")
+	public static <T extends Appendable & CharSequence> T appendConsolidated(T textBuilder, long timeAmount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator) throws RuntimeException
+	{
+		try
+		{
+			if (timeAmount < 1)
+			{
+				return (T) textBuilder.append(noTimeUsedIndicator);
+			}
+			
+			final int len = textBuilder.length();
+			for (int i = maxConsolidationUnit.ordinal(); i >= minConsolidationUnit.ordinal(); --i)
+			{
+				final TimeUnit activeUnit = UNIT_CACHE[i];
+				final long num = activeUnit.convert(timeAmount, timeUnit);
+				if (num == 0)
+				{
+					continue;
+				}
+				
+				if (textBuilder.length() > len)
+				{
+					textBuilder.append(", ");
+				}
+				textBuilder.append(String.valueOf(num)).append(' ');
+				final String unit = activeUnit.name().toLowerCase(Locale.ENGLISH);
+				textBuilder.append(unit, 0, num == 1 ? unit.length() - 1 : unit.length());
+				
+				timeAmount -= timeUnit.convert(num, activeUnit);
+			}
+			
+			if (textBuilder.length() == len)
+			{
+				return (T) textBuilder.append(noTimeUsedIndicator).append(' ').append(minConsolidationUnit.name().toLowerCase(Locale.ENGLISH));
+			}
+		}
+		catch (IOException e)
+		{
+			throw new RuntimeException(e);
+		}
+		return textBuilder;
+	}
+}
diff --git a/L2J_Mobius_3.0_Helios/dist/game/config/AdminCommands.xml b/L2J_Mobius_3.0_Helios/dist/game/config/AdminCommands.xml
index 14882ea07a..8b4096bd34 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/config/AdminCommands.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/config/AdminCommands.xml
@@ -158,8 +158,6 @@
 	<admin command="admin_earthquake_menu" accessLevel="100" />
 	<admin command="admin_bighead" accessLevel="100" />
 	<admin command="admin_shrinkhead" accessLevel="100" />
-	<admin command="admin_gmspeed" accessLevel="100" />
-	<admin command="admin_gmspeed_menu" accessLevel="100" />
 	<admin command="admin_unpara_all" accessLevel="100" />
 	<admin command="admin_para_all" accessLevel="100" />
 	<admin command="admin_unpara" accessLevel="100" />
@@ -189,6 +187,13 @@
 	<admin command="admin_set_displayeffect_menu" accessLevel="100" />
 	<admin command="admin_playmovie" accessLevel="100" />
 
+	<!-- ADMIN SPEED -->
+	<admin command="admin_gmspeed" accessLevel="100" />
+	<admin command="admin_superhaste" accessLevel="100" />
+	<admin command="admin_superhaste_menu" accessLevel="100" />
+	<admin command="admin_speed" accessLevel="100" />
+	<admin command="admin_speed_menu" accessLevel="100" />
+	
 	<!-- ADMIN ELEMENT -->
 	<admin command="admin_setlh" accessLevel="100" />
 	<admin command="admin_setlc" accessLevel="100" />
@@ -615,4 +620,7 @@
 	<admin command="banchat" accessLevel="100" />
 	<admin command="debug" accessLevel="100" />
 	<admin command="unbanchat" accessLevel="100" />
+
+	<!-- HIDE -->
+	<admin command="admin_hide" accessLevel="100" />
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/config/General.ini b/L2J_Mobius_3.0_Helios/dist/game/config/General.ini
index 832fb08b17..106b6e6078 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/config/General.ini
+++ b/L2J_Mobius_3.0_Helios/dist/game/config/General.ini
@@ -25,6 +25,10 @@ ServerGMOnly = False
 # Default: False
 GMHeroAura = False
 
+# Whether GM logins in builder hide mode by default.
+# Default: True
+GMStartupBuilderHide = True
+
 # Auto set invulnerable status to a GM on login.
 # Default: False
 GMStartupInvulnerable = True
@@ -79,6 +83,11 @@ GMGiveSpecialSkills = False
 # Default: False
 GMGiveSpecialAuraSkills = False
 
+# In case you are not satisfied with the retail-like implementation of //gmspeed",
+# with this config you can rollback it to the old custom L2J version of the GM Speed.
+# Default: False
+UseSuperHasteAsGMSpeed = False
+
 
 # ---------------------------------------------------------------------------
 # Server Security
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/gm_menu.htm b/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/gm_menu.htm
index ffe3e3d025..5a8f77eaba 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/gm_menu.htm
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/gm_menu.htm
@@ -38,11 +38,11 @@
 </table><br1>
 <table width=270><tr>
 <td><font color="LEVEL">Super Haste:</font></td>
-<td><button value="1" action="bypass -h admin_gmspeed_menu 1" width=35 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="2" action="bypass -h admin_gmspeed_menu 2" width=35 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="3" action="bypass -h admin_gmspeed_menu 3" width=35 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="4" action="bypass -h admin_gmspeed_menu 4" width=35 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="Off" action="bypass -h admin_gmspeed_menu 0" width=35 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="1" action="bypass -h admin_superhaste 1" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="2" action="bypass -h admin_superhaste 2" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="3" action="bypass -h admin_superhaste 3" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="4" action="bypass -h admin_superhaste 4" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="Off" action="bypass -h admin_superhaste 0" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr></table><br>
 <center><multiedit var="new_announcement" width=250 height=50></center>
 <table width="160"><tr>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/MasterHandler.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/MasterHandler.java
index 8ff587ff17..fa9c716767 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/MasterHandler.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/MasterHandler.java
@@ -84,9 +84,11 @@ import handlers.admincommandhandlers.AdminFortSiege;
 import handlers.admincommandhandlers.AdminGeodata;
 import handlers.admincommandhandlers.AdminGm;
 import handlers.admincommandhandlers.AdminGmChat;
+import handlers.admincommandhandlers.AdminGmSpeed;
 import handlers.admincommandhandlers.AdminGraciaSeeds;
 import handlers.admincommandhandlers.AdminGrandBoss;
 import handlers.admincommandhandlers.AdminHeal;
+import handlers.admincommandhandlers.AdminHide;
 import handlers.admincommandhandlers.AdminHtml;
 import handlers.admincommandhandlers.AdminHwid;
 import handlers.admincommandhandlers.AdminInstance;
@@ -126,6 +128,7 @@ import handlers.admincommandhandlers.AdminShutdown;
 import handlers.admincommandhandlers.AdminSkill;
 import handlers.admincommandhandlers.AdminSpawn;
 import handlers.admincommandhandlers.AdminSummon;
+import handlers.admincommandhandlers.AdminSuperHaste;
 import handlers.admincommandhandlers.AdminTarget;
 import handlers.admincommandhandlers.AdminTargetSay;
 import handlers.admincommandhandlers.AdminTeleport;
@@ -415,9 +418,11 @@ public class MasterHandler
 			AdminGeodata.class,
 			AdminGm.class,
 			AdminGmChat.class,
+			AdminGmSpeed.class,
 			AdminGraciaSeeds.class,
 			AdminGrandBoss.class,
 			AdminHeal.class,
+			AdminHide.class,
 			AdminHtml.class,
 			AdminHwid.class,
 			AdminInstance.class,
@@ -457,6 +462,7 @@ public class MasterHandler
 			AdminSkill.class,
 			AdminSpawn.class,
 			AdminSummon.class,
+			AdminSuperHaste.class,
 			AdminTarget.class,
 			AdminTargetSay.class,
 			AdminTeleport.class,
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/actionshifthandlers/L2PcInstanceActionShift.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/actionshifthandlers/L2PcInstanceActionShift.java
index 6b1bb7ac43..72c01c3cf8 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/actionshifthandlers/L2PcInstanceActionShift.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/actionshifthandlers/L2PcInstanceActionShift.java
@@ -19,7 +19,6 @@ package handlers.actionshifthandlers;
 import com.l2jmobius.gameserver.enums.InstanceType;
 import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.IActionShiftHandler;
-import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 
@@ -37,11 +36,7 @@ public class L2PcInstanceActionShift implements IActionShiftHandler
 				activeChar.setTarget(target);
 			}
 			
-			final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler("admin_character_info");
-			if (ach != null)
-			{
-				ach.useAdminCommand("admin_character_info " + target.getName(), activeChar);
-			}
+			AdminCommandHandler.getInstance().useAdminCommand(activeChar, "admin_character_info " + target.getName(), true);
 		}
 		return true;
 	}
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/actionshifthandlers/L2SummonActionShift.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/actionshifthandlers/L2SummonActionShift.java
index 67d403c9b3..6ee8a1173e 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/actionshifthandlers/L2SummonActionShift.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/actionshifthandlers/L2SummonActionShift.java
@@ -19,7 +19,6 @@ package handlers.actionshifthandlers;
 import com.l2jmobius.gameserver.enums.InstanceType;
 import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.IActionShiftHandler;
-import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 
@@ -36,11 +35,7 @@ public class L2SummonActionShift implements IActionShiftHandler
 				activeChar.setTarget(target);
 			}
 			
-			final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler("admin_summon_info");
-			if (ach != null)
-			{
-				ach.useAdminCommand("admin_summon_info", activeChar);
-			}
+			AdminCommandHandler.getInstance().useAdminCommand(activeChar, "admin_summon_info", true);
 		}
 		return true;
 	}
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
index 6c2b00db74..467875568d 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
@@ -19,7 +19,6 @@ package handlers.admincommandhandlers;
 import java.util.Arrays;
 import java.util.StringTokenizer;
 
-import com.l2jmobius.gameserver.data.xml.impl.SkillData;
 import com.l2jmobius.gameserver.enums.Movie;
 import com.l2jmobius.gameserver.enums.Team;
 import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
@@ -34,7 +33,6 @@ import com.l2jmobius.gameserver.model.html.PageBuilder;
 import com.l2jmobius.gameserver.model.html.PageResult;
 import com.l2jmobius.gameserver.model.html.styles.ButtonsStyle;
 import com.l2jmobius.gameserver.model.skills.AbnormalVisualEffect;
-import com.l2jmobius.gameserver.model.skills.Skill;
 import com.l2jmobius.gameserver.network.SystemMessageId;
 import com.l2jmobius.gameserver.network.serverpackets.Earthquake;
 import com.l2jmobius.gameserver.network.serverpackets.ExRedSky;
@@ -81,8 +79,6 @@ public class AdminEffects implements IAdminCommandHandler
 		"admin_earthquake_menu",
 		"admin_bighead",
 		"admin_shrinkhead",
-		"admin_gmspeed",
-		"admin_gmspeed_menu",
 		"admin_unpara_all",
 		"admin_para_all",
 		"admin_unpara",
@@ -351,35 +347,6 @@ public class AdminEffects implements IAdminCommandHandler
 			{
 			}
 		}
-		else if (command.startsWith("admin_gmspeed"))
-		{
-			try
-			{
-				final int val = Integer.parseInt(st.nextToken());
-				final boolean sendMessage = activeChar.isAffectedBySkill(7029);
-				activeChar.stopSkillEffects((val == 0) && sendMessage, 7029);
-				if ((val >= 1) && (val <= 4))
-				{
-					int time = 0;
-					if (st.hasMoreTokens())
-					{
-						time = Integer.parseInt(st.nextToken());
-					}
-					
-					final Skill gmSpeedSkill = SkillData.getInstance().getSkill(7029, val);
-					gmSpeedSkill.applyEffects(activeChar, activeChar, true, time);
-				}
-			}
-			catch (Exception e)
-			{
-				activeChar.sendMessage("Usage: //gmspeed <Effect level (0-4)> <Time in seconds>");
-			}
-			if (command.contains("_menu"))
-			{
-				command = "";
-				AdminHtml.showAdminHtml(activeChar, "gm_menu.htm");
-			}
-		}
 		else if (command.startsWith("admin_polyself"))
 		{
 			try
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmSpeed.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmSpeed.java
new file mode 100644
index 0000000000..5ab5f39a9b
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmSpeed.java
@@ -0,0 +1,119 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.admincommandhandlers;
+
+import java.util.EnumSet;
+import java.util.Set;
+import java.util.StringTokenizer;
+
+import com.l2jmobius.Config;
+import com.l2jmobius.gameserver.handler.AdminCommandHandler;
+import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
+import com.l2jmobius.gameserver.model.L2Object;
+import com.l2jmobius.gameserver.model.actor.L2Character;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.model.stats.Stats;
+import com.l2jmobius.gameserver.util.BuilderUtil;
+import com.l2jmobius.gameserver.util.Util;
+
+/**
+ * A retail-like implementation of //gmspeed builder command.
+ * @author lord_rex
+ */
+public final class AdminGmSpeed implements IAdminCommandHandler
+{
+	private static final String[] ADMIN_COMMANDS =
+	{
+		"admin_gmspeed",
+	};
+	
+	private static final Set<Stats> SPEED_STATS = EnumSet.of(Stats.RUN_SPEED, Stats.WALK_SPEED, Stats.SWIM_RUN_SPEED, Stats.SWIM_WALK_SPEED, Stats.FLY_RUN_SPEED, Stats.FLY_WALK_SPEED);
+	
+	@Override
+	public boolean useAdminCommand(String command, L2PcInstance player)
+	{
+		final StringTokenizer st = new StringTokenizer(command);
+		final String cmd = st.nextToken();
+		
+		if (cmd.equals("admin_gmspeed"))
+		{
+			if (!st.hasMoreTokens())
+			{
+				BuilderUtil.sendSysMessage(player, "//gmspeed [0...10]");
+				return false;
+			}
+			final String token = st.nextToken();
+			
+			// Rollback feature for old custom way, in order to make everyone happy.
+			if (Config.USE_SUPER_HASTE_AS_GM_SPEED)
+			{
+				AdminCommandHandler.getInstance().useAdminCommand(player, AdminSuperHaste.ADMIN_COMMANDS[0] + " " + token, false);
+				return true;
+			}
+			
+			if (!Util.isDouble(token))
+			{
+				BuilderUtil.sendSysMessage(player, "//gmspeed [0...10]");
+				return false;
+			}
+			final double runSpeedBoost = Double.parseDouble(token);
+			if ((runSpeedBoost < 0) || (runSpeedBoost > 10))
+			{
+				// Custom limit according to SDW's request - real retail limit is unknown.
+				BuilderUtil.sendSysMessage(player, "//gmspeed [0...10]");
+				return false;
+			}
+			
+			final L2Character targetCharacter;
+			final L2Object target = player.getTarget();
+			if ((target != null) && target.isCharacter())
+			{
+				targetCharacter = (L2Character) target;
+			}
+			else
+			{
+				// If there is no target, let's use the command executer.
+				targetCharacter = player;
+			}
+			
+			SPEED_STATS.forEach(speedStat -> targetCharacter.getStat().removeFixedValue(speedStat));
+			if (runSpeedBoost > 0)
+			{
+				SPEED_STATS.forEach(speedStat -> targetCharacter.getStat().addFixedValue(speedStat, targetCharacter.getTemplate().getBaseValue(speedStat, 120) * runSpeedBoost));
+			}
+			
+			targetCharacter.getStat().recalculateStats(false);
+			if (targetCharacter.isPlayer())
+			{
+				((L2PcInstance) targetCharacter).broadcastUserInfo();
+			}
+			else
+			{
+				targetCharacter.broadcastInfo();
+			}
+			
+			BuilderUtil.sendSysMessage(player, "[" + targetCharacter.getName() + "] speed is [" + (runSpeedBoost * 100) + "0]% fast.");
+		}
+		return true;
+	}
+	
+	@Override
+	public String[] getAdminCommandList()
+	{
+		return ADMIN_COMMANDS;
+	}
+}
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminHide.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminHide.java
new file mode 100644
index 0000000000..600cbe1639
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminHide.java
@@ -0,0 +1,87 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.admincommandhandlers;
+
+import java.util.StringTokenizer;
+
+import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.util.BuilderUtil;
+
+/**
+ * @author lord_rex
+ */
+public final class AdminHide implements IAdminCommandHandler
+{
+	private static final String[] ADMIN_COMMANDS =
+	{
+		"admin_hide"
+	};
+	
+	@Override
+	public boolean useAdminCommand(String command, L2PcInstance player)
+	{
+		final StringTokenizer st = new StringTokenizer(command);
+		st.nextToken();
+		
+		try
+		{
+			final String param = st.nextToken();
+			switch (param)
+			{
+				case "on":
+				{
+					if (!BuilderUtil.setHiding(player, true))
+					{
+						BuilderUtil.sendSysMessage(player, "Currently, you cannot be seen.");
+						return true;
+					}
+					
+					BuilderUtil.sendSysMessage(player, "Now, you cannot be seen.");
+					return true;
+				}
+				case "off":
+				{
+					if (!BuilderUtil.setHiding(player, false))
+					{
+						BuilderUtil.sendSysMessage(player, "Currently, you can be seen.");
+						return true;
+					}
+					
+					BuilderUtil.sendSysMessage(player, "Now, you can be seen.");
+					return true;
+				}
+				default:
+				{
+					BuilderUtil.sendSysMessage(player, "//hide [on|off]");
+					return true;
+				}
+			}
+		}
+		catch (final Exception e)
+		{
+			BuilderUtil.sendSysMessage(player, "//hide [on|off]");
+			return true;
+		}
+	}
+	
+	@Override
+	public String[] getAdminCommandList()
+	{
+		return ADMIN_COMMANDS;
+	}
+}
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java
index 5ab19d4b39..8c735f4265 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java
@@ -21,7 +21,6 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.gameserver.data.xml.impl.AdminData;
 import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.model.L2Clan;
@@ -187,14 +186,7 @@ public class AdminMenu implements IAdminCommandHandler
 			if (st.countTokens() > 1)
 			{
 				final String subCommand = "admin_ban_char";
-				if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel()))
-				{
-					activeChar.sendMessage("You don't have the access right to use this command!");
-					LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!");
-					return false;
-				}
-				final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand);
-				ach.useAdminCommand(subCommand + command.substring(14), activeChar);
+				AdminCommandHandler.getInstance().useAdminCommand(activeChar, subCommand + command.substring(14), true);
 			}
 			showMainPage(activeChar);
 		}
@@ -204,14 +196,7 @@ public class AdminMenu implements IAdminCommandHandler
 			if (st.countTokens() > 1)
 			{
 				final String subCommand = "admin_unban_char";
-				if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel()))
-				{
-					activeChar.sendMessage("You don't have the access right to use this command!");
-					LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!");
-					return false;
-				}
-				final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand);
-				ach.useAdminCommand(subCommand + command.substring(16), activeChar);
+				AdminCommandHandler.getInstance().useAdminCommand(activeChar, subCommand + command.substring(16), true);
 			}
 			showMainPage(activeChar);
 		}
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java
index a818e7f3d3..f27d63e949 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java
@@ -16,9 +16,6 @@
  */
 package handlers.admincommandhandlers;
 
-import java.util.logging.Logger;
-
-import com.l2jmobius.gameserver.data.xml.impl.AdminData;
 import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -28,8 +25,6 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
  */
 public class AdminSummon implements IAdminCommandHandler
 {
-	private static final Logger LOGGER = Logger.getLogger(AdminSummon.class.getName());
-	
 	public static final String[] ADMIN_COMMANDS =
 	{
 		"admin_summon"
@@ -62,34 +57,24 @@ public class AdminSummon implements IAdminCommandHandler
 			return false;
 		}
 		
-		String subCommand;
+		final String subCommand;
 		if (id < 1000000)
 		{
 			subCommand = "admin_create_item";
-			if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel()))
-			{
-				activeChar.sendMessage("You don't have the access right to use this command!");
-				LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!");
-				return false;
-			}
-			final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand);
-			ach.useAdminCommand(subCommand + " " + id + " " + count, activeChar);
 		}
 		else
 		{
 			subCommand = "admin_spawn_once";
-			if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel()))
-			{
-				activeChar.sendMessage("You don't have the access right to use this command!");
-				LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!");
-				return false;
-			}
-			final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand);
 			
 			activeChar.sendMessage("This is only a temporary spawn.  The mob(s) will NOT respawn.");
 			id -= 1000000;
-			ach.useAdminCommand(subCommand + " " + id + " " + count, activeChar);
 		}
+		
+		if ((id > 0) && (count > 0))
+		{
+			AdminCommandHandler.getInstance().useAdminCommand(activeChar, subCommand + " " + id + " " + count, true);
+		}
+		
 		return true;
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminSuperHaste.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminSuperHaste.java
new file mode 100644
index 0000000000..4a3eb0c809
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminSuperHaste.java
@@ -0,0 +1,92 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.admincommandhandlers;
+
+import java.util.StringTokenizer;
+
+import com.l2jmobius.gameserver.data.xml.impl.SkillData;
+import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.model.skills.Skill;
+
+/**
+ * The classical custom L2J implementation of the old //gmspeed GM command.
+ * @author lord_rex (No, it wasn't me at all. Eclipse added my name there.)
+ */
+public final class AdminSuperHaste implements IAdminCommandHandler
+{
+	public static final String[] ADMIN_COMMANDS =
+	{
+		"admin_superhaste",
+		"admin_superhaste_menu",
+		"admin_speed",
+		"admin_speed_menu",
+	};
+	
+	private static final int SUPER_HASTE_ID = 7029;
+	
+	@Override
+	public boolean useAdminCommand(String command, L2PcInstance player)
+	{
+		final StringTokenizer st = new StringTokenizer(command);
+		final String cmd = st.nextToken();
+		switch (cmd)
+		{
+			case "admin_superhaste":
+			case "admin_speed":
+			{
+				try
+				{
+					final int val = Integer.parseInt(st.nextToken());
+					final boolean sendMessage = player.isAffectedBySkill(SUPER_HASTE_ID);
+					player.stopSkillEffects((val == 0) && sendMessage, SUPER_HASTE_ID);
+					if ((val >= 1) && (val <= 4))
+					{
+						int time = 0;
+						if (st.hasMoreTokens())
+						{
+							time = Integer.parseInt(st.nextToken());
+						}
+						
+						final Skill superHasteSkill = SkillData.getInstance().getSkill(SUPER_HASTE_ID, val);
+						superHasteSkill.applyEffects(player, player, true, time);
+					}
+				}
+				catch (final Exception e)
+				{
+					player.sendMessage("Usage: //superhaste <Effect level (0-4)> <Time in seconds>");
+				}
+				
+				break;
+			}
+			case "admin_superhaste_menu":
+			case "admin_speed_menu":
+			{
+				AdminHtml.showAdminHtml(player, "gm_menu.htm");
+				break;
+			}
+		}
+		
+		return true;
+	}
+	
+	@Override
+	public String[] getAdminCommandList()
+	{
+		return ADMIN_COMMANDS;
+	}
+}
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/Config.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/Config.java
index a4e05e7f84..b49c72d33b 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/Config.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/Config.java
@@ -400,6 +400,7 @@ public final class Config
 	public static int DEFAULT_ACCESS_LEVEL;
 	public static boolean SERVER_GMONLY;
 	public static boolean GM_HERO_AURA;
+	public static boolean GM_STARTUP_BUILDER_HIDE;
 	public static boolean GM_STARTUP_INVULNERABLE;
 	public static boolean GM_STARTUP_INVISIBLE;
 	public static boolean GM_STARTUP_SILENCE;
@@ -413,6 +414,7 @@ public final class Config
 	public static boolean GM_CRITANNOUNCER_NAME;
 	public static boolean GM_GIVE_SPECIAL_SKILLS;
 	public static boolean GM_GIVE_SPECIAL_AURA_SKILLS;
+	public static boolean USE_SUPER_HASTE_AS_GM_SPEED;
 	public static boolean GAMEGUARD_ENFORCE;
 	public static boolean GAMEGUARD_PROHIBITACTION;
 	public static boolean LOG_CHAT;
@@ -1822,6 +1824,7 @@ public final class Config
 			DEFAULT_ACCESS_LEVEL = General.getInt("DefaultAccessLevel", 0);
 			SERVER_GMONLY = General.getBoolean("ServerGMOnly", false);
 			GM_HERO_AURA = General.getBoolean("GMHeroAura", false);
+			GM_STARTUP_BUILDER_HIDE = General.getBoolean("GMStartupBuilderHide", false);
 			GM_STARTUP_INVULNERABLE = General.getBoolean("GMStartupInvulnerable", false);
 			GM_STARTUP_INVISIBLE = General.getBoolean("GMStartupInvisible", false);
 			GM_STARTUP_SILENCE = General.getBoolean("GMStartupSilence", false);
@@ -1835,6 +1838,7 @@ public final class Config
 			GM_CRITANNOUNCER_NAME = General.getBoolean("GMShowCritAnnouncerName", false);
 			GM_GIVE_SPECIAL_SKILLS = General.getBoolean("GMGiveSpecialSkills", false);
 			GM_GIVE_SPECIAL_AURA_SKILLS = General.getBoolean("GMGiveSpecialAuraSkills", false);
+			USE_SUPER_HASTE_AS_GM_SPEED = General.getBoolean("UseSuperHasteAsGMSpeed", false);
 			GAMEGUARD_ENFORCE = General.getBoolean("GameGuardEnforce", false);
 			GAMEGUARD_PROHIBITACTION = General.getBoolean("GameGuardProhibitAction", false);
 			LOG_CHAT = General.getBoolean("LogChat", false);
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
index adf6462b78..c4faf3bd6d 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
@@ -18,12 +18,26 @@ package com.l2jmobius.gameserver.handler;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.logging.Logger;
+
+import com.l2jmobius.Config;
+import com.l2jmobius.commons.concurrent.ThreadPool;
+import com.l2jmobius.gameserver.data.xml.impl.AdminData;
+import com.l2jmobius.gameserver.enums.PlayerAction;
+import com.l2jmobius.gameserver.model.L2Object;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.SystemMessageId;
+import com.l2jmobius.gameserver.network.serverpackets.ConfirmDlg;
+import com.l2jmobius.gameserver.util.GMAudit;
+import com.l2jmobius.gameserver.util.TimeAmountInterpreter;
 
 /**
  * @author UnAfraid
  */
 public class AdminCommandHandler implements IHandler<IAdminCommandHandler, String>
 {
+	private static final Logger LOGGER = Logger.getLogger(AdminCommandHandler.class.getName());
+	
 	private final Map<String, IAdminCommandHandler> _datatable;
 	
 	protected AdminCommandHandler()
@@ -49,10 +63,85 @@ public class AdminCommandHandler implements IHandler<IAdminCommandHandler, Strin
 		}
 	}
 	
+	/**
+	 * WARNING: Please use {@link #useAdminCommand(L2PcInstance, String, boolean)} instead.
+	 */
 	@Override
 	public IAdminCommandHandler getHandler(String adminCommand)
 	{
-		return _datatable.get(adminCommand.contains(" ") ? adminCommand.substring(0, adminCommand.indexOf(" ")) : adminCommand);
+		String command = adminCommand;
+		if (adminCommand.contains(" "))
+		{
+			command = adminCommand.substring(0, adminCommand.indexOf(" "));
+		}
+		return _datatable.get(command);
+	}
+	
+	public void useAdminCommand(L2PcInstance player, String fullCommand, boolean useConfirm)
+	{
+		final String command = fullCommand.split(" ")[0];
+		final String commandNoPrefix = command.substring(6);
+		
+		final IAdminCommandHandler handler = getHandler(command);
+		if (handler == null)
+		{
+			if (player.isGM())
+			{
+				player.sendMessage("The command '" + commandNoPrefix + "' does not exist!");
+			}
+			LOGGER.warning("No handler registered for admin command '" + command + "'");
+			return;
+		}
+		
+		if (!AdminData.getInstance().hasAccess(command, player.getAccessLevel()))
+		{
+			player.sendMessage("You don't have the access rights to use this command!");
+			LOGGER.warning("Player " + player.getName() + " tried to use admin command '" + command + "', without proper access level!");
+			return;
+		}
+		
+		if (useConfirm && AdminData.getInstance().requireConfirm(command))
+		{
+			player.setAdminConfirmCmd(fullCommand);
+			final ConfirmDlg dlg = new ConfirmDlg(SystemMessageId.S1_3);
+			dlg.addString("Are you sure you want execute command '" + commandNoPrefix + "' ?");
+			player.addAction(PlayerAction.ADMIN_COMMAND);
+			player.sendPacket(dlg);
+		}
+		else
+		{
+			// Admin Commands must run through a long running task, otherwise a command that takes too much time will freeze the server, this way you'll feel only a minor spike.
+			ThreadPool.execute(() ->
+			{
+				final long begin = System.currentTimeMillis();
+				try
+				{
+					if (Config.GMAUDIT)
+					{
+						final L2Object target = player.getTarget();
+						GMAudit.auditGMAction(player.getName() + " [" + player.getObjectId() + "]", fullCommand, (target != null ? target.getName() : "no-target"));
+					}
+					
+					handler.useAdminCommand(fullCommand, player);
+				}
+				catch (RuntimeException e)
+				{
+					player.sendMessage("Exception during execution of  '" + fullCommand + "': " + e.toString());
+					LOGGER.warning("Exception during execution of " + fullCommand + " " + e);
+				}
+				finally
+				{
+					final long runtime = System.currentTimeMillis() - begin;
+					
+					if (runtime < 5000)
+					{
+						return;
+					}
+					
+					player.sendMessage("The execution of '" + fullCommand + "' took " + TimeAmountInterpreter.consolidateMillis(runtime) + ".");
+				}
+			});
+		}
 	}
 	
 	@Override
@@ -63,11 +152,11 @@ public class AdminCommandHandler implements IHandler<IAdminCommandHandler, Strin
 	
 	public static AdminCommandHandler getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final AdminCommandHandler _instance = new AdminCommandHandler();
+		protected static final AdminCommandHandler INSTANCE = new AdminCommandHandler();
 	}
 }
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
index 1f702852d5..186e413fcc 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
@@ -99,8 +99,6 @@ import com.l2jmobius.gameserver.enums.SubclassInfoType;
 import com.l2jmobius.gameserver.enums.Team;
 import com.l2jmobius.gameserver.enums.UserInfoType;
 import com.l2jmobius.gameserver.geoengine.GeoEngine;
-import com.l2jmobius.gameserver.handler.AdminCommandHandler;
-import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.handler.IItemHandler;
 import com.l2jmobius.gameserver.handler.ItemHandler;
 import com.l2jmobius.gameserver.idfactory.IdFactory;
@@ -340,7 +338,6 @@ import com.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
 import com.l2jmobius.gameserver.util.Broadcast;
 import com.l2jmobius.gameserver.util.EnumIntBitmask;
 import com.l2jmobius.gameserver.util.FloodProtectors;
-import com.l2jmobius.gameserver.util.GMAudit;
 import com.l2jmobius.gameserver.util.Util;
 
 /**
@@ -10065,8 +10062,9 @@ public final class L2PcInstance extends L2Playable
 	{
 		startWarnUserTakeBreak();
 		
-		if (isGM())
+		if (isGM() && !Config.GM_STARTUP_BUILDER_HIDE)
 		{
+			// Bleah, see L2J custom below.
 			if (isInvul())
 			{
 				sendMessage("Entering world in Invulnerable mode.");
@@ -13800,50 +13798,6 @@ public final class L2PcInstance extends L2Playable
 		return (super.isVisibleFor(player) || ((player.getParty() != null) && (player.getParty() == getParty())));
 	}
 	
-	/**
-	 * @param fullCommand
-	 */
-	public void useAdminCommand(String fullCommand)
-	{
-		final String command = fullCommand.split(" ")[0];
-		
-		final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(command);
-		if (ach == null)
-		{
-			if (isGM())
-			{
-				sendMessage("The command " + command.substring(6) + " does not exist!");
-			}
-			LOGGER.warning("No handler registered for admin command '" + command + "'");
-			return;
-		}
-		
-		if (!AdminData.getInstance().hasAccess(command, getAccessLevel()))
-		{
-			sendMessage("You don't have the access rights to use this command!");
-			LOGGER.warning("Character " + getName() + " tried to use admin command " + command + ", without proper access level!");
-			return;
-		}
-		
-		if (AdminData.getInstance().requireConfirm(command))
-		{
-			setAdminConfirmCmd(fullCommand);
-			final ConfirmDlg dlg = new ConfirmDlg(SystemMessageId.S1_3);
-			dlg.addString("Are you sure you want execute command " + fullCommand.substring(6) + " ?");
-			addAction(PlayerAction.ADMIN_COMMAND);
-			sendPacket(dlg);
-		}
-		else
-		{
-			if (Config.GMAUDIT)
-			{
-				GMAudit.auditGMAction(getName() + " [" + getObjectId() + "]", fullCommand, (getTarget() != null ? getTarget().getName() : "no-target"));
-			}
-			
-			ach.useAdminCommand(fullCommand, this);
-		}
-	}
-	
 	/**
 	 * Set the Quest zone ID.
 	 * @param id the quest zone ID
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java
index f1eefdc748..2dd69a67f8 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java
@@ -16,12 +16,9 @@
  */
 package com.l2jmobius.gameserver.network.clientpackets;
 
-import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketReader;
-import com.l2jmobius.gameserver.data.xml.impl.AdminData;
 import com.l2jmobius.gameserver.enums.PlayerAction;
 import com.l2jmobius.gameserver.handler.AdminCommandHandler;
-import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.events.EventDispatcher;
 import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerDlgAnswer;
@@ -30,7 +27,6 @@ import com.l2jmobius.gameserver.model.holders.DoorRequestHolder;
 import com.l2jmobius.gameserver.model.holders.SummonRequestHolder;
 import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.util.GMAudit;
 
 /**
  * @author Dezmond_snz
@@ -75,16 +71,9 @@ public final class DlgAnswer implements IClientIncomingPacket
 				{
 					return;
 				}
-				final String command = cmd.split(" ")[0];
-				final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(command);
-				if (AdminData.getInstance().hasAccess(command, activeChar.getAccessLevel()))
-				{
-					if (Config.GMAUDIT)
-					{
-						GMAudit.auditGMAction(activeChar.getName() + " [" + activeChar.getObjectId() + "]", cmd, (activeChar.getTarget() != null ? activeChar.getTarget().getName() : "no-target"));
-					}
-					ach.useAdminCommand(cmd, activeChar);
-				}
+				
+				// The 'useConfirm' must be disabled here, as we don't want to repeat that process.
+				AdminCommandHandler.getInstance().useAdminCommand(activeChar, cmd, false);
 			}
 		}
 		else if ((_messageId == SystemMessageId.C1_IS_ATTEMPTING_TO_DO_A_RESURRECTION_THAT_RESTORES_S2_S3_XP_ACCEPT.getId()) || (_messageId == SystemMessageId.YOUR_CHARM_OF_COURAGE_IS_TRYING_TO_RESURRECT_YOU_WOULD_YOU_LIKE_TO_RESURRECT_NOW.getId()))
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 78d79fd27b..04512f5f2b 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -103,6 +103,7 @@ import com.l2jmobius.gameserver.network.serverpackets.attendance.ExVipAttendance
 import com.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward;
 import com.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList;
 import com.l2jmobius.gameserver.network.serverpackets.friend.L2FriendList;
+import com.l2jmobius.gameserver.util.BuilderUtil;
 
 /**
  * Enter World Packet Handler
@@ -210,35 +211,50 @@ public class EnterWorld implements IClientIncomingPacket
 		// Apply special GM properties to the GM when entering
 		if (activeChar.isGM())
 		{
-			if (Config.GM_STARTUP_INVULNERABLE && AdminData.getInstance().hasAccess("admin_invul", activeChar.getAccessLevel()))
+			gmStartupProcess:
 			{
-				activeChar.setIsInvul(true);
-			}
-			
-			if (Config.GM_STARTUP_INVISIBLE && AdminData.getInstance().hasAccess("admin_invisible", activeChar.getAccessLevel()))
-			{
-				activeChar.setInvisible(true);
-				activeChar.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.STEALTH);
-			}
-			
-			if (Config.GM_STARTUP_SILENCE && AdminData.getInstance().hasAccess("admin_silence", activeChar.getAccessLevel()))
-			{
-				activeChar.setSilenceMode(true);
-			}
-			
-			if (Config.GM_STARTUP_DIET_MODE && AdminData.getInstance().hasAccess("admin_diet", activeChar.getAccessLevel()))
-			{
-				activeChar.setDietMode(true);
-				activeChar.refreshOverloaded(true);
-			}
-			
-			if (Config.GM_STARTUP_AUTO_LIST && AdminData.getInstance().hasAccess("admin_gmliston", activeChar.getAccessLevel()))
-			{
-				AdminData.getInstance().addGm(activeChar, false);
-			}
-			else
-			{
-				AdminData.getInstance().addGm(activeChar, true);
+				if (Config.GM_STARTUP_BUILDER_HIDE && AdminData.getInstance().hasAccess("admin_hide", activeChar.getAccessLevel()))
+				{
+					BuilderUtil.setHiding(activeChar, true);
+					
+					BuilderUtil.sendSysMessage(activeChar, "hide is default for builder.");
+					BuilderUtil.sendSysMessage(activeChar, "FriendAddOff is default for builder.");
+					BuilderUtil.sendSysMessage(activeChar, "whisperoff is default for builder.");
+					
+					// It isn't recommend to use the below custom L2J GMStartup functions together with retail-like GMStartupBuilderHide, so breaking the process at that stage.
+					break gmStartupProcess;
+				}
+				
+				if (Config.GM_STARTUP_INVULNERABLE && AdminData.getInstance().hasAccess("admin_invul", activeChar.getAccessLevel()))
+				{
+					activeChar.setIsInvul(true);
+				}
+				
+				if (Config.GM_STARTUP_INVISIBLE && AdminData.getInstance().hasAccess("admin_invisible", activeChar.getAccessLevel()))
+				{
+					activeChar.setInvisible(true);
+					activeChar.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.STEALTH);
+				}
+				
+				if (Config.GM_STARTUP_SILENCE && AdminData.getInstance().hasAccess("admin_silence", activeChar.getAccessLevel()))
+				{
+					activeChar.setSilenceMode(true);
+				}
+				
+				if (Config.GM_STARTUP_DIET_MODE && AdminData.getInstance().hasAccess("admin_diet", activeChar.getAccessLevel()))
+				{
+					activeChar.setDietMode(true);
+					activeChar.refreshOverloaded(true);
+				}
+				
+				if (Config.GM_STARTUP_AUTO_LIST && AdminData.getInstance().hasAccess("admin_gmliston", activeChar.getAccessLevel()))
+				{
+					AdminData.getInstance().addGm(activeChar, false);
+				}
+				else
+				{
+					AdminData.getInstance().addGm(activeChar, true);
+				}
 			}
 			
 			if (Config.GM_GIVE_SPECIAL_SKILLS)
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java
index 7621a7029e..27753dcf85 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java
@@ -23,6 +23,7 @@ import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.data.xml.impl.MultisellData;
+import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.BypassHandler;
 import com.l2jmobius.gameserver.handler.CommunityBoardHandler;
 import com.l2jmobius.gameserver.handler.IBypassHandler;
@@ -133,7 +134,7 @@ public final class RequestBypassToServer implements IClientIncomingPacket
 		{
 			if (_command.startsWith("admin_"))
 			{
-				activeChar.useAdminCommand(_command);
+				AdminCommandHandler.getInstance().useAdminCommand(activeChar, _command, true);
 			}
 			else if (CommunityBoardHandler.getInstance().isCommunityBoardCommand(_command))
 			{
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
index 9805ae3e39..b6b85e45d9 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
@@ -24,6 +24,7 @@ import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.enums.PrivateStoreType;
+import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.instancemanager.CursedWeaponsManager;
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.L2World;
@@ -107,7 +108,7 @@ public final class RequestDestroyItem implements IClientIncomingPacket
 					{
 						count = ((L2ItemInstance) obj).getCount();
 					}
-					activeChar.useAdminCommand("admin_delete_item " + _objectId + " " + count);
+					AdminCommandHandler.getInstance().useAdminCommand(activeChar, "admin_delete_item " + _objectId + " " + count, true);
 				}
 				return;
 			}
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialLinkHtml.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialLinkHtml.java
index e230c6ec10..eac5eea401 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialLinkHtml.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialLinkHtml.java
@@ -17,6 +17,7 @@
 package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
+import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.BypassHandler;
 import com.l2jmobius.gameserver.handler.IBypassHandler;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -45,7 +46,7 @@ public class RequestTutorialLinkHtml implements IClientIncomingPacket
 		
 		if (_bypass.startsWith("admin_"))
 		{
-			player.useAdminCommand(_bypass);
+			AdminCommandHandler.getInstance().useAdminCommand(player, _bypass, true);
 		}
 		else
 		{
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialPassCmdToServer.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialPassCmdToServer.java
index 3b9d386e05..dc2e10cc02 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialPassCmdToServer.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialPassCmdToServer.java
@@ -17,6 +17,7 @@
 package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
+import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.BypassHandler;
 import com.l2jmobius.gameserver.handler.IBypassHandler;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -46,7 +47,7 @@ public class RequestTutorialPassCmdToServer implements IClientIncomingPacket
 		
 		if (_bypass.startsWith("admin_"))
 		{
-			player.useAdminCommand(_bypass);
+			AdminCommandHandler.getInstance().useAdminCommand(player, _bypass, true);
 		}
 		else
 		{
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java
index 2255ca3502..2487fbe4a4 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java
@@ -16,14 +16,10 @@
  */
 package com.l2jmobius.gameserver.network.clientpackets;
 
-import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketReader;
-import com.l2jmobius.gameserver.data.xml.impl.AdminData;
 import com.l2jmobius.gameserver.handler.AdminCommandHandler;
-import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.network.L2GameClient;
-import com.l2jmobius.gameserver.util.GMAudit;
 
 /**
  * This class handles all GM commands triggered by //command
@@ -56,33 +52,6 @@ public final class SendBypassBuildCmd implements IClientIncomingPacket
 			return;
 		}
 		
-		final String command = "admin_" + _command.split(" ")[0];
-		
-		final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(command);
-		
-		if (ach == null)
-		{
-			if (activeChar.isGM())
-			{
-				activeChar.sendMessage("The command " + command.substring(6) + " does not exists!");
-			}
-			
-			LOGGER.warning("No handler registered for admin command '" + command + "'");
-			return;
-		}
-		
-		if (!AdminData.getInstance().hasAccess(command, activeChar.getAccessLevel()))
-		{
-			activeChar.sendMessage("You don't have the access right to use this command!");
-			LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + command + ", but have no access to it!");
-			return;
-		}
-		
-		if (Config.GMAUDIT)
-		{
-			GMAudit.auditGMAction(activeChar.getName() + " [" + activeChar.getObjectId() + "]", _command, (activeChar.getTarget() != null ? activeChar.getTarget().getName() : "no-target"));
-		}
-		
-		ach.useAdminCommand("admin_" + _command, activeChar);
+		AdminCommandHandler.getInstance().useAdminCommand(activeChar, "admin_" + _command, true);
 	}
 }
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java
index 8ae98bd315..274245a42a 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java
@@ -27,6 +27,7 @@ import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.ai.NextAction;
 import com.l2jmobius.gameserver.enums.ItemSkillType;
 import com.l2jmobius.gameserver.enums.PrivateStoreType;
+import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.IItemHandler;
 import com.l2jmobius.gameserver.handler.ItemHandler;
 import com.l2jmobius.gameserver.instancemanager.FortSiegeManager;
@@ -95,7 +96,7 @@ public final class UseItem implements IClientIncomingPacket
 				final L2Object obj = L2World.getInstance().findObject(_objectId);
 				if (obj instanceof L2ItemInstance)
 				{
-					activeChar.useAdminCommand("admin_use_item " + _objectId);
+					AdminCommandHandler.getInstance().useAdminCommand(activeChar, "admin_use_item " + _objectId, true);
 				}
 			}
 			return;
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/BuilderUtil.java
new file mode 100644
index 0000000000..5d813d36b4
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/BuilderUtil.java
@@ -0,0 +1,72 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jmobius.gameserver.util;
+
+import com.l2jmobius.gameserver.enums.ChatType;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.serverpackets.CreatureSay;
+import com.l2jmobius.gameserver.network.serverpackets.ExUserInfoAbnormalVisualEffect;
+
+/**
+ * @author lord_rex
+ */
+public final class BuilderUtil
+{
+	private BuilderUtil()
+	{
+		// utility class
+	}
+	
+	/**
+	 * Sends builder system message to the player.
+	 * @param player
+	 * @param message
+	 */
+	public static void sendSysMessage(L2PcInstance player, String message)
+	{
+		player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "SYS", message));
+	}
+	
+	/**
+	 * Changes player's hiding state.
+	 * @param player
+	 * @param hide
+	 * @return {@code true} if hide state was changed, otherwise {@code false}
+	 */
+	public static boolean setHiding(L2PcInstance player, boolean hide)
+	{
+		if (player.isInvisible() && hide)
+		{
+			// already hiding
+			return false;
+		}
+		
+		if (!player.isInvisible() && !hide)
+		{
+			// already visible
+			return false;
+		}
+		
+		player.setSilenceMode(hide);
+		player.setIsInvul(hide);
+		player.setInvisible(hide);
+		
+		player.broadcastUserInfo();
+		player.sendPacket(new ExUserInfoAbnormalVisualEffect(player));
+		return true;
+	}
+}
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/TimeAmountInterpreter.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/TimeAmountInterpreter.java
new file mode 100644
index 0000000000..a9f8029b98
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/TimeAmountInterpreter.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 1999 CERN - European Organization for Nuclear Research.
+ * 
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear in
+ * supporting documentation. CERN makes no representations about the
+ * suitability of this software for any purpose. It is provided "as is"
+ * without expressed or implied warranty.
+ */
+package com.l2jmobius.gameserver.util;
+
+import static java.util.concurrent.TimeUnit.DAYS;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
+
+import java.io.IOException;
+import java.util.Locale;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Allows to present time intervals in a standardized, user friendly manner.
+ * @author _dev_
+ */
+public class TimeAmountInterpreter
+{
+	private static final TimeUnit[] UNIT_CACHE = TimeUnit.values();
+	
+	private TimeAmountInterpreter()
+	{
+		// utility class
+	}
+	
+	/**
+	 * Calls {@link #consolidate(long, TimeUnit)} with {@link TimeUnit#NANOSECONDS}.
+	 * @param timeAmountInNanos amount of time in nanoseconds
+	 * @return an user-friendly description of the given time amount
+	 */
+	public static String consolidateNanos(long timeAmountInNanos)
+	{
+		return consolidate(timeAmountInNanos, NANOSECONDS);
+	}
+	
+	/**
+	 * Calls {@link #consolidate(long, TimeUnit)} with {@link TimeUnit#MILLISECONDS}.
+	 * @param timeAmountInMillis amount of time in milliseconds
+	 * @return an user-friendly description of the given time amount
+	 */
+	public static String consolidateMillis(long timeAmountInMillis)
+	{
+		return consolidate(timeAmountInMillis, MILLISECONDS);
+	}
+	
+	/**
+	 * Constructs an user-friendly description of the given amount of time, specifying the number of days (if any), hours (if any), minutes (if any), seconds (if any) and milliseconds (if any). Otherwise, returns the string value {@code 0}.
+	 * @param timeAmount amount of time to be written
+	 * @param timeUnit unit of the given amount
+	 * @return an user-friendly description of the given time amount
+	 */
+	public static String consolidate(long timeAmount, TimeUnit timeUnit)
+	{
+		return consolidate(timeAmount, timeUnit, timeUnit, DAYS, "0 " + timeUnit.name().toLowerCase(Locale.ENGLISH));
+	}
+	
+	/**
+	 * Constructs an user-friendly description of the given amount of time.
+	 * @param timeAmount amount of time to be written
+	 * @param timeUnit unit of the given amount
+	 * @param minConsolidationUnit smallest unit to be included within the description
+	 * @param maxConsolidationUnit largest unit to be included within the description
+	 * @param noTimeUsedIndicator text to be written if the amount is not positive
+	 * @return an user-friendly description of the given time amount
+	 */
+	public static String consolidate(long timeAmount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator)
+	{
+		return appendConsolidated(new StringBuilder(), timeAmount, timeUnit, minConsolidationUnit, maxConsolidationUnit, noTimeUsedIndicator).toString();
+	}
+	
+	/**
+	 * Appends an user-friendly description of the given amount of time to the specified text builder.<BR>
+	 * <BR>
+	 * Please keep in mind, that this method is primarily designed to be used with heap text builders. Therefore, if the given text builder throws an {@link IOException}, this exception will be wrapped in a {@link RuntimeException} and returned to the caller as an unchecked exception.
+	 * @param <T>
+	 * @param textBuilder a character sequence builder
+	 * @param timeAmount amount of time to be written
+	 * @param timeUnit unit of the given amount
+	 * @param minConsolidationUnit smallest unit to be included within the description
+	 * @param maxConsolidationUnit largest unit to be included within the description
+	 * @param noTimeUsedIndicator text to be written if the amount is not positive
+	 * @return {@code textBuilder}
+	 * @throws RuntimeException if {@code textBuilder} throws an {@link IOException}
+	 */
+	@SuppressWarnings("unchecked")
+	public static <T extends Appendable & CharSequence> T appendConsolidated(T textBuilder, long timeAmount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator) throws RuntimeException
+	{
+		try
+		{
+			if (timeAmount < 1)
+			{
+				return (T) textBuilder.append(noTimeUsedIndicator);
+			}
+			
+			final int len = textBuilder.length();
+			for (int i = maxConsolidationUnit.ordinal(); i >= minConsolidationUnit.ordinal(); --i)
+			{
+				final TimeUnit activeUnit = UNIT_CACHE[i];
+				final long num = activeUnit.convert(timeAmount, timeUnit);
+				if (num == 0)
+				{
+					continue;
+				}
+				
+				if (textBuilder.length() > len)
+				{
+					textBuilder.append(", ");
+				}
+				textBuilder.append(String.valueOf(num)).append(' ');
+				final String unit = activeUnit.name().toLowerCase(Locale.ENGLISH);
+				textBuilder.append(unit, 0, num == 1 ? unit.length() - 1 : unit.length());
+				
+				timeAmount -= timeUnit.convert(num, activeUnit);
+			}
+			
+			if (textBuilder.length() == len)
+			{
+				return (T) textBuilder.append(noTimeUsedIndicator).append(' ').append(minConsolidationUnit.name().toLowerCase(Locale.ENGLISH));
+			}
+		}
+		catch (IOException e)
+		{
+			throw new RuntimeException(e);
+		}
+		return textBuilder;
+	}
+}
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/config/AdminCommands.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/config/AdminCommands.xml
index 14882ea07a..8b4096bd34 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/config/AdminCommands.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/config/AdminCommands.xml
@@ -158,8 +158,6 @@
 	<admin command="admin_earthquake_menu" accessLevel="100" />
 	<admin command="admin_bighead" accessLevel="100" />
 	<admin command="admin_shrinkhead" accessLevel="100" />
-	<admin command="admin_gmspeed" accessLevel="100" />
-	<admin command="admin_gmspeed_menu" accessLevel="100" />
 	<admin command="admin_unpara_all" accessLevel="100" />
 	<admin command="admin_para_all" accessLevel="100" />
 	<admin command="admin_unpara" accessLevel="100" />
@@ -189,6 +187,13 @@
 	<admin command="admin_set_displayeffect_menu" accessLevel="100" />
 	<admin command="admin_playmovie" accessLevel="100" />
 
+	<!-- ADMIN SPEED -->
+	<admin command="admin_gmspeed" accessLevel="100" />
+	<admin command="admin_superhaste" accessLevel="100" />
+	<admin command="admin_superhaste_menu" accessLevel="100" />
+	<admin command="admin_speed" accessLevel="100" />
+	<admin command="admin_speed_menu" accessLevel="100" />
+	
 	<!-- ADMIN ELEMENT -->
 	<admin command="admin_setlh" accessLevel="100" />
 	<admin command="admin_setlc" accessLevel="100" />
@@ -615,4 +620,7 @@
 	<admin command="banchat" accessLevel="100" />
 	<admin command="debug" accessLevel="100" />
 	<admin command="unbanchat" accessLevel="100" />
+
+	<!-- HIDE -->
+	<admin command="admin_hide" accessLevel="100" />
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/config/General.ini b/L2J_Mobius_4.0_GrandCrusade/dist/game/config/General.ini
index 832fb08b17..106b6e6078 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/config/General.ini
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/config/General.ini
@@ -25,6 +25,10 @@ ServerGMOnly = False
 # Default: False
 GMHeroAura = False
 
+# Whether GM logins in builder hide mode by default.
+# Default: True
+GMStartupBuilderHide = True
+
 # Auto set invulnerable status to a GM on login.
 # Default: False
 GMStartupInvulnerable = True
@@ -79,6 +83,11 @@ GMGiveSpecialSkills = False
 # Default: False
 GMGiveSpecialAuraSkills = False
 
+# In case you are not satisfied with the retail-like implementation of //gmspeed",
+# with this config you can rollback it to the old custom L2J version of the GM Speed.
+# Default: False
+UseSuperHasteAsGMSpeed = False
+
 
 # ---------------------------------------------------------------------------
 # Server Security
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/gm_menu.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/gm_menu.htm
index ffe3e3d025..5a8f77eaba 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/gm_menu.htm
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/gm_menu.htm
@@ -38,11 +38,11 @@
 </table><br1>
 <table width=270><tr>
 <td><font color="LEVEL">Super Haste:</font></td>
-<td><button value="1" action="bypass -h admin_gmspeed_menu 1" width=35 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="2" action="bypass -h admin_gmspeed_menu 2" width=35 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="3" action="bypass -h admin_gmspeed_menu 3" width=35 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="4" action="bypass -h admin_gmspeed_menu 4" width=35 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="Off" action="bypass -h admin_gmspeed_menu 0" width=35 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="1" action="bypass -h admin_superhaste 1" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="2" action="bypass -h admin_superhaste 2" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="3" action="bypass -h admin_superhaste 3" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="4" action="bypass -h admin_superhaste 4" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="Off" action="bypass -h admin_superhaste 0" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr></table><br>
 <center><multiedit var="new_announcement" width=250 height=50></center>
 <table width="160"><tr>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/MasterHandler.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/MasterHandler.java
index 8ff587ff17..fa9c716767 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/MasterHandler.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/MasterHandler.java
@@ -84,9 +84,11 @@ import handlers.admincommandhandlers.AdminFortSiege;
 import handlers.admincommandhandlers.AdminGeodata;
 import handlers.admincommandhandlers.AdminGm;
 import handlers.admincommandhandlers.AdminGmChat;
+import handlers.admincommandhandlers.AdminGmSpeed;
 import handlers.admincommandhandlers.AdminGraciaSeeds;
 import handlers.admincommandhandlers.AdminGrandBoss;
 import handlers.admincommandhandlers.AdminHeal;
+import handlers.admincommandhandlers.AdminHide;
 import handlers.admincommandhandlers.AdminHtml;
 import handlers.admincommandhandlers.AdminHwid;
 import handlers.admincommandhandlers.AdminInstance;
@@ -126,6 +128,7 @@ import handlers.admincommandhandlers.AdminShutdown;
 import handlers.admincommandhandlers.AdminSkill;
 import handlers.admincommandhandlers.AdminSpawn;
 import handlers.admincommandhandlers.AdminSummon;
+import handlers.admincommandhandlers.AdminSuperHaste;
 import handlers.admincommandhandlers.AdminTarget;
 import handlers.admincommandhandlers.AdminTargetSay;
 import handlers.admincommandhandlers.AdminTeleport;
@@ -415,9 +418,11 @@ public class MasterHandler
 			AdminGeodata.class,
 			AdminGm.class,
 			AdminGmChat.class,
+			AdminGmSpeed.class,
 			AdminGraciaSeeds.class,
 			AdminGrandBoss.class,
 			AdminHeal.class,
+			AdminHide.class,
 			AdminHtml.class,
 			AdminHwid.class,
 			AdminInstance.class,
@@ -457,6 +462,7 @@ public class MasterHandler
 			AdminSkill.class,
 			AdminSpawn.class,
 			AdminSummon.class,
+			AdminSuperHaste.class,
 			AdminTarget.class,
 			AdminTargetSay.class,
 			AdminTeleport.class,
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/actionshifthandlers/L2PcInstanceActionShift.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/actionshifthandlers/L2PcInstanceActionShift.java
index 6b1bb7ac43..72c01c3cf8 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/actionshifthandlers/L2PcInstanceActionShift.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/actionshifthandlers/L2PcInstanceActionShift.java
@@ -19,7 +19,6 @@ package handlers.actionshifthandlers;
 import com.l2jmobius.gameserver.enums.InstanceType;
 import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.IActionShiftHandler;
-import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 
@@ -37,11 +36,7 @@ public class L2PcInstanceActionShift implements IActionShiftHandler
 				activeChar.setTarget(target);
 			}
 			
-			final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler("admin_character_info");
-			if (ach != null)
-			{
-				ach.useAdminCommand("admin_character_info " + target.getName(), activeChar);
-			}
+			AdminCommandHandler.getInstance().useAdminCommand(activeChar, "admin_character_info " + target.getName(), true);
 		}
 		return true;
 	}
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/actionshifthandlers/L2SummonActionShift.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/actionshifthandlers/L2SummonActionShift.java
index 67d403c9b3..6ee8a1173e 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/actionshifthandlers/L2SummonActionShift.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/actionshifthandlers/L2SummonActionShift.java
@@ -19,7 +19,6 @@ package handlers.actionshifthandlers;
 import com.l2jmobius.gameserver.enums.InstanceType;
 import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.IActionShiftHandler;
-import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 
@@ -36,11 +35,7 @@ public class L2SummonActionShift implements IActionShiftHandler
 				activeChar.setTarget(target);
 			}
 			
-			final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler("admin_summon_info");
-			if (ach != null)
-			{
-				ach.useAdminCommand("admin_summon_info", activeChar);
-			}
+			AdminCommandHandler.getInstance().useAdminCommand(activeChar, "admin_summon_info", true);
 		}
 		return true;
 	}
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
index 6c2b00db74..467875568d 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
@@ -19,7 +19,6 @@ package handlers.admincommandhandlers;
 import java.util.Arrays;
 import java.util.StringTokenizer;
 
-import com.l2jmobius.gameserver.data.xml.impl.SkillData;
 import com.l2jmobius.gameserver.enums.Movie;
 import com.l2jmobius.gameserver.enums.Team;
 import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
@@ -34,7 +33,6 @@ import com.l2jmobius.gameserver.model.html.PageBuilder;
 import com.l2jmobius.gameserver.model.html.PageResult;
 import com.l2jmobius.gameserver.model.html.styles.ButtonsStyle;
 import com.l2jmobius.gameserver.model.skills.AbnormalVisualEffect;
-import com.l2jmobius.gameserver.model.skills.Skill;
 import com.l2jmobius.gameserver.network.SystemMessageId;
 import com.l2jmobius.gameserver.network.serverpackets.Earthquake;
 import com.l2jmobius.gameserver.network.serverpackets.ExRedSky;
@@ -81,8 +79,6 @@ public class AdminEffects implements IAdminCommandHandler
 		"admin_earthquake_menu",
 		"admin_bighead",
 		"admin_shrinkhead",
-		"admin_gmspeed",
-		"admin_gmspeed_menu",
 		"admin_unpara_all",
 		"admin_para_all",
 		"admin_unpara",
@@ -351,35 +347,6 @@ public class AdminEffects implements IAdminCommandHandler
 			{
 			}
 		}
-		else if (command.startsWith("admin_gmspeed"))
-		{
-			try
-			{
-				final int val = Integer.parseInt(st.nextToken());
-				final boolean sendMessage = activeChar.isAffectedBySkill(7029);
-				activeChar.stopSkillEffects((val == 0) && sendMessage, 7029);
-				if ((val >= 1) && (val <= 4))
-				{
-					int time = 0;
-					if (st.hasMoreTokens())
-					{
-						time = Integer.parseInt(st.nextToken());
-					}
-					
-					final Skill gmSpeedSkill = SkillData.getInstance().getSkill(7029, val);
-					gmSpeedSkill.applyEffects(activeChar, activeChar, true, time);
-				}
-			}
-			catch (Exception e)
-			{
-				activeChar.sendMessage("Usage: //gmspeed <Effect level (0-4)> <Time in seconds>");
-			}
-			if (command.contains("_menu"))
-			{
-				command = "";
-				AdminHtml.showAdminHtml(activeChar, "gm_menu.htm");
-			}
-		}
 		else if (command.startsWith("admin_polyself"))
 		{
 			try
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmSpeed.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmSpeed.java
new file mode 100644
index 0000000000..6c47b71637
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmSpeed.java
@@ -0,0 +1,119 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.admincommandhandlers;
+
+import java.util.EnumSet;
+import java.util.Set;
+import java.util.StringTokenizer;
+
+import com.l2jmobius.Config;
+import com.l2jmobius.gameserver.handler.AdminCommandHandler;
+import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
+import com.l2jmobius.gameserver.model.L2Object;
+import com.l2jmobius.gameserver.model.actor.L2Character;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.model.stats.Stats;
+import com.l2jmobius.gameserver.util.BuilderUtil;
+import com.l2jmobius.gameserver.util.Util;
+
+/**
+ * A retail-like implementation of //gmspeed builder command.
+ * @author lord_rex
+ */
+public final class AdminGmSpeed implements IAdminCommandHandler
+{
+	private static final String[] ADMIN_COMMANDS =
+	{
+		"admin_gmspeed",
+	};
+	
+	private static final Set<Stats> SPEED_STATS = EnumSet.of(Stats.RUN_SPEED, Stats.WALK_SPEED, Stats.SWIM_RUN_SPEED, Stats.SWIM_WALK_SPEED, Stats.FLY_RUN_SPEED, Stats.FLY_WALK_SPEED);
+	
+	@Override
+	public boolean useAdminCommand(String command, L2PcInstance player)
+	{
+		final StringTokenizer st = new StringTokenizer(command);
+		final String cmd = st.nextToken();
+		
+		if (cmd.equals("admin_gmspeed"))
+		{
+			if (!st.hasMoreTokens())
+			{
+				BuilderUtil.sendSysMessage(player, "//gmspeed [0...10]");
+				return false;
+			}
+			final String token = st.nextToken();
+			
+			// Rollback feature for old custom way, in order to make everyone happy.
+			if (Config.USE_SUPER_HASTE_AS_GM_SPEED)
+			{
+				AdminCommandHandler.getInstance().useAdminCommand(player, AdminSuperHaste.ADMIN_COMMANDS[0] + " " + token, false);
+				return true;
+			}
+			
+			if (!Util.isDouble(token))
+			{
+				BuilderUtil.sendSysMessage(player, "//gmspeed [0...10]");
+				return false;
+			}
+			final double runSpeedBoost = Double.parseDouble(token);
+			if ((runSpeedBoost < 0) || (runSpeedBoost > 10))
+			{
+				// Custom limit according to SDW's request - real retail limit is unknown.
+				BuilderUtil.sendSysMessage(player, "//gmspeed [0...10]");
+				return false;
+			}
+			
+			final L2Character targetCharacter;
+			final L2Object target = player.getTarget();
+			if ((target != null) && target.isCharacter())
+			{
+				targetCharacter = (L2Character) target;
+			}
+			else
+			{
+				// If there is no target, let's use the command executer.
+				targetCharacter = player;
+			}
+			
+			SPEED_STATS.forEach(speedStat -> targetCharacter.getStat().removeFixedValue(speedStat));
+			if (runSpeedBoost > 0)
+			{
+				SPEED_STATS.forEach(speedStat -> targetCharacter.getStat().addFixedValue(speedStat, targetCharacter.getTemplate().getBaseValue(speedStat, 120) * runSpeedBoost));
+			}
+			
+			targetCharacter.getStat().recalculateStats(false);
+			if (targetCharacter.isPlayer())
+			{
+				((L2PcInstance) targetCharacter).broadcastUserInfo();
+			}
+			else
+			{
+				targetCharacter.broadcastInfo();
+			}
+			
+			BuilderUtil.sendSysMessage(player, "[" + targetCharacter.getName() + "] speed is [" + (runSpeedBoost * 100) + "0]% fast.");
+		}
+		return true;
+	}
+	
+	@Override
+	public String[] getAdminCommandList()
+	{
+		return ADMIN_COMMANDS;
+	}
+}
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminHide.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminHide.java
new file mode 100644
index 0000000000..ce8238db1d
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminHide.java
@@ -0,0 +1,87 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.admincommandhandlers;
+
+import java.util.StringTokenizer;
+
+import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.util.BuilderUtil;
+
+/**
+ * @author lord_rex
+ */
+public final class AdminHide implements IAdminCommandHandler
+{
+	private static final String[] ADMIN_COMMANDS =
+	{
+		"admin_hide"
+	};
+	
+	@Override
+	public boolean useAdminCommand(String command, L2PcInstance player)
+	{
+		final StringTokenizer st = new StringTokenizer(command);
+		st.nextToken();
+		
+		try
+		{
+			final String param = st.nextToken();
+			switch (param)
+			{
+				case "on":
+				{
+					if (!BuilderUtil.setHiding(player, true))
+					{
+						BuilderUtil.sendSysMessage(player, "Currently, you cannot be seen.");
+						return true;
+					}
+					
+					BuilderUtil.sendSysMessage(player, "Now, you cannot be seen.");
+					return true;
+				}
+				case "off":
+				{
+					if (!BuilderUtil.setHiding(player, false))
+					{
+						BuilderUtil.sendSysMessage(player, "Currently, you can be seen.");
+						return true;
+					}
+					
+					BuilderUtil.sendSysMessage(player, "Now, you can be seen.");
+					return true;
+				}
+				default:
+				{
+					BuilderUtil.sendSysMessage(player, "//hide [on|off]");
+					return true;
+				}
+			}
+		}
+		catch (final Exception e)
+		{
+			BuilderUtil.sendSysMessage(player, "//hide [on|off]");
+			return true;
+		}
+	}
+	
+	@Override
+	public String[] getAdminCommandList()
+	{
+		return ADMIN_COMMANDS;
+	}
+}
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java
index 5ab19d4b39..8c735f4265 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java
@@ -21,7 +21,6 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.gameserver.data.xml.impl.AdminData;
 import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.model.L2Clan;
@@ -187,14 +186,7 @@ public class AdminMenu implements IAdminCommandHandler
 			if (st.countTokens() > 1)
 			{
 				final String subCommand = "admin_ban_char";
-				if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel()))
-				{
-					activeChar.sendMessage("You don't have the access right to use this command!");
-					LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!");
-					return false;
-				}
-				final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand);
-				ach.useAdminCommand(subCommand + command.substring(14), activeChar);
+				AdminCommandHandler.getInstance().useAdminCommand(activeChar, subCommand + command.substring(14), true);
 			}
 			showMainPage(activeChar);
 		}
@@ -204,14 +196,7 @@ public class AdminMenu implements IAdminCommandHandler
 			if (st.countTokens() > 1)
 			{
 				final String subCommand = "admin_unban_char";
-				if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel()))
-				{
-					activeChar.sendMessage("You don't have the access right to use this command!");
-					LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!");
-					return false;
-				}
-				final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand);
-				ach.useAdminCommand(subCommand + command.substring(16), activeChar);
+				AdminCommandHandler.getInstance().useAdminCommand(activeChar, subCommand + command.substring(16), true);
 			}
 			showMainPage(activeChar);
 		}
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java
index a818e7f3d3..f27d63e949 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java
@@ -16,9 +16,6 @@
  */
 package handlers.admincommandhandlers;
 
-import java.util.logging.Logger;
-
-import com.l2jmobius.gameserver.data.xml.impl.AdminData;
 import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -28,8 +25,6 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
  */
 public class AdminSummon implements IAdminCommandHandler
 {
-	private static final Logger LOGGER = Logger.getLogger(AdminSummon.class.getName());
-	
 	public static final String[] ADMIN_COMMANDS =
 	{
 		"admin_summon"
@@ -62,34 +57,24 @@ public class AdminSummon implements IAdminCommandHandler
 			return false;
 		}
 		
-		String subCommand;
+		final String subCommand;
 		if (id < 1000000)
 		{
 			subCommand = "admin_create_item";
-			if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel()))
-			{
-				activeChar.sendMessage("You don't have the access right to use this command!");
-				LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!");
-				return false;
-			}
-			final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand);
-			ach.useAdminCommand(subCommand + " " + id + " " + count, activeChar);
 		}
 		else
 		{
 			subCommand = "admin_spawn_once";
-			if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel()))
-			{
-				activeChar.sendMessage("You don't have the access right to use this command!");
-				LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!");
-				return false;
-			}
-			final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand);
 			
 			activeChar.sendMessage("This is only a temporary spawn.  The mob(s) will NOT respawn.");
 			id -= 1000000;
-			ach.useAdminCommand(subCommand + " " + id + " " + count, activeChar);
 		}
+		
+		if ((id > 0) && (count > 0))
+		{
+			AdminCommandHandler.getInstance().useAdminCommand(activeChar, subCommand + " " + id + " " + count, true);
+		}
+		
 		return true;
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminSuperHaste.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminSuperHaste.java
new file mode 100644
index 0000000000..7a782b6004
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminSuperHaste.java
@@ -0,0 +1,92 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.admincommandhandlers;
+
+import java.util.StringTokenizer;
+
+import com.l2jmobius.gameserver.data.xml.impl.SkillData;
+import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.model.skills.Skill;
+
+/**
+ * The classical custom L2J implementation of the old //gmspeed GM command.
+ * @author lord_rex (No, it wasn't me at all. Eclipse added my name there.)
+ */
+public final class AdminSuperHaste implements IAdminCommandHandler
+{
+	public static final String[] ADMIN_COMMANDS =
+	{
+		"admin_superhaste",
+		"admin_superhaste_menu",
+		"admin_speed",
+		"admin_speed_menu",
+	};
+	
+	private static final int SUPER_HASTE_ID = 7029;
+	
+	@Override
+	public boolean useAdminCommand(String command, L2PcInstance player)
+	{
+		final StringTokenizer st = new StringTokenizer(command);
+		final String cmd = st.nextToken();
+		switch (cmd)
+		{
+			case "admin_superhaste":
+			case "admin_speed":
+			{
+				try
+				{
+					final int val = Integer.parseInt(st.nextToken());
+					final boolean sendMessage = player.isAffectedBySkill(SUPER_HASTE_ID);
+					player.stopSkillEffects((val == 0) && sendMessage, SUPER_HASTE_ID);
+					if ((val >= 1) && (val <= 4))
+					{
+						int time = 0;
+						if (st.hasMoreTokens())
+						{
+							time = Integer.parseInt(st.nextToken());
+						}
+						
+						final Skill superHasteSkill = SkillData.getInstance().getSkill(SUPER_HASTE_ID, val);
+						superHasteSkill.applyEffects(player, player, true, time);
+					}
+				}
+				catch (final Exception e)
+				{
+					player.sendMessage("Usage: //superhaste <Effect level (0-4)> <Time in seconds>");
+				}
+				
+				break;
+			}
+			case "admin_superhaste_menu":
+			case "admin_speed_menu":
+			{
+				AdminHtml.showAdminHtml(player, "gm_menu.htm");
+				break;
+			}
+		}
+		
+		return true;
+	}
+	
+	@Override
+	public String[] getAdminCommandList()
+	{
+		return ADMIN_COMMANDS;
+	}
+}
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/Config.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/Config.java
index d6007721e8..e07ff54bde 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/Config.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/Config.java
@@ -400,6 +400,7 @@ public final class Config
 	public static int DEFAULT_ACCESS_LEVEL;
 	public static boolean SERVER_GMONLY;
 	public static boolean GM_HERO_AURA;
+	public static boolean GM_STARTUP_BUILDER_HIDE;
 	public static boolean GM_STARTUP_INVULNERABLE;
 	public static boolean GM_STARTUP_INVISIBLE;
 	public static boolean GM_STARTUP_SILENCE;
@@ -413,6 +414,7 @@ public final class Config
 	public static boolean GM_CRITANNOUNCER_NAME;
 	public static boolean GM_GIVE_SPECIAL_SKILLS;
 	public static boolean GM_GIVE_SPECIAL_AURA_SKILLS;
+	public static boolean USE_SUPER_HASTE_AS_GM_SPEED;
 	public static boolean GAMEGUARD_ENFORCE;
 	public static boolean GAMEGUARD_PROHIBITACTION;
 	public static boolean LOG_CHAT;
@@ -1820,6 +1822,7 @@ public final class Config
 			DEFAULT_ACCESS_LEVEL = General.getInt("DefaultAccessLevel", 0);
 			SERVER_GMONLY = General.getBoolean("ServerGMOnly", false);
 			GM_HERO_AURA = General.getBoolean("GMHeroAura", false);
+			GM_STARTUP_BUILDER_HIDE = General.getBoolean("GMStartupBuilderHide", false);
 			GM_STARTUP_INVULNERABLE = General.getBoolean("GMStartupInvulnerable", false);
 			GM_STARTUP_INVISIBLE = General.getBoolean("GMStartupInvisible", false);
 			GM_STARTUP_SILENCE = General.getBoolean("GMStartupSilence", false);
@@ -1833,6 +1836,7 @@ public final class Config
 			GM_CRITANNOUNCER_NAME = General.getBoolean("GMShowCritAnnouncerName", false);
 			GM_GIVE_SPECIAL_SKILLS = General.getBoolean("GMGiveSpecialSkills", false);
 			GM_GIVE_SPECIAL_AURA_SKILLS = General.getBoolean("GMGiveSpecialAuraSkills", false);
+			USE_SUPER_HASTE_AS_GM_SPEED = General.getBoolean("UseSuperHasteAsGMSpeed", false);
 			GAMEGUARD_ENFORCE = General.getBoolean("GameGuardEnforce", false);
 			GAMEGUARD_PROHIBITACTION = General.getBoolean("GameGuardProhibitAction", false);
 			LOG_CHAT = General.getBoolean("LogChat", false);
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
index adf6462b78..c4faf3bd6d 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
@@ -18,12 +18,26 @@ package com.l2jmobius.gameserver.handler;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.logging.Logger;
+
+import com.l2jmobius.Config;
+import com.l2jmobius.commons.concurrent.ThreadPool;
+import com.l2jmobius.gameserver.data.xml.impl.AdminData;
+import com.l2jmobius.gameserver.enums.PlayerAction;
+import com.l2jmobius.gameserver.model.L2Object;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.SystemMessageId;
+import com.l2jmobius.gameserver.network.serverpackets.ConfirmDlg;
+import com.l2jmobius.gameserver.util.GMAudit;
+import com.l2jmobius.gameserver.util.TimeAmountInterpreter;
 
 /**
  * @author UnAfraid
  */
 public class AdminCommandHandler implements IHandler<IAdminCommandHandler, String>
 {
+	private static final Logger LOGGER = Logger.getLogger(AdminCommandHandler.class.getName());
+	
 	private final Map<String, IAdminCommandHandler> _datatable;
 	
 	protected AdminCommandHandler()
@@ -49,10 +63,85 @@ public class AdminCommandHandler implements IHandler<IAdminCommandHandler, Strin
 		}
 	}
 	
+	/**
+	 * WARNING: Please use {@link #useAdminCommand(L2PcInstance, String, boolean)} instead.
+	 */
 	@Override
 	public IAdminCommandHandler getHandler(String adminCommand)
 	{
-		return _datatable.get(adminCommand.contains(" ") ? adminCommand.substring(0, adminCommand.indexOf(" ")) : adminCommand);
+		String command = adminCommand;
+		if (adminCommand.contains(" "))
+		{
+			command = adminCommand.substring(0, adminCommand.indexOf(" "));
+		}
+		return _datatable.get(command);
+	}
+	
+	public void useAdminCommand(L2PcInstance player, String fullCommand, boolean useConfirm)
+	{
+		final String command = fullCommand.split(" ")[0];
+		final String commandNoPrefix = command.substring(6);
+		
+		final IAdminCommandHandler handler = getHandler(command);
+		if (handler == null)
+		{
+			if (player.isGM())
+			{
+				player.sendMessage("The command '" + commandNoPrefix + "' does not exist!");
+			}
+			LOGGER.warning("No handler registered for admin command '" + command + "'");
+			return;
+		}
+		
+		if (!AdminData.getInstance().hasAccess(command, player.getAccessLevel()))
+		{
+			player.sendMessage("You don't have the access rights to use this command!");
+			LOGGER.warning("Player " + player.getName() + " tried to use admin command '" + command + "', without proper access level!");
+			return;
+		}
+		
+		if (useConfirm && AdminData.getInstance().requireConfirm(command))
+		{
+			player.setAdminConfirmCmd(fullCommand);
+			final ConfirmDlg dlg = new ConfirmDlg(SystemMessageId.S1_3);
+			dlg.addString("Are you sure you want execute command '" + commandNoPrefix + "' ?");
+			player.addAction(PlayerAction.ADMIN_COMMAND);
+			player.sendPacket(dlg);
+		}
+		else
+		{
+			// Admin Commands must run through a long running task, otherwise a command that takes too much time will freeze the server, this way you'll feel only a minor spike.
+			ThreadPool.execute(() ->
+			{
+				final long begin = System.currentTimeMillis();
+				try
+				{
+					if (Config.GMAUDIT)
+					{
+						final L2Object target = player.getTarget();
+						GMAudit.auditGMAction(player.getName() + " [" + player.getObjectId() + "]", fullCommand, (target != null ? target.getName() : "no-target"));
+					}
+					
+					handler.useAdminCommand(fullCommand, player);
+				}
+				catch (RuntimeException e)
+				{
+					player.sendMessage("Exception during execution of  '" + fullCommand + "': " + e.toString());
+					LOGGER.warning("Exception during execution of " + fullCommand + " " + e);
+				}
+				finally
+				{
+					final long runtime = System.currentTimeMillis() - begin;
+					
+					if (runtime < 5000)
+					{
+						return;
+					}
+					
+					player.sendMessage("The execution of '" + fullCommand + "' took " + TimeAmountInterpreter.consolidateMillis(runtime) + ".");
+				}
+			});
+		}
 	}
 	
 	@Override
@@ -63,11 +152,11 @@ public class AdminCommandHandler implements IHandler<IAdminCommandHandler, Strin
 	
 	public static AdminCommandHandler getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final AdminCommandHandler _instance = new AdminCommandHandler();
+		protected static final AdminCommandHandler INSTANCE = new AdminCommandHandler();
 	}
 }
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
index ddb14facbc..c278267893 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
@@ -101,8 +101,6 @@ import com.l2jmobius.gameserver.enums.SubclassInfoType;
 import com.l2jmobius.gameserver.enums.Team;
 import com.l2jmobius.gameserver.enums.UserInfoType;
 import com.l2jmobius.gameserver.geoengine.GeoEngine;
-import com.l2jmobius.gameserver.handler.AdminCommandHandler;
-import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.handler.IItemHandler;
 import com.l2jmobius.gameserver.handler.ItemHandler;
 import com.l2jmobius.gameserver.idfactory.IdFactory;
@@ -345,7 +343,6 @@ import com.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
 import com.l2jmobius.gameserver.util.Broadcast;
 import com.l2jmobius.gameserver.util.EnumIntBitmask;
 import com.l2jmobius.gameserver.util.FloodProtectors;
-import com.l2jmobius.gameserver.util.GMAudit;
 import com.l2jmobius.gameserver.util.Util;
 
 /**
@@ -10058,8 +10055,9 @@ public final class L2PcInstance extends L2Playable
 	{
 		startWarnUserTakeBreak();
 		
-		if (isGM())
+		if (isGM() && !Config.GM_STARTUP_BUILDER_HIDE)
 		{
+			// Bleah, see L2J custom below.
 			if (isInvul())
 			{
 				sendMessage("Entering world in Invulnerable mode.");
@@ -13774,50 +13772,6 @@ public final class L2PcInstance extends L2Playable
 		return (super.isVisibleFor(player) || ((player.getParty() != null) && (player.getParty() == getParty())));
 	}
 	
-	/**
-	 * @param fullCommand
-	 */
-	public void useAdminCommand(String fullCommand)
-	{
-		final String command = fullCommand.split(" ")[0];
-		
-		final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(command);
-		if (ach == null)
-		{
-			if (isGM())
-			{
-				sendMessage("The command " + command.substring(6) + " does not exist!");
-			}
-			LOGGER.warning("No handler registered for admin command '" + command + "'");
-			return;
-		}
-		
-		if (!AdminData.getInstance().hasAccess(command, getAccessLevel()))
-		{
-			sendMessage("You don't have the access rights to use this command!");
-			LOGGER.warning("Character " + getName() + " tried to use admin command " + command + ", without proper access level!");
-			return;
-		}
-		
-		if (AdminData.getInstance().requireConfirm(command))
-		{
-			setAdminConfirmCmd(fullCommand);
-			final ConfirmDlg dlg = new ConfirmDlg(SystemMessageId.S1_3);
-			dlg.addString("Are you sure you want execute command " + fullCommand.substring(6) + " ?");
-			addAction(PlayerAction.ADMIN_COMMAND);
-			sendPacket(dlg);
-		}
-		else
-		{
-			if (Config.GMAUDIT)
-			{
-				GMAudit.auditGMAction(getName() + " [" + getObjectId() + "]", fullCommand, (getTarget() != null ? getTarget().getName() : "no-target"));
-			}
-			
-			ach.useAdminCommand(fullCommand, this);
-		}
-	}
-	
 	/**
 	 * Set the Quest zone ID.
 	 * @param id the quest zone ID
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java
index f1eefdc748..2dd69a67f8 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java
@@ -16,12 +16,9 @@
  */
 package com.l2jmobius.gameserver.network.clientpackets;
 
-import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketReader;
-import com.l2jmobius.gameserver.data.xml.impl.AdminData;
 import com.l2jmobius.gameserver.enums.PlayerAction;
 import com.l2jmobius.gameserver.handler.AdminCommandHandler;
-import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.events.EventDispatcher;
 import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerDlgAnswer;
@@ -30,7 +27,6 @@ import com.l2jmobius.gameserver.model.holders.DoorRequestHolder;
 import com.l2jmobius.gameserver.model.holders.SummonRequestHolder;
 import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.util.GMAudit;
 
 /**
  * @author Dezmond_snz
@@ -75,16 +71,9 @@ public final class DlgAnswer implements IClientIncomingPacket
 				{
 					return;
 				}
-				final String command = cmd.split(" ")[0];
-				final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(command);
-				if (AdminData.getInstance().hasAccess(command, activeChar.getAccessLevel()))
-				{
-					if (Config.GMAUDIT)
-					{
-						GMAudit.auditGMAction(activeChar.getName() + " [" + activeChar.getObjectId() + "]", cmd, (activeChar.getTarget() != null ? activeChar.getTarget().getName() : "no-target"));
-					}
-					ach.useAdminCommand(cmd, activeChar);
-				}
+				
+				// The 'useConfirm' must be disabled here, as we don't want to repeat that process.
+				AdminCommandHandler.getInstance().useAdminCommand(activeChar, cmd, false);
 			}
 		}
 		else if ((_messageId == SystemMessageId.C1_IS_ATTEMPTING_TO_DO_A_RESURRECTION_THAT_RESTORES_S2_S3_XP_ACCEPT.getId()) || (_messageId == SystemMessageId.YOUR_CHARM_OF_COURAGE_IS_TRYING_TO_RESURRECT_YOU_WOULD_YOU_LIKE_TO_RESURRECT_NOW.getId()))
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 7e2e1dfb85..11f0339db1 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -103,6 +103,7 @@ import com.l2jmobius.gameserver.network.serverpackets.attendance.ExVipAttendance
 import com.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward;
 import com.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList;
 import com.l2jmobius.gameserver.network.serverpackets.friend.L2FriendList;
+import com.l2jmobius.gameserver.util.BuilderUtil;
 
 /**
  * Enter World Packet Handler
@@ -210,35 +211,50 @@ public class EnterWorld implements IClientIncomingPacket
 		// Apply special GM properties to the GM when entering
 		if (activeChar.isGM())
 		{
-			if (Config.GM_STARTUP_INVULNERABLE && AdminData.getInstance().hasAccess("admin_invul", activeChar.getAccessLevel()))
+			gmStartupProcess:
 			{
-				activeChar.setIsInvul(true);
-			}
-			
-			if (Config.GM_STARTUP_INVISIBLE && AdminData.getInstance().hasAccess("admin_invisible", activeChar.getAccessLevel()))
-			{
-				activeChar.setInvisible(true);
-				activeChar.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.STEALTH);
-			}
-			
-			if (Config.GM_STARTUP_SILENCE && AdminData.getInstance().hasAccess("admin_silence", activeChar.getAccessLevel()))
-			{
-				activeChar.setSilenceMode(true);
-			}
-			
-			if (Config.GM_STARTUP_DIET_MODE && AdminData.getInstance().hasAccess("admin_diet", activeChar.getAccessLevel()))
-			{
-				activeChar.setDietMode(true);
-				activeChar.refreshOverloaded(true);
-			}
-			
-			if (Config.GM_STARTUP_AUTO_LIST && AdminData.getInstance().hasAccess("admin_gmliston", activeChar.getAccessLevel()))
-			{
-				AdminData.getInstance().addGm(activeChar, false);
-			}
-			else
-			{
-				AdminData.getInstance().addGm(activeChar, true);
+				if (Config.GM_STARTUP_BUILDER_HIDE && AdminData.getInstance().hasAccess("admin_hide", activeChar.getAccessLevel()))
+				{
+					BuilderUtil.setHiding(activeChar, true);
+					
+					BuilderUtil.sendSysMessage(activeChar, "hide is default for builder.");
+					BuilderUtil.sendSysMessage(activeChar, "FriendAddOff is default for builder.");
+					BuilderUtil.sendSysMessage(activeChar, "whisperoff is default for builder.");
+					
+					// It isn't recommend to use the below custom L2J GMStartup functions together with retail-like GMStartupBuilderHide, so breaking the process at that stage.
+					break gmStartupProcess;
+				}
+				
+				if (Config.GM_STARTUP_INVULNERABLE && AdminData.getInstance().hasAccess("admin_invul", activeChar.getAccessLevel()))
+				{
+					activeChar.setIsInvul(true);
+				}
+				
+				if (Config.GM_STARTUP_INVISIBLE && AdminData.getInstance().hasAccess("admin_invisible", activeChar.getAccessLevel()))
+				{
+					activeChar.setInvisible(true);
+					activeChar.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.STEALTH);
+				}
+				
+				if (Config.GM_STARTUP_SILENCE && AdminData.getInstance().hasAccess("admin_silence", activeChar.getAccessLevel()))
+				{
+					activeChar.setSilenceMode(true);
+				}
+				
+				if (Config.GM_STARTUP_DIET_MODE && AdminData.getInstance().hasAccess("admin_diet", activeChar.getAccessLevel()))
+				{
+					activeChar.setDietMode(true);
+					activeChar.refreshOverloaded(true);
+				}
+				
+				if (Config.GM_STARTUP_AUTO_LIST && AdminData.getInstance().hasAccess("admin_gmliston", activeChar.getAccessLevel()))
+				{
+					AdminData.getInstance().addGm(activeChar, false);
+				}
+				else
+				{
+					AdminData.getInstance().addGm(activeChar, true);
+				}
 			}
 			
 			if (Config.GM_GIVE_SPECIAL_SKILLS)
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java
index 7621a7029e..27753dcf85 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java
@@ -23,6 +23,7 @@ import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.data.xml.impl.MultisellData;
+import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.BypassHandler;
 import com.l2jmobius.gameserver.handler.CommunityBoardHandler;
 import com.l2jmobius.gameserver.handler.IBypassHandler;
@@ -133,7 +134,7 @@ public final class RequestBypassToServer implements IClientIncomingPacket
 		{
 			if (_command.startsWith("admin_"))
 			{
-				activeChar.useAdminCommand(_command);
+				AdminCommandHandler.getInstance().useAdminCommand(activeChar, _command, true);
 			}
 			else if (CommunityBoardHandler.getInstance().isCommunityBoardCommand(_command))
 			{
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
index 9805ae3e39..b6b85e45d9 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
@@ -24,6 +24,7 @@ import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.enums.PrivateStoreType;
+import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.instancemanager.CursedWeaponsManager;
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.L2World;
@@ -107,7 +108,7 @@ public final class RequestDestroyItem implements IClientIncomingPacket
 					{
 						count = ((L2ItemInstance) obj).getCount();
 					}
-					activeChar.useAdminCommand("admin_delete_item " + _objectId + " " + count);
+					AdminCommandHandler.getInstance().useAdminCommand(activeChar, "admin_delete_item " + _objectId + " " + count, true);
 				}
 				return;
 			}
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialLinkHtml.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialLinkHtml.java
index e230c6ec10..eac5eea401 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialLinkHtml.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialLinkHtml.java
@@ -17,6 +17,7 @@
 package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
+import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.BypassHandler;
 import com.l2jmobius.gameserver.handler.IBypassHandler;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -45,7 +46,7 @@ public class RequestTutorialLinkHtml implements IClientIncomingPacket
 		
 		if (_bypass.startsWith("admin_"))
 		{
-			player.useAdminCommand(_bypass);
+			AdminCommandHandler.getInstance().useAdminCommand(player, _bypass, true);
 		}
 		else
 		{
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialPassCmdToServer.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialPassCmdToServer.java
index 3b9d386e05..dc2e10cc02 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialPassCmdToServer.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialPassCmdToServer.java
@@ -17,6 +17,7 @@
 package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
+import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.BypassHandler;
 import com.l2jmobius.gameserver.handler.IBypassHandler;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -46,7 +47,7 @@ public class RequestTutorialPassCmdToServer implements IClientIncomingPacket
 		
 		if (_bypass.startsWith("admin_"))
 		{
-			player.useAdminCommand(_bypass);
+			AdminCommandHandler.getInstance().useAdminCommand(player, _bypass, true);
 		}
 		else
 		{
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java
index 2255ca3502..2487fbe4a4 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java
@@ -16,14 +16,10 @@
  */
 package com.l2jmobius.gameserver.network.clientpackets;
 
-import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketReader;
-import com.l2jmobius.gameserver.data.xml.impl.AdminData;
 import com.l2jmobius.gameserver.handler.AdminCommandHandler;
-import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.network.L2GameClient;
-import com.l2jmobius.gameserver.util.GMAudit;
 
 /**
  * This class handles all GM commands triggered by //command
@@ -56,33 +52,6 @@ public final class SendBypassBuildCmd implements IClientIncomingPacket
 			return;
 		}
 		
-		final String command = "admin_" + _command.split(" ")[0];
-		
-		final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(command);
-		
-		if (ach == null)
-		{
-			if (activeChar.isGM())
-			{
-				activeChar.sendMessage("The command " + command.substring(6) + " does not exists!");
-			}
-			
-			LOGGER.warning("No handler registered for admin command '" + command + "'");
-			return;
-		}
-		
-		if (!AdminData.getInstance().hasAccess(command, activeChar.getAccessLevel()))
-		{
-			activeChar.sendMessage("You don't have the access right to use this command!");
-			LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + command + ", but have no access to it!");
-			return;
-		}
-		
-		if (Config.GMAUDIT)
-		{
-			GMAudit.auditGMAction(activeChar.getName() + " [" + activeChar.getObjectId() + "]", _command, (activeChar.getTarget() != null ? activeChar.getTarget().getName() : "no-target"));
-		}
-		
-		ach.useAdminCommand("admin_" + _command, activeChar);
+		AdminCommandHandler.getInstance().useAdminCommand(activeChar, "admin_" + _command, true);
 	}
 }
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java
index 8ae98bd315..274245a42a 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java
@@ -27,6 +27,7 @@ import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.ai.NextAction;
 import com.l2jmobius.gameserver.enums.ItemSkillType;
 import com.l2jmobius.gameserver.enums.PrivateStoreType;
+import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.IItemHandler;
 import com.l2jmobius.gameserver.handler.ItemHandler;
 import com.l2jmobius.gameserver.instancemanager.FortSiegeManager;
@@ -95,7 +96,7 @@ public final class UseItem implements IClientIncomingPacket
 				final L2Object obj = L2World.getInstance().findObject(_objectId);
 				if (obj instanceof L2ItemInstance)
 				{
-					activeChar.useAdminCommand("admin_use_item " + _objectId);
+					AdminCommandHandler.getInstance().useAdminCommand(activeChar, "admin_use_item " + _objectId, true);
 				}
 			}
 			return;
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/util/BuilderUtil.java
new file mode 100644
index 0000000000..b81a5136c7
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/util/BuilderUtil.java
@@ -0,0 +1,72 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jmobius.gameserver.util;
+
+import com.l2jmobius.gameserver.enums.ChatType;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.serverpackets.CreatureSay;
+import com.l2jmobius.gameserver.network.serverpackets.ExUserInfoAbnormalVisualEffect;
+
+/**
+ * @author lord_rex
+ */
+public final class BuilderUtil
+{
+	private BuilderUtil()
+	{
+		// utility class
+	}
+	
+	/**
+	 * Sends builder system message to the player.
+	 * @param player
+	 * @param message
+	 */
+	public static void sendSysMessage(L2PcInstance player, String message)
+	{
+		player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "SYS", message));
+	}
+	
+	/**
+	 * Changes player's hiding state.
+	 * @param player
+	 * @param hide
+	 * @return {@code true} if hide state was changed, otherwise {@code false}
+	 */
+	public static boolean setHiding(L2PcInstance player, boolean hide)
+	{
+		if (player.isInvisible() && hide)
+		{
+			// already hiding
+			return false;
+		}
+		
+		if (!player.isInvisible() && !hide)
+		{
+			// already visible
+			return false;
+		}
+		
+		player.setSilenceMode(hide);
+		player.setIsInvul(hide);
+		player.setInvisible(hide);
+		
+		player.broadcastUserInfo();
+		player.sendPacket(new ExUserInfoAbnormalVisualEffect(player));
+		return true;
+	}
+}
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/util/TimeAmountInterpreter.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/util/TimeAmountInterpreter.java
new file mode 100644
index 0000000000..4afbb96199
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/util/TimeAmountInterpreter.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 1999 CERN - European Organization for Nuclear Research.
+ * 
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear in
+ * supporting documentation. CERN makes no representations about the
+ * suitability of this software for any purpose. It is provided "as is"
+ * without expressed or implied warranty.
+ */
+package com.l2jmobius.gameserver.util;
+
+import static java.util.concurrent.TimeUnit.DAYS;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
+
+import java.io.IOException;
+import java.util.Locale;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Allows to present time intervals in a standardized, user friendly manner.
+ * @author _dev_
+ */
+public class TimeAmountInterpreter
+{
+	private static final TimeUnit[] UNIT_CACHE = TimeUnit.values();
+	
+	private TimeAmountInterpreter()
+	{
+		// utility class
+	}
+	
+	/**
+	 * Calls {@link #consolidate(long, TimeUnit)} with {@link TimeUnit#NANOSECONDS}.
+	 * @param timeAmountInNanos amount of time in nanoseconds
+	 * @return an user-friendly description of the given time amount
+	 */
+	public static String consolidateNanos(long timeAmountInNanos)
+	{
+		return consolidate(timeAmountInNanos, NANOSECONDS);
+	}
+	
+	/**
+	 * Calls {@link #consolidate(long, TimeUnit)} with {@link TimeUnit#MILLISECONDS}.
+	 * @param timeAmountInMillis amount of time in milliseconds
+	 * @return an user-friendly description of the given time amount
+	 */
+	public static String consolidateMillis(long timeAmountInMillis)
+	{
+		return consolidate(timeAmountInMillis, MILLISECONDS);
+	}
+	
+	/**
+	 * Constructs an user-friendly description of the given amount of time, specifying the number of days (if any), hours (if any), minutes (if any), seconds (if any) and milliseconds (if any). Otherwise, returns the string value {@code 0}.
+	 * @param timeAmount amount of time to be written
+	 * @param timeUnit unit of the given amount
+	 * @return an user-friendly description of the given time amount
+	 */
+	public static String consolidate(long timeAmount, TimeUnit timeUnit)
+	{
+		return consolidate(timeAmount, timeUnit, timeUnit, DAYS, "0 " + timeUnit.name().toLowerCase(Locale.ENGLISH));
+	}
+	
+	/**
+	 * Constructs an user-friendly description of the given amount of time.
+	 * @param timeAmount amount of time to be written
+	 * @param timeUnit unit of the given amount
+	 * @param minConsolidationUnit smallest unit to be included within the description
+	 * @param maxConsolidationUnit largest unit to be included within the description
+	 * @param noTimeUsedIndicator text to be written if the amount is not positive
+	 * @return an user-friendly description of the given time amount
+	 */
+	public static String consolidate(long timeAmount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator)
+	{
+		return appendConsolidated(new StringBuilder(), timeAmount, timeUnit, minConsolidationUnit, maxConsolidationUnit, noTimeUsedIndicator).toString();
+	}
+	
+	/**
+	 * Appends an user-friendly description of the given amount of time to the specified text builder.<BR>
+	 * <BR>
+	 * Please keep in mind, that this method is primarily designed to be used with heap text builders. Therefore, if the given text builder throws an {@link IOException}, this exception will be wrapped in a {@link RuntimeException} and returned to the caller as an unchecked exception.
+	 * @param <T>
+	 * @param textBuilder a character sequence builder
+	 * @param timeAmount amount of time to be written
+	 * @param timeUnit unit of the given amount
+	 * @param minConsolidationUnit smallest unit to be included within the description
+	 * @param maxConsolidationUnit largest unit to be included within the description
+	 * @param noTimeUsedIndicator text to be written if the amount is not positive
+	 * @return {@code textBuilder}
+	 * @throws RuntimeException if {@code textBuilder} throws an {@link IOException}
+	 */
+	@SuppressWarnings("unchecked")
+	public static <T extends Appendable & CharSequence> T appendConsolidated(T textBuilder, long timeAmount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator) throws RuntimeException
+	{
+		try
+		{
+			if (timeAmount < 1)
+			{
+				return (T) textBuilder.append(noTimeUsedIndicator);
+			}
+			
+			final int len = textBuilder.length();
+			for (int i = maxConsolidationUnit.ordinal(); i >= minConsolidationUnit.ordinal(); --i)
+			{
+				final TimeUnit activeUnit = UNIT_CACHE[i];
+				final long num = activeUnit.convert(timeAmount, timeUnit);
+				if (num == 0)
+				{
+					continue;
+				}
+				
+				if (textBuilder.length() > len)
+				{
+					textBuilder.append(", ");
+				}
+				textBuilder.append(String.valueOf(num)).append(' ');
+				final String unit = activeUnit.name().toLowerCase(Locale.ENGLISH);
+				textBuilder.append(unit, 0, num == 1 ? unit.length() - 1 : unit.length());
+				
+				timeAmount -= timeUnit.convert(num, activeUnit);
+			}
+			
+			if (textBuilder.length() == len)
+			{
+				return (T) textBuilder.append(noTimeUsedIndicator).append(' ').append(minConsolidationUnit.name().toLowerCase(Locale.ENGLISH));
+			}
+		}
+		catch (IOException e)
+		{
+			throw new RuntimeException(e);
+		}
+		return textBuilder;
+	}
+}
diff --git a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/admin_command_access_rights.sql b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/admin_command_access_rights.sql
index 6017cc40ab..4e1a433bcb 100644
--- a/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/admin_command_access_rights.sql
+++ b/L2J_Mobius_C6_Interlude/dist/db_installer/sql/game/admin_command_access_rights.sql
@@ -217,8 +217,11 @@ INSERT IGNORE INTO `admin_command_access_rights` VALUES
 ('admin_bighead','3'),
 ('admin_shrinkhead','3'),
 ('admin_gmspeed','3'),
-('admin_gmspeed_menu','3'),
-('admin_gmspeed_menu_main','3'),
+('admin_superhaste','3'),
+('admin_superhaste_menu','3'),
+('admin_speed','3'),
+('admin_speed_menu','3'),
+('admin_hide','3'),
 ('admin_unpara_all','3'),
 ('admin_para_all','3'),
 ('admin_unpara','3'),
diff --git a/L2J_Mobius_C6_Interlude/dist/game/config/main/access.ini b/L2J_Mobius_C6_Interlude/dist/game/config/main/access.ini
index 88c7155340..a7097ee797 100644
--- a/L2J_Mobius_C6_Interlude/dist/game/config/main/access.ini
+++ b/L2J_Mobius_C6_Interlude/dist/game/config/main/access.ini
@@ -19,10 +19,10 @@ MasterAccessLevel = 1
 # Default = 0 - Max. 255
 UserAccessLevel = 0
 
-# -----------------------------------
-# Section: GM'S Rights
-# -----------------------------------
-# # The way //admin panel looks can be "modern" or "classic"
+# --------------------------------------
+# Section: GM Rights
+# --------------------------------------
+# The way //admin panel looks can be "modern" or "classic"
 # (default is modern while classic provides more compatibility)
 GMAdminMenuStyle = modern
 
@@ -32,7 +32,7 @@ MasterNameColorEnabled = True
 # This option will set the Default NameColor for MasterAccess  
 MasterNameColor = 00CCFF
 
-#Turn on MasterTitleColor config.
+# Turn on MasterTitleColor config.
 MasterTitleColorEnabled = True
 
 # This option will set the Default TitleColor for MasterAccess  
@@ -41,6 +41,10 @@ MasterTitleColor = 00CCFF
 # Enable GMs to have the glowing aura of a Hero character.
 GMHeroAura = False
 
+# Whether GM logins in builder hide mode by default.
+# Default: True
+GMStartupBuilderHide = True
+
 # Show message when GM Login and GM will not invis/silence as default
 ShowGMLogin = False
 
@@ -63,5 +67,10 @@ GMStartupSilence = False
 # Auto list GMs in GM list (/gmlist) on login.
 GMStartupAutoList = True
 
-# # Auto set invulnerable status to a GM on login.
-GMStartupInvulnerable = True
\ No newline at end of file
+# Auto set invulnerable status to a GM on login.
+GMStartupInvulnerable = True
+
+# In case you are not satisfied with the retail-like implementation of //gmspeed",
+# with this config you can rollback it to the old custom L2J version of the GM Speed.
+# Default: False
+UseSuperHasteAsGMSpeed = False
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/main_menu.htm b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/main_menu.htm
index 0004442056..28be9a610a 100644
--- a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/main_menu.htm
+++ b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/main_menu.htm
@@ -62,11 +62,11 @@
 </tr></table>
 <br>
 <table width=240><tr>
-<td>GM Speed:</td>
-<td><button value="1" action="bypass -h admin_gmspeed_menu_main 1" width=25 height=15 back="sek.cbui94" fore="sek.cbui92"></td>
-<td><button value="2" action="bypass -h admin_gmspeed_menu_main 2" width=25 height=15 back="sek.cbui94" fore="sek.cbui92"></td>
-<td><button value="3" action="bypass -h admin_gmspeed_menu_main 3" width=25 height=15 back="sek.cbui94" fore="sek.cbui92"></td>
-<td><button value="4" action="bypass -h admin_gmspeed_menu_main 4" width=25 height=15 back="sek.cbui94" fore="sek.cbui92"></td>
-<td><button value="Off" action="bypass -h admin_gmspeed_menu_main 0" width=25 height=15 back="sek.cbui94" fore="sek.cbui92"></td>
+<td>Super Haste:</td>
+<td><button value="1" action="bypass -h admin_superhaste 1" width=25 height=15 back="sek.cbui94" fore="sek.cbui92"></td>
+<td><button value="2" action="bypass -h admin_superhaste 2" width=25 height=15 back="sek.cbui94" fore="sek.cbui92"></td>
+<td><button value="3" action="bypass -h admin_superhaste 3" width=25 height=15 back="sek.cbui94" fore="sek.cbui92"></td>
+<td><button value="4" action="bypass -h admin_superhaste 4" width=25 height=15 back="sek.cbui94" fore="sek.cbui92"></td>
+<td><button value="Off" action="bypass -h admin_superhaste 0" width=25 height=15 back="sek.cbui94" fore="sek.cbui92"></td>
 </tr></table>
 </center></body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/move.htm b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/move.htm
index 4c27e3815b..eaef97db7c 100644
--- a/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/move.htm
+++ b/L2J_Mobius_C6_Interlude/dist/game/data/html/admin/move.htm
@@ -23,12 +23,12 @@
 <td><button value="Demonic mode " action="bypass -h admin_teleto r" width=80 height=15 back="sek.cbui94" fore="sek.cbui92"></td></tr></table>
 <br><br>
 <table width=260><tr>
-<td>GM Speed:</td>
-<td><button value="1" action="bypass -h admin_gmspeed_menu 1" width=25 height=15 back="sek.cbui94" fore="sek.cbui92"></td>
-<td><button value="2" action="bypass -h admin_gmspeed_menu 2" width=25 height=15 back="sek.cbui94" fore="sek.cbui92"></td>
-<td><button value="3" action="bypass -h admin_gmspeed_menu 3" width=25 height=15 back="sek.cbui94" fore="sek.cbui92"></td>
-<td><button value="4" action="bypass -h admin_gmspeed_menu 4" width=25 height=15 back="sek.cbui94" fore="sek.cbui92"></td>
-<td><button value="Off" action="bypass -h admin_gmspeed_menu 0" width=25 height=15 back="sek.cbui94" fore="sek.cbui92"></td>
+<td>Super Haste:</td>
+<td><button value="1" action="bypass -h admin_superhaste 1" width=25 height=15 back="sek.cbui94" fore="sek.cbui92"></td>
+<td><button value="2" action="bypass -h admin_superhaste 2" width=25 height=15 back="sek.cbui94" fore="sek.cbui92"></td>
+<td><button value="3" action="bypass -h admin_superhaste 3" width=25 height=15 back="sek.cbui94" fore="sek.cbui92"></td>
+<td><button value="4" action="bypass -h admin_superhaste 4" width=25 height=15 back="sek.cbui94" fore="sek.cbui92"></td>
+<td><button value="Off" action="bypass -h admin_superhaste 0" width=25 height=15 back="sek.cbui94" fore="sek.cbui92"></td>
 </tr></table><br><br><br><br>
 Move to given Coords:
 <table width=260><tr>
diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/Config.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/Config.java
index df364e936f..d0fc9f5591 100644
--- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/Config.java
+++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/Config.java
@@ -116,6 +116,12 @@ public final class Config
 	public static final String EOL = System.lineSeparator();
 	
 	public static boolean EVERYBODY_HAS_ADMIN_RIGHTS;
+	public static int MASTERACCESS_LEVEL;
+	public static int USERACCESS_LEVEL;
+	public static boolean MASTERACCESS_NAME_COLOR_ENABLED;
+	public static boolean MASTERACCESS_TITLE_COLOR_ENABLED;
+	public static int MASTERACCESS_NAME_COLOR;
+	public static int MASTERACCESS_TITLE_COLOR;
 	public static boolean SHOW_GM_LOGIN;
 	public static boolean GM_STARTUP_INVISIBLE;
 	public static boolean GM_SPECIAL_EFFECT;
@@ -123,14 +129,10 @@ public final class Config
 	public static boolean GM_STARTUP_AUTO_LIST;
 	public static String GM_ADMIN_MENU_STYLE;
 	public static boolean GM_HERO_AURA;
+	public static boolean GM_STARTUP_BUILDER_HIDE;
 	public static boolean GM_STARTUP_INVULNERABLE;
 	public static boolean GM_ANNOUNCER_NAME;
-	public static int MASTERACCESS_LEVEL;
-	public static int USERACCESS_LEVEL;
-	public static boolean MASTERACCESS_NAME_COLOR_ENABLED;
-	public static boolean MASTERACCESS_TITLE_COLOR_ENABLED;
-	public static int MASTERACCESS_NAME_COLOR;
-	public static int MASTERACCESS_TITLE_COLOR;
+	public static boolean USE_SUPER_HASTE_AS_GM_SPEED;
 	
 	public static boolean CHECK_KNOWN;
 	public static String DEFAULT_GLOBAL_CHAT;
@@ -1214,21 +1216,23 @@ public final class Config
 			is.close();
 			
 			EVERYBODY_HAS_ADMIN_RIGHTS = Boolean.parseBoolean(AccessSettings.getProperty("EverybodyHasAdminRights", "false"));
-			GM_STARTUP_AUTO_LIST = Boolean.parseBoolean(AccessSettings.getProperty("GMStartupAutoList", "true"));
-			GM_ADMIN_MENU_STYLE = AccessSettings.getProperty("GMAdminMenuStyle", "modern");
-			GM_HERO_AURA = Boolean.parseBoolean(AccessSettings.getProperty("GMHeroAura", "false"));
-			GM_STARTUP_INVULNERABLE = Boolean.parseBoolean(AccessSettings.getProperty("GMStartupInvulnerable", "true"));
-			GM_ANNOUNCER_NAME = Boolean.parseBoolean(AccessSettings.getProperty("AnnounceGmName", "false"));
-			SHOW_GM_LOGIN = Boolean.parseBoolean(AccessSettings.getProperty("ShowGMLogin", "false"));
-			GM_STARTUP_INVISIBLE = Boolean.parseBoolean(AccessSettings.getProperty("GMStartupInvisible", "true"));
-			GM_SPECIAL_EFFECT = Boolean.parseBoolean(AccessSettings.getProperty("GmLoginSpecialEffect", "false"));
-			GM_STARTUP_SILENCE = Boolean.parseBoolean(AccessSettings.getProperty("GMStartupSilence", "true"));
 			MASTERACCESS_LEVEL = Integer.parseInt(AccessSettings.getProperty("MasterAccessLevel", "1"));
 			MASTERACCESS_NAME_COLOR_ENABLED = Boolean.parseBoolean(AccessSettings.getProperty("MasterNameColorEnabled", "false"));
 			MASTERACCESS_TITLE_COLOR_ENABLED = Boolean.parseBoolean(AccessSettings.getProperty("MasterTitleColorEnabled", "false"));
 			MASTERACCESS_NAME_COLOR = Integer.decode("0x" + AccessSettings.getProperty("MasterNameColor", "00FF00"));
 			MASTERACCESS_TITLE_COLOR = Integer.decode("0x" + AccessSettings.getProperty("MasterTitleColor", "00FF00"));
 			USERACCESS_LEVEL = Integer.parseInt(AccessSettings.getProperty("UserAccessLevel", "0"));
+			GM_STARTUP_AUTO_LIST = Boolean.parseBoolean(AccessSettings.getProperty("GMStartupAutoList", "true"));
+			GM_ADMIN_MENU_STYLE = AccessSettings.getProperty("GMAdminMenuStyle", "modern");
+			GM_HERO_AURA = Boolean.parseBoolean(AccessSettings.getProperty("GMHeroAura", "false"));
+			GM_STARTUP_BUILDER_HIDE = Boolean.parseBoolean(AccessSettings.getProperty("GMStartupBuilderHide", "true"));
+			GM_STARTUP_INVULNERABLE = Boolean.parseBoolean(AccessSettings.getProperty("GMStartupInvulnerable", "true"));
+			GM_ANNOUNCER_NAME = Boolean.parseBoolean(AccessSettings.getProperty("AnnounceGmName", "false"));
+			SHOW_GM_LOGIN = Boolean.parseBoolean(AccessSettings.getProperty("ShowGMLogin", "false"));
+			GM_STARTUP_INVISIBLE = Boolean.parseBoolean(AccessSettings.getProperty("GMStartupInvisible", "true"));
+			GM_SPECIAL_EFFECT = Boolean.parseBoolean(AccessSettings.getProperty("GmLoginSpecialEffect", "false"));
+			GM_STARTUP_SILENCE = Boolean.parseBoolean(AccessSettings.getProperty("GMStartupSilence", "true"));
+			USE_SUPER_HASTE_AS_GM_SPEED = Boolean.parseBoolean(AccessSettings.getProperty("UseSuperHasteAsGMSpeed", "false"));
 		}
 		catch (Exception e)
 		{
diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
index 4066c186ef..ab8fc3bc97 100644
--- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
+++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
@@ -49,8 +49,10 @@ import com.l2jmobius.gameserver.handler.admincommandhandlers.AdminFortSiege;
 import com.l2jmobius.gameserver.handler.admincommandhandlers.AdminGeodata;
 import com.l2jmobius.gameserver.handler.admincommandhandlers.AdminGm;
 import com.l2jmobius.gameserver.handler.admincommandhandlers.AdminGmChat;
+import com.l2jmobius.gameserver.handler.admincommandhandlers.AdminGmSpeed;
 import com.l2jmobius.gameserver.handler.admincommandhandlers.AdminHeal;
 import com.l2jmobius.gameserver.handler.admincommandhandlers.AdminHelpPage;
+import com.l2jmobius.gameserver.handler.admincommandhandlers.AdminHide;
 import com.l2jmobius.gameserver.handler.admincommandhandlers.AdminInvul;
 import com.l2jmobius.gameserver.handler.admincommandhandlers.AdminKick;
 import com.l2jmobius.gameserver.handler.admincommandhandlers.AdminKill;
@@ -79,6 +81,7 @@ import com.l2jmobius.gameserver.handler.admincommandhandlers.AdminShutdown;
 import com.l2jmobius.gameserver.handler.admincommandhandlers.AdminSiege;
 import com.l2jmobius.gameserver.handler.admincommandhandlers.AdminSkill;
 import com.l2jmobius.gameserver.handler.admincommandhandlers.AdminSpawn;
+import com.l2jmobius.gameserver.handler.admincommandhandlers.AdminSuperHaste;
 import com.l2jmobius.gameserver.handler.admincommandhandlers.AdminTarget;
 import com.l2jmobius.gameserver.handler.admincommandhandlers.AdminTeleport;
 import com.l2jmobius.gameserver.handler.admincommandhandlers.AdminTest;
@@ -133,6 +136,9 @@ public class AdminCommandHandler
 		registerAdminCommandHandler(new AdminExpSp());
 		registerAdminCommandHandler(new AdminEventEngine());
 		registerAdminCommandHandler(new AdminGmChat());
+		registerAdminCommandHandler(new AdminGmSpeed());
+		registerAdminCommandHandler(new AdminHide());
+		registerAdminCommandHandler(new AdminSuperHaste());
 		registerAdminCommandHandler(new AdminEditChar());
 		registerAdminCommandHandler(new AdminGm());
 		registerAdminCommandHandler(new AdminTeleport());
diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminEffects.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminEffects.java
index c350481aeb..9fd491f7f5 100644
--- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminEffects.java
+++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminEffects.java
@@ -18,10 +18,8 @@ package com.l2jmobius.gameserver.handler.admincommandhandlers;
 
 import java.util.StringTokenizer;
 
-import com.l2jmobius.gameserver.datatables.SkillTable;
 import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.model.L2Object;
-import com.l2jmobius.gameserver.model.L2Skill;
 import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.L2Summon;
@@ -74,9 +72,6 @@ public class AdminEffects implements IAdminCommandHandler
 		"admin_earthquake_menu",
 		"admin_bighead",
 		"admin_shrinkhead",
-		"admin_gmspeed",
-		"admin_gmspeed_menu",
-		"admin_gmspeed_menu_main",
 		"admin_unpara_all",
 		"admin_para_all",
 		"admin_unpara",
@@ -351,35 +346,6 @@ public class AdminEffects implements IAdminCommandHandler
 			}
 		}
 		
-		else if (command.startsWith("admin_gmspeed"))
-		{
-			try
-			{
-				final int val = Integer.parseInt(st.nextToken());
-				final boolean sendMessage = activeChar.getFirstEffect(7029) != null;
-				
-				activeChar.stopSkillEffects(7029);
-				
-				if ((val == 0) && sendMessage)
-				{
-					activeChar.sendPacket(new SystemMessage(SystemMessageId.EFFECT_S1_DISAPPEARED).addSkillName(7029));
-				}
-				else if ((val >= 1) && (val <= 4))
-				{
-					final L2Skill gmSpeedSkill = SkillTable.getInstance().getInfo(7029, val);
-					activeChar.doCast(gmSpeedSkill);
-				}
-			}
-			catch (Exception e)
-			{
-				activeChar.sendMessage("Use //gmspeed value (0=off...4=max).");
-			}
-			finally
-			{
-				activeChar.updateEffectIcons();
-			}
-		}
-		
 		else if (command.startsWith("admin_polyself"))
 		{
 			try
diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminGmSpeed.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminGmSpeed.java
new file mode 100644
index 0000000000..42c7e8c438
--- /dev/null
+++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminGmSpeed.java
@@ -0,0 +1,133 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jmobius.gameserver.handler.admincommandhandlers;
+
+import java.util.StringTokenizer;
+
+import com.l2jmobius.Config;
+import com.l2jmobius.gameserver.datatables.SkillTable;
+import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
+import com.l2jmobius.gameserver.model.L2Object;
+import com.l2jmobius.gameserver.model.L2Skill;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.SystemMessageId;
+import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
+import com.l2jmobius.gameserver.util.BuilderUtil;
+import com.l2jmobius.gameserver.util.Util;
+
+/**
+ * A retail-like implementation of //gmspeed builder command.
+ * @author lord_rex
+ */
+public final class AdminGmSpeed implements IAdminCommandHandler
+{
+	private static final String[] ADMIN_COMMANDS =
+	{
+		"admin_gmspeed",
+	};
+	
+	private static final int SUPER_HASTE_ID = 7029;
+	
+	@Override
+	public boolean useAdminCommand(String command, L2PcInstance player)
+	{
+		final StringTokenizer st = new StringTokenizer(command);
+		final String cmd = st.nextToken();
+		
+		if (cmd.equals("admin_gmspeed"))
+		{
+			if (!st.hasMoreTokens())
+			{
+				BuilderUtil.sendSysMessage(player, "//gmspeed [0...10]");
+				return false;
+			}
+			final String token = st.nextToken();
+			
+			// Rollback feature for old custom way, in order to make everyone happy.
+			if (Config.USE_SUPER_HASTE_AS_GM_SPEED)
+			{
+				try
+				{
+					final int val = Integer.parseInt(token);
+					final boolean sendMessage = player.getFirstEffect(SUPER_HASTE_ID) != null;
+					
+					player.stopSkillEffects(SUPER_HASTE_ID);
+					
+					if ((val == 0) && sendMessage)
+					{
+						player.sendPacket(new SystemMessage(SystemMessageId.EFFECT_S1_DISAPPEARED).addSkillName(SUPER_HASTE_ID));
+					}
+					else if ((val >= 1) && (val <= 4))
+					{
+						final L2Skill gmSpeedSkill = SkillTable.getInstance().getInfo(SUPER_HASTE_ID, val);
+						player.doCast(gmSpeedSkill);
+					}
+				}
+				catch (Exception e)
+				{
+					player.sendMessage("Use //gmspeed value (0=off...4=max).");
+				}
+				finally
+				{
+					player.updateEffectIcons();
+				}
+				return true;
+			}
+			
+			if (!Util.isFloat(token))
+			{
+				BuilderUtil.sendSysMessage(player, "//gmspeed [0...10]");
+				return false;
+			}
+			float runSpeedBoost = Float.parseFloat(token);
+			if ((runSpeedBoost < 0) || (runSpeedBoost > 10))
+			{
+				// Custom limit according to SDW's request - real retail limit is unknown.
+				BuilderUtil.sendSysMessage(player, "//gmspeed [0...10]");
+				return false;
+			}
+			
+			final L2PcInstance targetCharacter;
+			final L2Object target = player.getTarget();
+			if ((target != null) && target.isPlayer())
+			{
+				targetCharacter = (L2PcInstance) target;
+			}
+			else
+			{
+				// If there is no target, let's use the command executer.
+				targetCharacter = player;
+			}
+			
+			targetCharacter.getStat().setGmSpeedMultiplier(runSpeedBoost > 1 ? runSpeedBoost : 1);
+			targetCharacter.broadcastUserInfo();
+			
+			if (runSpeedBoost < 1)
+			{
+				runSpeedBoost = 1;
+			}
+			BuilderUtil.sendSysMessage(player, "[" + targetCharacter.getName() + "] speed is [" + (runSpeedBoost * 100) + "0]% fast.");
+		}
+		return true;
+	}
+	
+	@Override
+	public String[] getAdminCommandList()
+	{
+		return ADMIN_COMMANDS;
+	}
+}
diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminHide.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminHide.java
new file mode 100644
index 0000000000..700e7c4e8a
--- /dev/null
+++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminHide.java
@@ -0,0 +1,87 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jmobius.gameserver.handler.admincommandhandlers;
+
+import java.util.StringTokenizer;
+
+import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.util.BuilderUtil;
+
+/**
+ * @author lord_rex
+ */
+public final class AdminHide implements IAdminCommandHandler
+{
+	private static final String[] ADMIN_COMMANDS =
+	{
+		"admin_hide"
+	};
+	
+	@Override
+	public boolean useAdminCommand(String command, L2PcInstance player)
+	{
+		final StringTokenizer st = new StringTokenizer(command);
+		st.nextToken();
+		
+		try
+		{
+			final String param = st.nextToken();
+			switch (param)
+			{
+				case "on":
+				{
+					if (!BuilderUtil.setHiding(player, true))
+					{
+						BuilderUtil.sendSysMessage(player, "Currently, you cannot be seen.");
+						return true;
+					}
+					
+					BuilderUtil.sendSysMessage(player, "Now, you cannot be seen.");
+					return true;
+				}
+				case "off":
+				{
+					if (!BuilderUtil.setHiding(player, false))
+					{
+						BuilderUtil.sendSysMessage(player, "Currently, you can be seen.");
+						return true;
+					}
+					
+					BuilderUtil.sendSysMessage(player, "Now, you can be seen.");
+					return true;
+				}
+				default:
+				{
+					BuilderUtil.sendSysMessage(player, "//hide [on|off]");
+					return true;
+				}
+			}
+		}
+		catch (final Exception e)
+		{
+			BuilderUtil.sendSysMessage(player, "//hide [on|off]");
+			return true;
+		}
+	}
+	
+	@Override
+	public String[] getAdminCommandList()
+	{
+		return ADMIN_COMMANDS;
+	}
+}
diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminSuperHaste.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminSuperHaste.java
new file mode 100644
index 0000000000..a27bb25c63
--- /dev/null
+++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminSuperHaste.java
@@ -0,0 +1,97 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jmobius.gameserver.handler.admincommandhandlers;
+
+import java.util.StringTokenizer;
+
+import com.l2jmobius.gameserver.datatables.SkillTable;
+import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
+import com.l2jmobius.gameserver.model.L2Skill;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.SystemMessageId;
+import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * The classical custom L2J implementation of the old //gmspeed GM command.
+ * @author lord_rex (No, it wasn't me at all. Eclipse added my name there.)
+ */
+public final class AdminSuperHaste implements IAdminCommandHandler
+{
+	public static final String[] ADMIN_COMMANDS =
+	{
+		"admin_superhaste",
+		"admin_superhaste_menu",
+		"admin_speed",
+		"admin_speed_menu",
+	};
+	
+	private static final int SUPER_HASTE_ID = 7029;
+	
+	@Override
+	public boolean useAdminCommand(String command, L2PcInstance player)
+	{
+		final StringTokenizer st = new StringTokenizer(command);
+		final String cmd = st.nextToken();
+		switch (cmd)
+		{
+			case "admin_superhaste":
+			case "admin_speed":
+			{
+				try
+				{
+					final int val = Integer.parseInt(st.nextToken());
+					final boolean sendMessage = player.getFirstEffect(SUPER_HASTE_ID) != null;
+					
+					player.stopSkillEffects(SUPER_HASTE_ID);
+					
+					if ((val == 0) && sendMessage)
+					{
+						player.sendPacket(new SystemMessage(SystemMessageId.EFFECT_S1_DISAPPEARED).addSkillName(SUPER_HASTE_ID));
+					}
+					else if ((val >= 1) && (val <= 4))
+					{
+						final L2Skill gmSpeedSkill = SkillTable.getInstance().getInfo(SUPER_HASTE_ID, val);
+						player.doCast(gmSpeedSkill);
+					}
+				}
+				catch (Exception e)
+				{
+					player.sendMessage("Use //gmspeed value (0=off...4=max).");
+				}
+				finally
+				{
+					player.updateEffectIcons();
+				}
+				break;
+			}
+			case "admin_superhaste_menu":
+			case "admin_speed_menu":
+			{
+				AdminHelpPage.showHelpPage(player, "gm_menu.htm");
+				break;
+			}
+		}
+		
+		return true;
+	}
+	
+	@Override
+	public String[] getAdminCommandList()
+	{
+		return ADMIN_COMMANDS;
+	}
+}
diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
index 91c6ce0e94..8ca5160eb4 100644
--- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
@@ -15018,19 +15018,23 @@ public final class L2PcInstance extends L2Playable
 		// jail task
 		updatePunishState();
 		
-		if (_isInvul)
+		if (isGM() && !Config.GM_STARTUP_BUILDER_HIDE)
 		{
-			sendMessage("Entering world in Invulnerable mode.");
-		}
-		
-		if (getAppearance().getInvisible())
-		{
-			sendMessage("Entering world in Invisible mode.");
-		}
-		
-		if (isInRefusalMode())
-		{
-			sendMessage("Entering world in Message Refusal mode.");
+			// Bleah, see L2J custom below.
+			if (_isInvul)
+			{
+				sendMessage("Entering world in Invulnerable mode.");
+			}
+			
+			if (getAppearance().getInvisible())
+			{
+				sendMessage("Entering world in Invisible mode.");
+			}
+			
+			if (isInRefusalMode())
+			{
+				sendMessage("Entering world in Message Refusal mode.");
+			}
 		}
 		
 		revalidateZone(true);
diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/stat/CharStat.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/stat/CharStat.java
index 2abad86641..bfa06f0061 100644
--- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/stat/CharStat.java
+++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/stat/CharStat.java
@@ -47,6 +47,9 @@ public class CharStat
 	/** The _level. */
 	private int _level = 1;
 	
+	/** Speed multiplier set by admin gmspeed command */
+	private float _gmSpeedMultiplier = 1;
+	
 	// =========================================================
 	// Constructor
 	/**
@@ -597,7 +600,12 @@ public class CharStat
 			return 1;
 		}
 		
-		return (getRunSpeed() * 1f) / _activeChar.getTemplate().baseRunSpd;
+		return getRunSpeed() / _activeChar.getTemplate().baseRunSpd;
+	}
+	
+	public void setGmSpeedMultiplier(float multipier)
+	{
+		_gmSpeedMultiplier = multipier;
 	}
 	
 	/**
@@ -920,13 +928,13 @@ public class CharStat
 		if (_activeChar.isFlying())
 		{
 			val += Config.WYVERN_SPEED;
-			return val;
+			return (int) (val * _gmSpeedMultiplier);
 		}
 		
 		if (_activeChar.isRiding())
 		{
 			val += Config.STRIDER_SPEED;
-			return val;
+			return (int) (val * _gmSpeedMultiplier);
 		}
 		
 		val /= _activeChar.getArmourExpertisePenalty();
@@ -936,7 +944,7 @@ public class CharStat
 			val = Config.MAX_RUN_SPEED;
 		}
 		
-		return val;
+		return (int) (val * _gmSpeedMultiplier);
 	}
 	
 	/**
diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index b4288ac24e..d750bf49a9 100644
--- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -96,6 +96,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SignsSky;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import com.l2jmobius.gameserver.network.serverpackets.UserInfo;
 import com.l2jmobius.gameserver.thread.TaskPriority;
+import com.l2jmobius.gameserver.util.BuilderUtil;
 import com.l2jmobius.gameserver.util.Util;
 
 /**
@@ -599,6 +600,47 @@ public class EnterWorld extends L2GameClientPacket
 	{
 		if (activeChar.isGM())
 		{
+			gmStartupProcess:
+			{
+				if (Config.GM_STARTUP_BUILDER_HIDE && AdminCommandAccessRights.getInstance().hasAccess("admin_hide", activeChar.getAccessLevel()))
+				{
+					activeChar.setInRefusalMode(true);
+					activeChar.setIsInvul(true);
+					activeChar.getAppearance().setInvisible();
+					
+					BuilderUtil.sendSysMessage(activeChar, "hide is default for builder.");
+					BuilderUtil.sendSysMessage(activeChar, "FriendAddOff is default for builder.");
+					BuilderUtil.sendSysMessage(activeChar, "whisperoff is default for builder.");
+					
+					// It isn't recommend to use the below custom L2J GMStartup functions together with retail-like GMStartupBuilderHide, so breaking the process at that stage.
+					break gmStartupProcess;
+				}
+				
+				if (Config.GM_STARTUP_INVULNERABLE && AdminCommandAccessRights.getInstance().hasAccess("admin_invul", activeChar.getAccessLevel()))
+				{
+					activeChar.setIsInvul(true);
+				}
+				
+				if (Config.GM_STARTUP_INVISIBLE && AdminCommandAccessRights.getInstance().hasAccess("admin_invisible", activeChar.getAccessLevel()))
+				{
+					activeChar.getAppearance().setInvisible();
+				}
+				
+				if (Config.GM_STARTUP_SILENCE && AdminCommandAccessRights.getInstance().hasAccess("admin_silence", activeChar.getAccessLevel()))
+				{
+					activeChar.setInRefusalMode(true);
+				}
+				
+				if (Config.GM_STARTUP_AUTO_LIST && AdminCommandAccessRights.getInstance().hasAccess("admin_gmliston", activeChar.getAccessLevel()))
+				{
+					GmListTable.getInstance().addGm(activeChar, false);
+				}
+				else
+				{
+					GmListTable.getInstance().addGm(activeChar, true);
+				}
+			}
+			
 			if (Config.GM_SPECIAL_EFFECT)
 			{
 				activeChar.broadcastPacket(new Earthquake(activeChar.getX(), activeChar.getY(), activeChar.getZ(), 50, 4));
@@ -609,30 +651,6 @@ public class EnterWorld extends L2GameClientPacket
 				Announcements.getInstance().announceToAll("GM " + activeChar.getName() + " has logged on.");
 			}
 			
-			if (Config.GM_STARTUP_INVULNERABLE && AdminCommandAccessRights.getInstance().hasAccess("admin_invul", activeChar.getAccessLevel()))
-			{
-				activeChar.setIsInvul(true);
-			}
-			
-			if (Config.GM_STARTUP_INVISIBLE && AdminCommandAccessRights.getInstance().hasAccess("admin_invisible", activeChar.getAccessLevel()))
-			{
-				activeChar.getAppearance().setInvisible();
-			}
-			
-			if (Config.GM_STARTUP_SILENCE && AdminCommandAccessRights.getInstance().hasAccess("admin_silence", activeChar.getAccessLevel()))
-			{
-				activeChar.setInRefusalMode(true);
-			}
-			
-			if (Config.GM_STARTUP_AUTO_LIST && AdminCommandAccessRights.getInstance().hasAccess("admin_gmliston", activeChar.getAccessLevel()))
-			{
-				GmListTable.getInstance().addGm(activeChar, false);
-			}
-			else
-			{
-				GmListTable.getInstance().addGm(activeChar, true);
-			}
-			
 			if (Config.MASTERACCESS_NAME_COLOR_ENABLED)
 			{
 				activeChar.getAppearance().setNameColor(Config.MASTERACCESS_NAME_COLOR);
diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/util/BuilderUtil.java
new file mode 100644
index 0000000000..bef14ae391
--- /dev/null
+++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/util/BuilderUtil.java
@@ -0,0 +1,67 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jmobius.gameserver.util;
+
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.clientpackets.Say2;
+import com.l2jmobius.gameserver.network.serverpackets.CreatureSay;
+
+/**
+ * @author lord_rex
+ */
+public final class BuilderUtil
+{
+	private BuilderUtil()
+	{
+		// utility class
+	}
+	
+	/**
+	 * Sends builder system message to the player.
+	 * @param player
+	 * @param message
+	 */
+	public static void sendSysMessage(L2PcInstance player, String message)
+	{
+		player.sendPacket(new CreatureSay(-1, Say2.ALL, "SYS", message));
+	}
+	
+	/**
+	 * Changes player's hiding state.
+	 * @param player
+	 * @param hide
+	 * @return {@code true} if hide state was changed, otherwise {@code false}
+	 */
+	public static boolean setHiding(L2PcInstance player, boolean hide)
+	{
+		player.setInRefusalMode(hide);
+		player.setIsInvul(hide);
+		if (hide)
+		{
+			player.getAppearance().setInvisible();
+			player.decayMe();
+			player.broadcastUserInfo();
+			player.spawnMe();
+		}
+		else
+		{
+			player.getAppearance().setVisible();
+			player.broadcastUserInfo();
+		}
+		return true;
+	}
+}
diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/util/TimeAmountInterpreter.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/util/TimeAmountInterpreter.java
new file mode 100644
index 0000000000..a9f8029b98
--- /dev/null
+++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/util/TimeAmountInterpreter.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 1999 CERN - European Organization for Nuclear Research.
+ * 
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear in
+ * supporting documentation. CERN makes no representations about the
+ * suitability of this software for any purpose. It is provided "as is"
+ * without expressed or implied warranty.
+ */
+package com.l2jmobius.gameserver.util;
+
+import static java.util.concurrent.TimeUnit.DAYS;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
+
+import java.io.IOException;
+import java.util.Locale;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Allows to present time intervals in a standardized, user friendly manner.
+ * @author _dev_
+ */
+public class TimeAmountInterpreter
+{
+	private static final TimeUnit[] UNIT_CACHE = TimeUnit.values();
+	
+	private TimeAmountInterpreter()
+	{
+		// utility class
+	}
+	
+	/**
+	 * Calls {@link #consolidate(long, TimeUnit)} with {@link TimeUnit#NANOSECONDS}.
+	 * @param timeAmountInNanos amount of time in nanoseconds
+	 * @return an user-friendly description of the given time amount
+	 */
+	public static String consolidateNanos(long timeAmountInNanos)
+	{
+		return consolidate(timeAmountInNanos, NANOSECONDS);
+	}
+	
+	/**
+	 * Calls {@link #consolidate(long, TimeUnit)} with {@link TimeUnit#MILLISECONDS}.
+	 * @param timeAmountInMillis amount of time in milliseconds
+	 * @return an user-friendly description of the given time amount
+	 */
+	public static String consolidateMillis(long timeAmountInMillis)
+	{
+		return consolidate(timeAmountInMillis, MILLISECONDS);
+	}
+	
+	/**
+	 * Constructs an user-friendly description of the given amount of time, specifying the number of days (if any), hours (if any), minutes (if any), seconds (if any) and milliseconds (if any). Otherwise, returns the string value {@code 0}.
+	 * @param timeAmount amount of time to be written
+	 * @param timeUnit unit of the given amount
+	 * @return an user-friendly description of the given time amount
+	 */
+	public static String consolidate(long timeAmount, TimeUnit timeUnit)
+	{
+		return consolidate(timeAmount, timeUnit, timeUnit, DAYS, "0 " + timeUnit.name().toLowerCase(Locale.ENGLISH));
+	}
+	
+	/**
+	 * Constructs an user-friendly description of the given amount of time.
+	 * @param timeAmount amount of time to be written
+	 * @param timeUnit unit of the given amount
+	 * @param minConsolidationUnit smallest unit to be included within the description
+	 * @param maxConsolidationUnit largest unit to be included within the description
+	 * @param noTimeUsedIndicator text to be written if the amount is not positive
+	 * @return an user-friendly description of the given time amount
+	 */
+	public static String consolidate(long timeAmount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator)
+	{
+		return appendConsolidated(new StringBuilder(), timeAmount, timeUnit, minConsolidationUnit, maxConsolidationUnit, noTimeUsedIndicator).toString();
+	}
+	
+	/**
+	 * Appends an user-friendly description of the given amount of time to the specified text builder.<BR>
+	 * <BR>
+	 * Please keep in mind, that this method is primarily designed to be used with heap text builders. Therefore, if the given text builder throws an {@link IOException}, this exception will be wrapped in a {@link RuntimeException} and returned to the caller as an unchecked exception.
+	 * @param <T>
+	 * @param textBuilder a character sequence builder
+	 * @param timeAmount amount of time to be written
+	 * @param timeUnit unit of the given amount
+	 * @param minConsolidationUnit smallest unit to be included within the description
+	 * @param maxConsolidationUnit largest unit to be included within the description
+	 * @param noTimeUsedIndicator text to be written if the amount is not positive
+	 * @return {@code textBuilder}
+	 * @throws RuntimeException if {@code textBuilder} throws an {@link IOException}
+	 */
+	@SuppressWarnings("unchecked")
+	public static <T extends Appendable & CharSequence> T appendConsolidated(T textBuilder, long timeAmount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator) throws RuntimeException
+	{
+		try
+		{
+			if (timeAmount < 1)
+			{
+				return (T) textBuilder.append(noTimeUsedIndicator);
+			}
+			
+			final int len = textBuilder.length();
+			for (int i = maxConsolidationUnit.ordinal(); i >= minConsolidationUnit.ordinal(); --i)
+			{
+				final TimeUnit activeUnit = UNIT_CACHE[i];
+				final long num = activeUnit.convert(timeAmount, timeUnit);
+				if (num == 0)
+				{
+					continue;
+				}
+				
+				if (textBuilder.length() > len)
+				{
+					textBuilder.append(", ");
+				}
+				textBuilder.append(String.valueOf(num)).append(' ');
+				final String unit = activeUnit.name().toLowerCase(Locale.ENGLISH);
+				textBuilder.append(unit, 0, num == 1 ? unit.length() - 1 : unit.length());
+				
+				timeAmount -= timeUnit.convert(num, activeUnit);
+			}
+			
+			if (textBuilder.length() == len)
+			{
+				return (T) textBuilder.append(noTimeUsedIndicator).append(' ').append(minConsolidationUnit.name().toLowerCase(Locale.ENGLISH));
+			}
+		}
+		catch (IOException e)
+		{
+			throw new RuntimeException(e);
+		}
+		return textBuilder;
+	}
+}
diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/util/Util.java
index b93c365c51..d413849e72 100644
--- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/util/Util.java
+++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/util/Util.java
@@ -436,6 +436,69 @@ public final class Util
 		return true;
 	}
 	
+	/**
+	 * @param text - the text to check
+	 * @return {@code true} if {@code text} is integer, {@code false} otherwise
+	 */
+	public static boolean isInteger(String text)
+	{
+		if ((text == null) || text.isEmpty())
+		{
+			return false;
+		}
+		try
+		{
+			Integer.parseInt(text);
+			return true;
+		}
+		catch (Exception e)
+		{
+			return false;
+		}
+	}
+	
+	/**
+	 * @param text - the text to check
+	 * @return {@code true} if {@code text} is float, {@code false} otherwise
+	 */
+	public static boolean isFloat(String text)
+	{
+		if ((text == null) || text.isEmpty())
+		{
+			return false;
+		}
+		try
+		{
+			Float.parseFloat(text);
+			return true;
+		}
+		catch (Exception e)
+		{
+			return false;
+		}
+	}
+	
+	/**
+	 * @param text - the text to check
+	 * @return {@code true} if {@code text} is double, {@code false} otherwise
+	 */
+	public static boolean isDouble(String text)
+	{
+		if ((text == null) || text.isEmpty())
+		{
+			return false;
+		}
+		try
+		{
+			Double.parseDouble(text);
+			return true;
+		}
+		catch (Exception e)
+		{
+			return false;
+		}
+	}
+	
 	/**
 	 * Replaces most invalid characters for the given string with an underscore.
 	 * @param str the string that may contain invalid characters
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/config/AdminCommands.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/config/AdminCommands.xml
index 50705109e1..62b0ff9557 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/config/AdminCommands.xml
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/config/AdminCommands.xml
@@ -150,8 +150,6 @@
 	<admin command="admin_earthquake_menu" accessLevel="100" />
 	<admin command="admin_bighead" accessLevel="100" />
 	<admin command="admin_shrinkhead" accessLevel="100" />
-	<admin command="admin_gmspeed" accessLevel="30" />
-	<admin command="admin_gmspeed_menu" accessLevel="30" />
 	<admin command="admin_unpara_all" accessLevel="100" />
 	<admin command="admin_para_all" accessLevel="100" />
 	<admin command="admin_unpara" accessLevel="100" />
@@ -181,6 +179,13 @@
 	<admin command="admin_set_displayeffect" accessLevel="100" />
 	<admin command="admin_set_displayeffect_menu" accessLevel="100" />
 
+	<!-- ADMIN SPEED -->
+	<admin command="admin_gmspeed" accessLevel="30" />
+	<admin command="admin_superhaste" accessLevel="30" />
+	<admin command="admin_superhaste_menu" accessLevel="30" />
+	<admin command="admin_speed" accessLevel="30" />
+	<admin command="admin_speed_menu" accessLevel="30" />
+
 	<!-- ADMIN ELEMENT -->
 	<admin command="admin_setlh" accessLevel="100" />
 	<admin command="admin_setlc" accessLevel="100" />
@@ -612,4 +617,7 @@
 	<admin command="banchat" accessLevel="30" />
 	<admin command="debug" accessLevel="100" />
 	<admin command="unbanchat" accessLevel="30" />
+
+	<!-- HIDE -->
+	<admin command="admin_hide" accessLevel="30" />
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/config/General.ini b/L2J_Mobius_CT_2.6_HighFive/dist/game/config/General.ini
index 08e016017a..76ac9cb188 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/config/General.ini
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/config/General.ini
@@ -25,6 +25,10 @@ ServerGMOnly = False
 # Default: False
 GMHeroAura = False
 
+# Whether GM logins in builder hide mode by default.
+# Default: True
+GMStartupBuilderHide = True
+
 # Auto set invulnerable status to a GM on login.
 # Default: False
 GMStartupInvulnerable = True
@@ -79,6 +83,11 @@ GMGiveSpecialSkills = False
 # Default: False
 GMGiveSpecialAuraSkills = False
 
+# In case you are not satisfied with the retail-like implementation of //gmspeed",
+# with this config you can rollback it to the old custom L2J version of the GM Speed.
+# Default: False
+UseSuperHasteAsGMSpeed = False
+
 
 # ---------------------------------------------------------------------------
 # Server Security
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/gm_menu.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/gm_menu.htm
index f4e1c456d1..94dd294cec 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/gm_menu.htm
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/gm_menu.htm
@@ -38,11 +38,11 @@
 </table><br1>
 <table width=270><tr>
 <td><font color="LEVEL">Super Haste:</font></td>
-<td><button value="1" action="bypass -h admin_gmspeed_menu 1" width=35 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="2" action="bypass -h admin_gmspeed_menu 2" width=35 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="3" action="bypass -h admin_gmspeed_menu 3" width=35 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="4" action="bypass -h admin_gmspeed_menu 4" width=35 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="Off" action="bypass -h admin_gmspeed_menu 0" width=35 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="1" action="bypass -h admin_superhaste 1" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="2" action="bypass -h admin_superhaste 2" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="3" action="bypass -h admin_superhaste 3" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="4" action="bypass -h admin_superhaste 4" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="Off" action="bypass -h admin_superhaste 0" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr></table><br>
 <center><multiedit var="new_announcement" width=250 height=50></center>
 <table width="160"><tr>
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/MasterHandler.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/MasterHandler.java
index 1c0c72b387..aff2bd0ef8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/MasterHandler.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/MasterHandler.java
@@ -81,9 +81,11 @@ import handlers.admincommandhandlers.AdminGamePoints;
 import handlers.admincommandhandlers.AdminGeodata;
 import handlers.admincommandhandlers.AdminGm;
 import handlers.admincommandhandlers.AdminGmChat;
+import handlers.admincommandhandlers.AdminGmSpeed;
 import handlers.admincommandhandlers.AdminGraciaSeeds;
 import handlers.admincommandhandlers.AdminGrandBoss;
 import handlers.admincommandhandlers.AdminHeal;
+import handlers.admincommandhandlers.AdminHide;
 import handlers.admincommandhandlers.AdminHtml;
 import handlers.admincommandhandlers.AdminInstance;
 import handlers.admincommandhandlers.AdminInstanceZone;
@@ -120,6 +122,7 @@ import handlers.admincommandhandlers.AdminSiege;
 import handlers.admincommandhandlers.AdminSkill;
 import handlers.admincommandhandlers.AdminSpawn;
 import handlers.admincommandhandlers.AdminSummon;
+import handlers.admincommandhandlers.AdminSuperHaste;
 import handlers.admincommandhandlers.AdminTarget;
 import handlers.admincommandhandlers.AdminTargetSay;
 import handlers.admincommandhandlers.AdminTeleport;
@@ -377,9 +380,11 @@ public class MasterHandler
 			AdminGeodata.class,
 			AdminGm.class,
 			AdminGmChat.class,
+			AdminGmSpeed.class,
 			AdminGraciaSeeds.class,
 			AdminGrandBoss.class,
 			AdminHeal.class,
+			AdminHide.class,
 			AdminHtml.class,
 			AdminInstance.class,
 			AdminInstanceZone.class,
@@ -416,6 +421,7 @@ public class MasterHandler
 			AdminSkill.class,
 			AdminSpawn.class,
 			AdminSummon.class,
+			AdminSuperHaste.class,
 			AdminTarget.class,
 			AdminTargetSay.class,
 			AdminTeleport.class,
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/actionshifthandlers/L2PcInstanceActionShift.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/actionshifthandlers/L2PcInstanceActionShift.java
index 6b1bb7ac43..72c01c3cf8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/actionshifthandlers/L2PcInstanceActionShift.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/actionshifthandlers/L2PcInstanceActionShift.java
@@ -19,7 +19,6 @@ package handlers.actionshifthandlers;
 import com.l2jmobius.gameserver.enums.InstanceType;
 import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.IActionShiftHandler;
-import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 
@@ -37,11 +36,7 @@ public class L2PcInstanceActionShift implements IActionShiftHandler
 				activeChar.setTarget(target);
 			}
 			
-			final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler("admin_character_info");
-			if (ach != null)
-			{
-				ach.useAdminCommand("admin_character_info " + target.getName(), activeChar);
-			}
+			AdminCommandHandler.getInstance().useAdminCommand(activeChar, "admin_character_info " + target.getName(), true);
 		}
 		return true;
 	}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/actionshifthandlers/L2SummonActionShift.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/actionshifthandlers/L2SummonActionShift.java
index 67d403c9b3..6ee8a1173e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/actionshifthandlers/L2SummonActionShift.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/actionshifthandlers/L2SummonActionShift.java
@@ -19,7 +19,6 @@ package handlers.actionshifthandlers;
 import com.l2jmobius.gameserver.enums.InstanceType;
 import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.IActionShiftHandler;
-import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 
@@ -36,11 +35,7 @@ public class L2SummonActionShift implements IActionShiftHandler
 				activeChar.setTarget(target);
 			}
 			
-			final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler("admin_summon_info");
-			if (ach != null)
-			{
-				ach.useAdminCommand("admin_summon_info", activeChar);
-			}
+			AdminCommandHandler.getInstance().useAdminCommand(activeChar, "admin_summon_info", true);
 		}
 		return true;
 	}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
index 8a92c7628e..865e2e4ba3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
@@ -18,7 +18,6 @@ package handlers.admincommandhandlers;
 
 import java.util.StringTokenizer;
 
-import com.l2jmobius.gameserver.data.xml.impl.SkillData;
 import com.l2jmobius.gameserver.enums.Team;
 import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.model.L2Object;
@@ -28,7 +27,6 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.model.actor.instance.L2ChestInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.skills.AbnormalVisualEffect;
-import com.l2jmobius.gameserver.model.skills.Skill;
 import com.l2jmobius.gameserver.network.SystemMessageId;
 import com.l2jmobius.gameserver.network.serverpackets.Earthquake;
 import com.l2jmobius.gameserver.network.serverpackets.ExRedSky;
@@ -73,8 +71,6 @@ public class AdminEffects implements IAdminCommandHandler
 		"admin_earthquake_menu",
 		"admin_bighead",
 		"admin_shrinkhead",
-		"admin_gmspeed",
-		"admin_gmspeed_menu",
 		"admin_unpara_all",
 		"admin_para_all",
 		"admin_unpara",
@@ -335,29 +331,6 @@ public class AdminEffects implements IAdminCommandHandler
 			{
 			}
 		}
-		else if (command.startsWith("admin_gmspeed"))
-		{
-			try
-			{
-				final int val = Integer.parseInt(st.nextToken());
-				final boolean sendMessage = activeChar.isAffectedBySkill(7029);
-				activeChar.stopSkillEffects((val == 0) && sendMessage, 7029);
-				if ((val >= 1) && (val <= 4))
-				{
-					final Skill gmSpeedSkill = SkillData.getInstance().getSkill(7029, val);
-					activeChar.doSimultaneousCast(gmSpeedSkill);
-				}
-			}
-			catch (Exception e)
-			{
-				activeChar.sendMessage("Usage: //gmspeed <value> (0=off...4=max)");
-			}
-			if (command.contains("_menu"))
-			{
-				command = "";
-				AdminHtml.showAdminHtml(activeChar, "gm_menu.htm");
-			}
-		}
 		else if (command.startsWith("admin_polyself"))
 		{
 			try
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmSpeed.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmSpeed.java
new file mode 100644
index 0000000000..83577f3264
--- /dev/null
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmSpeed.java
@@ -0,0 +1,109 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.admincommandhandlers;
+
+import java.util.StringTokenizer;
+
+import com.l2jmobius.Config;
+import com.l2jmobius.gameserver.handler.AdminCommandHandler;
+import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
+import com.l2jmobius.gameserver.model.L2Object;
+import com.l2jmobius.gameserver.model.actor.L2Character;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.util.BuilderUtil;
+import com.l2jmobius.gameserver.util.Util;
+
+/**
+ * A retail-like implementation of //gmspeed builder command.
+ * @author lord_rex
+ */
+public final class AdminGmSpeed implements IAdminCommandHandler
+{
+	private static final String[] ADMIN_COMMANDS =
+	{
+		"admin_gmspeed",
+	};
+	
+	@Override
+	public boolean useAdminCommand(String command, L2PcInstance player)
+	{
+		final StringTokenizer st = new StringTokenizer(command);
+		final String cmd = st.nextToken();
+		
+		if (cmd.equals("admin_gmspeed"))
+		{
+			if (!st.hasMoreTokens())
+			{
+				BuilderUtil.sendSysMessage(player, "//gmspeed [0...10]");
+				return false;
+			}
+			final String token = st.nextToken();
+			
+			// Rollback feature for old custom way, in order to make everyone happy.
+			if (Config.USE_SUPER_HASTE_AS_GM_SPEED)
+			{
+				AdminCommandHandler.getInstance().useAdminCommand(player, AdminSuperHaste.ADMIN_COMMANDS[0] + " " + token, false);
+				return true;
+			}
+			
+			if (!Util.isDouble(token))
+			{
+				BuilderUtil.sendSysMessage(player, "//gmspeed [0...10]");
+				return false;
+			}
+			final double runSpeedBoost = Double.parseDouble(token);
+			if ((runSpeedBoost < 0) || (runSpeedBoost > 10))
+			{
+				// Custom limit according to SDW's request - real retail limit is unknown.
+				BuilderUtil.sendSysMessage(player, "//gmspeed [0...10]");
+				return false;
+			}
+			
+			final L2Character targetCharacter;
+			final L2Object target = player.getTarget();
+			if ((target != null) && target.isCharacter())
+			{
+				targetCharacter = (L2Character) target;
+			}
+			else
+			{
+				// If there is no target, let's use the command executer.
+				targetCharacter = player;
+			}
+			
+			targetCharacter.getStat().setGmSpeedMultiplier(runSpeedBoost > 0 ? runSpeedBoost : 1);
+			
+			if (targetCharacter.isPlayer())
+			{
+				((L2PcInstance) targetCharacter).broadcastUserInfo();
+			}
+			else
+			{
+				targetCharacter.broadcastInfo();
+			}
+			
+			BuilderUtil.sendSysMessage(player, "[" + targetCharacter.getName() + "] speed is [" + (runSpeedBoost * 100) + "0]% fast.");
+		}
+		return true;
+	}
+	
+	@Override
+	public String[] getAdminCommandList()
+	{
+		return ADMIN_COMMANDS;
+	}
+}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminHide.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminHide.java
new file mode 100644
index 0000000000..600cbe1639
--- /dev/null
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminHide.java
@@ -0,0 +1,87 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.admincommandhandlers;
+
+import java.util.StringTokenizer;
+
+import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.util.BuilderUtil;
+
+/**
+ * @author lord_rex
+ */
+public final class AdminHide implements IAdminCommandHandler
+{
+	private static final String[] ADMIN_COMMANDS =
+	{
+		"admin_hide"
+	};
+	
+	@Override
+	public boolean useAdminCommand(String command, L2PcInstance player)
+	{
+		final StringTokenizer st = new StringTokenizer(command);
+		st.nextToken();
+		
+		try
+		{
+			final String param = st.nextToken();
+			switch (param)
+			{
+				case "on":
+				{
+					if (!BuilderUtil.setHiding(player, true))
+					{
+						BuilderUtil.sendSysMessage(player, "Currently, you cannot be seen.");
+						return true;
+					}
+					
+					BuilderUtil.sendSysMessage(player, "Now, you cannot be seen.");
+					return true;
+				}
+				case "off":
+				{
+					if (!BuilderUtil.setHiding(player, false))
+					{
+						BuilderUtil.sendSysMessage(player, "Currently, you can be seen.");
+						return true;
+					}
+					
+					BuilderUtil.sendSysMessage(player, "Now, you can be seen.");
+					return true;
+				}
+				default:
+				{
+					BuilderUtil.sendSysMessage(player, "//hide [on|off]");
+					return true;
+				}
+			}
+		}
+		catch (final Exception e)
+		{
+			BuilderUtil.sendSysMessage(player, "//hide [on|off]");
+			return true;
+		}
+	}
+	
+	@Override
+	public String[] getAdminCommandList()
+	{
+		return ADMIN_COMMANDS;
+	}
+}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java
index dcd6d3f154..7f57cfd5de 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java
@@ -21,7 +21,6 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.gameserver.data.xml.impl.AdminData;
 import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.model.L2Clan;
@@ -189,14 +188,7 @@ public class AdminMenu implements IAdminCommandHandler
 			if (st.countTokens() > 1)
 			{
 				final String subCommand = "admin_ban_char";
-				if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel()))
-				{
-					activeChar.sendMessage("You don't have the access right to use this command!");
-					LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!");
-					return false;
-				}
-				final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand);
-				ach.useAdminCommand(subCommand + command.substring(14), activeChar);
+				AdminCommandHandler.getInstance().useAdminCommand(activeChar, subCommand + command.substring(14), true);
 			}
 			showMainPage(activeChar);
 		}
@@ -206,14 +198,7 @@ public class AdminMenu implements IAdminCommandHandler
 			if (st.countTokens() > 1)
 			{
 				final String subCommand = "admin_unban_char";
-				if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel()))
-				{
-					activeChar.sendMessage("You don't have the access right to use this command!");
-					LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!");
-					return false;
-				}
-				final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand);
-				ach.useAdminCommand(subCommand + command.substring(16), activeChar);
+				AdminCommandHandler.getInstance().useAdminCommand(activeChar, subCommand + command.substring(16), true);
 			}
 			showMainPage(activeChar);
 		}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java
index ea2ef9cd8a..fe083dbca6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java
@@ -16,9 +16,6 @@
  */
 package handlers.admincommandhandlers;
 
-import java.util.logging.Logger;
-
-import com.l2jmobius.gameserver.data.xml.impl.AdminData;
 import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -28,8 +25,6 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
  */
 public class AdminSummon implements IAdminCommandHandler
 {
-	private static final Logger LOGGER = Logger.getLogger(AdminSummon.class.getName());
-	
 	public static final String[] ADMIN_COMMANDS =
 	{
 		"admin_summon"
@@ -62,34 +57,24 @@ public class AdminSummon implements IAdminCommandHandler
 			return false;
 		}
 		
-		String subCommand;
+		final String subCommand;
 		if (id < 1000000)
 		{
 			subCommand = "admin_create_item";
-			if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel()))
-			{
-				activeChar.sendMessage("You don't have the access right to use this command!");
-				LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!");
-				return false;
-			}
-			final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand);
-			ach.useAdminCommand(subCommand + " " + id + " " + count, activeChar);
 		}
 		else
 		{
 			subCommand = "admin_spawn_once";
-			if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel()))
-			{
-				activeChar.sendMessage("You don't have the access right to use this command!");
-				LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!");
-				return false;
-			}
-			final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand);
 			
 			activeChar.sendMessage("This is only a temporary spawn.  The mob(s) will NOT respawn.");
 			id -= 1000000;
-			ach.useAdminCommand(subCommand + " " + id + " " + count, activeChar);
 		}
+		
+		if ((id > 0) && (count > 0))
+		{
+			AdminCommandHandler.getInstance().useAdminCommand(activeChar, subCommand + " " + id + " " + count, true);
+		}
+		
 		return true;
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSuperHaste.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSuperHaste.java
new file mode 100644
index 0000000000..4a3eb0c809
--- /dev/null
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSuperHaste.java
@@ -0,0 +1,92 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.admincommandhandlers;
+
+import java.util.StringTokenizer;
+
+import com.l2jmobius.gameserver.data.xml.impl.SkillData;
+import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.model.skills.Skill;
+
+/**
+ * The classical custom L2J implementation of the old //gmspeed GM command.
+ * @author lord_rex (No, it wasn't me at all. Eclipse added my name there.)
+ */
+public final class AdminSuperHaste implements IAdminCommandHandler
+{
+	public static final String[] ADMIN_COMMANDS =
+	{
+		"admin_superhaste",
+		"admin_superhaste_menu",
+		"admin_speed",
+		"admin_speed_menu",
+	};
+	
+	private static final int SUPER_HASTE_ID = 7029;
+	
+	@Override
+	public boolean useAdminCommand(String command, L2PcInstance player)
+	{
+		final StringTokenizer st = new StringTokenizer(command);
+		final String cmd = st.nextToken();
+		switch (cmd)
+		{
+			case "admin_superhaste":
+			case "admin_speed":
+			{
+				try
+				{
+					final int val = Integer.parseInt(st.nextToken());
+					final boolean sendMessage = player.isAffectedBySkill(SUPER_HASTE_ID);
+					player.stopSkillEffects((val == 0) && sendMessage, SUPER_HASTE_ID);
+					if ((val >= 1) && (val <= 4))
+					{
+						int time = 0;
+						if (st.hasMoreTokens())
+						{
+							time = Integer.parseInt(st.nextToken());
+						}
+						
+						final Skill superHasteSkill = SkillData.getInstance().getSkill(SUPER_HASTE_ID, val);
+						superHasteSkill.applyEffects(player, player, true, time);
+					}
+				}
+				catch (final Exception e)
+				{
+					player.sendMessage("Usage: //superhaste <Effect level (0-4)> <Time in seconds>");
+				}
+				
+				break;
+			}
+			case "admin_superhaste_menu":
+			case "admin_speed_menu":
+			{
+				AdminHtml.showAdminHtml(player, "gm_menu.htm");
+				break;
+			}
+		}
+		
+		return true;
+	}
+	
+	@Override
+	public String[] getAdminCommandList()
+	{
+		return ADMIN_COMMANDS;
+	}
+}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/Config.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/Config.java
index 1652418d10..e5e730bf1a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/Config.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/Config.java
@@ -461,6 +461,7 @@ public final class Config
 	public static boolean EVERYBODY_HAS_ADMIN_RIGHTS;
 	public static boolean SERVER_GMONLY;
 	public static boolean GM_HERO_AURA;
+	public static boolean GM_STARTUP_BUILDER_HIDE;
 	public static boolean GM_STARTUP_INVULNERABLE;
 	public static boolean GM_STARTUP_INVISIBLE;
 	public static boolean GM_STARTUP_SILENCE;
@@ -474,6 +475,7 @@ public final class Config
 	public static boolean GM_CRITANNOUNCER_NAME;
 	public static boolean GM_GIVE_SPECIAL_SKILLS;
 	public static boolean GM_GIVE_SPECIAL_AURA_SKILLS;
+	public static boolean USE_SUPER_HASTE_AS_GM_SPEED;
 	public static boolean GAMEGUARD_ENFORCE;
 	public static boolean GAMEGUARD_PROHIBITACTION;
 	public static boolean LOG_CHAT;
@@ -1969,6 +1971,7 @@ public final class Config
 			EVERYBODY_HAS_ADMIN_RIGHTS = General.getBoolean("EverybodyHasAdminRights", false);
 			SERVER_GMONLY = General.getBoolean("ServerGMOnly", false);
 			GM_HERO_AURA = General.getBoolean("GMHeroAura", false);
+			GM_STARTUP_BUILDER_HIDE = General.getBoolean("GMStartupBuilderHide", false);
 			GM_STARTUP_INVULNERABLE = General.getBoolean("GMStartupInvulnerable", false);
 			GM_STARTUP_INVISIBLE = General.getBoolean("GMStartupInvisible", false);
 			GM_STARTUP_SILENCE = General.getBoolean("GMStartupSilence", false);
@@ -1982,6 +1985,7 @@ public final class Config
 			GM_CRITANNOUNCER_NAME = General.getBoolean("GMShowCritAnnouncerName", false);
 			GM_GIVE_SPECIAL_SKILLS = General.getBoolean("GMGiveSpecialSkills", false);
 			GM_GIVE_SPECIAL_AURA_SKILLS = General.getBoolean("GMGiveSpecialAuraSkills", false);
+			USE_SUPER_HASTE_AS_GM_SPEED = General.getBoolean("UseSuperHasteAsGMSpeed", false);
 			GAMEGUARD_ENFORCE = General.getBoolean("GameGuardEnforce", false);
 			GAMEGUARD_PROHIBITACTION = General.getBoolean("GameGuardProhibitAction", false);
 			LOG_CHAT = General.getBoolean("LogChat", false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
index 7419fef961..c8553c5b4d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
@@ -18,12 +18,26 @@ package com.l2jmobius.gameserver.handler;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.logging.Logger;
+
+import com.l2jmobius.Config;
+import com.l2jmobius.commons.concurrent.ThreadPool;
+import com.l2jmobius.gameserver.data.xml.impl.AdminData;
+import com.l2jmobius.gameserver.enums.PlayerAction;
+import com.l2jmobius.gameserver.model.L2Object;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.SystemMessageId;
+import com.l2jmobius.gameserver.network.serverpackets.ConfirmDlg;
+import com.l2jmobius.gameserver.util.GMAudit;
+import com.l2jmobius.gameserver.util.TimeAmountInterpreter;
 
 /**
  * @author UnAfraid
  */
 public class AdminCommandHandler implements IHandler<IAdminCommandHandler, String>
 {
+	private static final Logger LOGGER = Logger.getLogger(AdminCommandHandler.class.getName());
+	
 	private final Map<String, IAdminCommandHandler> _datatable;
 	
 	protected AdminCommandHandler()
@@ -49,10 +63,85 @@ public class AdminCommandHandler implements IHandler<IAdminCommandHandler, Strin
 		}
 	}
 	
+	/**
+	 * WARNING: Please use {@link #useAdminCommand(L2PcInstance, String, boolean)} instead.
+	 */
 	@Override
 	public IAdminCommandHandler getHandler(String adminCommand)
 	{
-		return _datatable.get(adminCommand.contains(" ") ? adminCommand.substring(0, adminCommand.indexOf(" ")) : adminCommand);
+		String command = adminCommand;
+		if (adminCommand.contains(" "))
+		{
+			command = adminCommand.substring(0, adminCommand.indexOf(" "));
+		}
+		return _datatable.get(command);
+	}
+	
+	public void useAdminCommand(L2PcInstance player, String fullCommand, boolean useConfirm)
+	{
+		final String command = fullCommand.split(" ")[0];
+		final String commandNoPrefix = command.substring(6);
+		
+		final IAdminCommandHandler handler = getHandler(command);
+		if (handler == null)
+		{
+			if (player.isGM())
+			{
+				player.sendMessage("The command '" + commandNoPrefix + "' does not exist!");
+			}
+			LOGGER.warning("No handler registered for admin command '" + command + "'");
+			return;
+		}
+		
+		if (!AdminData.getInstance().hasAccess(command, player.getAccessLevel()))
+		{
+			player.sendMessage("You don't have the access rights to use this command!");
+			LOGGER.warning("Player " + player.getName() + " tried to use admin command '" + command + "', without proper access level!");
+			return;
+		}
+		
+		if (useConfirm && AdminData.getInstance().requireConfirm(command))
+		{
+			player.setAdminConfirmCmd(fullCommand);
+			final ConfirmDlg dlg = new ConfirmDlg(SystemMessageId.S1_3);
+			dlg.addString("Are you sure you want execute command '" + commandNoPrefix + "' ?");
+			player.addAction(PlayerAction.ADMIN_COMMAND);
+			player.sendPacket(dlg);
+		}
+		else
+		{
+			// Admin Commands must run through a long running task, otherwise a command that takes too much time will freeze the server, this way you'll feel only a minor spike.
+			ThreadPool.execute(() ->
+			{
+				final long begin = System.currentTimeMillis();
+				try
+				{
+					if (Config.GMAUDIT)
+					{
+						final L2Object target = player.getTarget();
+						GMAudit.auditGMAction(player.getName() + " [" + player.getObjectId() + "]", fullCommand, (target != null ? target.getName() : "no-target"));
+					}
+					
+					handler.useAdminCommand(fullCommand, player);
+				}
+				catch (RuntimeException e)
+				{
+					player.sendMessage("Exception during execution of  '" + fullCommand + "': " + e.toString());
+					LOGGER.warning("Exception during execution of " + fullCommand + " " + e);
+				}
+				finally
+				{
+					final long runtime = System.currentTimeMillis() - begin;
+					
+					if (runtime < 5000)
+					{
+						return;
+					}
+					
+					player.sendMessage("The execution of '" + fullCommand + "' took " + TimeAmountInterpreter.consolidateMillis(runtime) + ".");
+				}
+			});
+		}
 	}
 	
 	@Override
@@ -63,11 +152,11 @@ public class AdminCommandHandler implements IHandler<IAdminCommandHandler, Strin
 	
 	public static AdminCommandHandler getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final AdminCommandHandler _instance = new AdminCommandHandler();
+		protected static final AdminCommandHandler INSTANCE = new AdminCommandHandler();
 	}
 }
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
index 831d988bf3..1a31c14d8c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
@@ -10518,8 +10518,9 @@ public final class L2PcInstance extends L2Playable
 			}
 		}
 		
-		if (isGM())
+		if (isGM() && !Config.GM_STARTUP_BUILDER_HIDE)
 		{
+			// Bleah, see L2J custom below.
 			if (isInvul())
 			{
 				sendMessage("Entering world in Invulnerable mode.");
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/stat/CharStat.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/stat/CharStat.java
index 0cc91d1a51..fd7a72f10e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/stat/CharStat.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/stat/CharStat.java
@@ -46,6 +46,8 @@ public class CharStat
 	private final int[] _traitsInvul = new int[TraitType.values().length];
 	/** Creature's maximum buff count. */
 	private int _maxBuffCount = Config.BUFFS_MAX_AMOUNT;
+	/** Speed multiplier set by admin gmspeed command */
+	private double _gmSpeedMultiplier = 1;
 	
 	public CharStat(L2Character activeChar)
 	{
@@ -411,6 +413,11 @@ public class CharStat
 		return getMoveSpeed() * (1. / baseSpeed);
 	}
 	
+	public void setGmSpeedMultiplier(double multipier)
+	{
+		_gmSpeedMultiplier = multipier;
+	}
+	
 	/**
 	 * @return the RunSpeed (base+modifier) of the L2Character in function of the Armour Expertise Penalty.
 	 */
@@ -422,7 +429,7 @@ public class CharStat
 			return 0;
 		}
 		
-		return calcStat(Stats.MOVE_SPEED, baseRunSpd, null, null);
+		return calcStat(Stats.MOVE_SPEED, baseRunSpd * _gmSpeedMultiplier, null, null);
 	}
 	
 	/**
@@ -436,7 +443,7 @@ public class CharStat
 			return 0;
 		}
 		
-		return calcStat(Stats.MOVE_SPEED, baseWalkSpd);
+		return calcStat(Stats.MOVE_SPEED, baseWalkSpd * _gmSpeedMultiplier);
 	}
 	
 	/**
@@ -450,7 +457,7 @@ public class CharStat
 			return 0;
 		}
 		
-		return calcStat(Stats.MOVE_SPEED, baseRunSpd, null, null);
+		return calcStat(Stats.MOVE_SPEED, baseRunSpd * _gmSpeedMultiplier, null, null);
 	}
 	
 	/**
@@ -464,7 +471,7 @@ public class CharStat
 			return 0;
 		}
 		
-		return calcStat(Stats.MOVE_SPEED, baseWalkSpd);
+		return calcStat(Stats.MOVE_SPEED, baseWalkSpd * _gmSpeedMultiplier);
 	}
 	
 	/**
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java
index b1bbcf0b10..8cea99989e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java
@@ -18,10 +18,8 @@ package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketReader;
-import com.l2jmobius.gameserver.data.xml.impl.AdminData;
 import com.l2jmobius.gameserver.enums.PlayerAction;
 import com.l2jmobius.gameserver.handler.AdminCommandHandler;
-import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.events.EventDispatcher;
 import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerDlgAnswer;
@@ -30,7 +28,6 @@ import com.l2jmobius.gameserver.model.holders.DoorRequestHolder;
 import com.l2jmobius.gameserver.model.holders.SummonRequestHolder;
 import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.util.GMAudit;
 
 /**
  * @author Dezmond_snz
@@ -82,16 +79,9 @@ public final class DlgAnswer implements IClientIncomingPacket
 				{
 					return;
 				}
-				final String command = cmd.split(" ")[0];
-				final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(command);
-				if (AdminData.getInstance().hasAccess(command, activeChar.getAccessLevel()))
-				{
-					if (Config.GMAUDIT)
-					{
-						GMAudit.auditGMAction(activeChar.getName() + " [" + activeChar.getObjectId() + "]", cmd, (activeChar.getTarget() != null ? activeChar.getTarget().getName() : "no-target"));
-					}
-					ach.useAdminCommand(cmd, activeChar);
-				}
+				
+				// The 'useConfirm' must be disabled here, as we don't want to repeat that process.
+				AdminCommandHandler.getInstance().useAdminCommand(activeChar, cmd, false);
 			}
 		}
 		else if ((_messageId == SystemMessageId.C1_IS_MAKING_AN_ATTEMPT_TO_RESURRECT_YOU_IF_YOU_CHOOSE_THIS_PATH_S2_EXPERIENCE_POINTS_WILL_BE_RETURNED_TO_YOU_DO_YOU_WANT_TO_BE_RESURRECTED.getId()) || (_messageId == SystemMessageId.YOUR_CHARM_OF_COURAGE_IS_TRYING_TO_RESURRECT_YOU_WOULD_YOU_LIKE_TO_RESURRECT_NOW.getId()))
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 93a790a782..cd1f6771a8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -89,6 +89,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ShortCutInit;
 import com.l2jmobius.gameserver.network.serverpackets.SkillCoolTime;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import com.l2jmobius.gameserver.network.serverpackets.ValidateLocation;
+import com.l2jmobius.gameserver.util.BuilderUtil;
 
 /**
  * Enter World Packet Handler
@@ -197,34 +198,49 @@ public class EnterWorld implements IClientIncomingPacket
 		// Apply special GM properties to the GM when entering
 		if (activeChar.isGM())
 		{
-			if (Config.GM_STARTUP_INVULNERABLE && AdminData.getInstance().hasAccess("admin_invul", activeChar.getAccessLevel()))
+			gmStartupProcess:
 			{
-				activeChar.setIsInvul(true);
-			}
-			
-			if (Config.GM_STARTUP_INVISIBLE && AdminData.getInstance().hasAccess("admin_invisible", activeChar.getAccessLevel()))
-			{
-				activeChar.setInvisible(true);
-			}
-			
-			if (Config.GM_STARTUP_SILENCE && AdminData.getInstance().hasAccess("admin_silence", activeChar.getAccessLevel()))
-			{
-				activeChar.setSilenceMode(true);
-			}
-			
-			if (Config.GM_STARTUP_DIET_MODE && AdminData.getInstance().hasAccess("admin_diet", activeChar.getAccessLevel()))
-			{
-				activeChar.setDietMode(true);
-				activeChar.refreshOverloaded();
-			}
-			
-			if (Config.GM_STARTUP_AUTO_LIST && AdminData.getInstance().hasAccess("admin_gmliston", activeChar.getAccessLevel()))
-			{
-				AdminData.getInstance().addGm(activeChar, false);
-			}
-			else
-			{
-				AdminData.getInstance().addGm(activeChar, true);
+				if (Config.GM_STARTUP_BUILDER_HIDE && AdminData.getInstance().hasAccess("admin_hide", activeChar.getAccessLevel()))
+				{
+					BuilderUtil.setHiding(activeChar, true);
+					
+					BuilderUtil.sendSysMessage(activeChar, "hide is default for builder.");
+					BuilderUtil.sendSysMessage(activeChar, "FriendAddOff is default for builder.");
+					BuilderUtil.sendSysMessage(activeChar, "whisperoff is default for builder.");
+					
+					// It isn't recommend to use the below custom L2J GMStartup functions together with retail-like GMStartupBuilderHide, so breaking the process at that stage.
+					break gmStartupProcess;
+				}
+				
+				if (Config.GM_STARTUP_INVULNERABLE && AdminData.getInstance().hasAccess("admin_invul", activeChar.getAccessLevel()))
+				{
+					activeChar.setIsInvul(true);
+				}
+				
+				if (Config.GM_STARTUP_INVISIBLE && AdminData.getInstance().hasAccess("admin_invisible", activeChar.getAccessLevel()))
+				{
+					activeChar.setInvisible(true);
+				}
+				
+				if (Config.GM_STARTUP_SILENCE && AdminData.getInstance().hasAccess("admin_silence", activeChar.getAccessLevel()))
+				{
+					activeChar.setSilenceMode(true);
+				}
+				
+				if (Config.GM_STARTUP_DIET_MODE && AdminData.getInstance().hasAccess("admin_diet", activeChar.getAccessLevel()))
+				{
+					activeChar.setDietMode(true);
+					activeChar.refreshOverloaded();
+				}
+				
+				if (Config.GM_STARTUP_AUTO_LIST && AdminData.getInstance().hasAccess("admin_gmliston", activeChar.getAccessLevel()))
+				{
+					AdminData.getInstance().addGm(activeChar, false);
+				}
+				else
+				{
+					AdminData.getInstance().addGm(activeChar, true);
+				}
 			}
 			
 			if (Config.GM_GIVE_SPECIAL_SKILLS)
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java
index d5be9c11f7..31f537ee75 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java
@@ -22,12 +22,9 @@ import java.util.logging.Level;
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
-import com.l2jmobius.gameserver.data.xml.impl.AdminData;
-import com.l2jmobius.gameserver.enums.PlayerAction;
 import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.BypassHandler;
 import com.l2jmobius.gameserver.handler.CommunityBoardHandler;
-import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.handler.IBypassHandler;
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.L2World;
@@ -41,11 +38,8 @@ import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerBypas
 import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jmobius.gameserver.network.Disconnection;
 import com.l2jmobius.gameserver.network.L2GameClient;
-import com.l2jmobius.gameserver.network.SystemMessageId;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
-import com.l2jmobius.gameserver.network.serverpackets.ConfirmDlg;
 import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
-import com.l2jmobius.gameserver.util.GMAudit;
 import com.l2jmobius.gameserver.util.Util;
 
 /**
@@ -129,44 +123,7 @@ public final class RequestBypassToServer implements IClientIncomingPacket
 		{
 			if (_command.startsWith("admin_"))
 			{
-				final String command = _command.split(" ")[0];
-				
-				final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(command);
-				
-				if (ach == null)
-				{
-					if (activeChar.isGM())
-					{
-						activeChar.sendMessage("The command " + command.substring(6) + " does not exist!");
-					}
-					LOGGER.warning(activeChar + " requested not registered admin command '" + command + "'");
-					return;
-				}
-				
-				if (!AdminData.getInstance().hasAccess(command, activeChar.getAccessLevel()))
-				{
-					activeChar.sendMessage("You don't have the access rights to use this command!");
-					LOGGER.warning("Character " + activeChar.getName() + " tried to use admin command " + command + ", without proper access level!");
-					return;
-				}
-				
-				if (AdminData.getInstance().requireConfirm(command))
-				{
-					activeChar.setAdminConfirmCmd(_command);
-					final ConfirmDlg dlg = new ConfirmDlg(SystemMessageId.S1);
-					dlg.addString("Are you sure you want execute command " + _command.substring(6) + " ?");
-					activeChar.addAction(PlayerAction.ADMIN_COMMAND);
-					activeChar.sendPacket(dlg);
-				}
-				else
-				{
-					if (Config.GMAUDIT)
-					{
-						GMAudit.auditGMAction(activeChar.getName() + " [" + activeChar.getObjectId() + "]", _command, (activeChar.getTarget() != null ? activeChar.getTarget().getName() : "no-target"));
-					}
-					
-					ach.useAdminCommand(_command, activeChar);
-				}
+				AdminCommandHandler.getInstance().useAdminCommand(activeChar, _command, true);
 			}
 			else if (CommunityBoardHandler.getInstance().isCommunityBoardCommand(_command))
 			{
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java
index 716424b435..e7aaba873e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java
@@ -16,14 +16,10 @@
  */
 package com.l2jmobius.gameserver.network.clientpackets;
 
-import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketReader;
-import com.l2jmobius.gameserver.data.xml.impl.AdminData;
 import com.l2jmobius.gameserver.handler.AdminCommandHandler;
-import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.network.L2GameClient;
-import com.l2jmobius.gameserver.util.GMAudit;
 
 /**
  * This class handles all GM commands triggered by //command
@@ -56,33 +52,6 @@ public final class SendBypassBuildCmd implements IClientIncomingPacket
 			return;
 		}
 		
-		final String command = "admin_" + _command.split(" ")[0];
-		
-		final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(command);
-		
-		if (ach == null)
-		{
-			if (activeChar.isGM())
-			{
-				activeChar.sendMessage("The command " + command.substring(6) + " does not exists!");
-			}
-			
-			LOGGER.warning("No handler registered for admin command '" + command + "'");
-			return;
-		}
-		
-		if (!AdminData.getInstance().hasAccess(command, activeChar.getAccessLevel()))
-		{
-			activeChar.sendMessage("You don't have the access right to use this command!");
-			LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + command + ", but have no access to it!");
-			return;
-		}
-		
-		if (Config.GMAUDIT)
-		{
-			GMAudit.auditGMAction(activeChar.getName() + " [" + activeChar.getObjectId() + "]", _command, (activeChar.getTarget() != null ? activeChar.getTarget().getName() : "no-target"));
-		}
-		
-		ach.useAdminCommand("admin_" + _command, activeChar);
+		AdminCommandHandler.getInstance().useAdminCommand(activeChar, "admin_" + _command, true);
 	}
 }
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/BuilderUtil.java
new file mode 100644
index 0000000000..38ea391b71
--- /dev/null
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/BuilderUtil.java
@@ -0,0 +1,70 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jmobius.gameserver.util;
+
+import com.l2jmobius.gameserver.enums.ChatType;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.serverpackets.CreatureSay;
+
+/**
+ * @author lord_rex
+ */
+public final class BuilderUtil
+{
+	private BuilderUtil()
+	{
+		// utility class
+	}
+	
+	/**
+	 * Sends builder system message to the player.
+	 * @param player
+	 * @param message
+	 */
+	public static void sendSysMessage(L2PcInstance player, String message)
+	{
+		player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "SYS", message));
+	}
+	
+	/**
+	 * Changes player's hiding state.
+	 * @param player
+	 * @param hide
+	 * @return {@code true} if hide state was changed, otherwise {@code false}
+	 */
+	public static boolean setHiding(L2PcInstance player, boolean hide)
+	{
+		if (player.isInvisible() && hide)
+		{
+			// already hiding
+			return false;
+		}
+		
+		if (!player.isInvisible() && !hide)
+		{
+			// already visible
+			return false;
+		}
+		
+		player.setSilenceMode(hide);
+		player.setIsInvul(hide);
+		player.setInvisible(hide);
+		
+		player.broadcastUserInfo();
+		return true;
+	}
+}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/TimeAmountInterpreter.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/TimeAmountInterpreter.java
new file mode 100644
index 0000000000..a9f8029b98
--- /dev/null
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/TimeAmountInterpreter.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 1999 CERN - European Organization for Nuclear Research.
+ * 
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear in
+ * supporting documentation. CERN makes no representations about the
+ * suitability of this software for any purpose. It is provided "as is"
+ * without expressed or implied warranty.
+ */
+package com.l2jmobius.gameserver.util;
+
+import static java.util.concurrent.TimeUnit.DAYS;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
+
+import java.io.IOException;
+import java.util.Locale;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Allows to present time intervals in a standardized, user friendly manner.
+ * @author _dev_
+ */
+public class TimeAmountInterpreter
+{
+	private static final TimeUnit[] UNIT_CACHE = TimeUnit.values();
+	
+	private TimeAmountInterpreter()
+	{
+		// utility class
+	}
+	
+	/**
+	 * Calls {@link #consolidate(long, TimeUnit)} with {@link TimeUnit#NANOSECONDS}.
+	 * @param timeAmountInNanos amount of time in nanoseconds
+	 * @return an user-friendly description of the given time amount
+	 */
+	public static String consolidateNanos(long timeAmountInNanos)
+	{
+		return consolidate(timeAmountInNanos, NANOSECONDS);
+	}
+	
+	/**
+	 * Calls {@link #consolidate(long, TimeUnit)} with {@link TimeUnit#MILLISECONDS}.
+	 * @param timeAmountInMillis amount of time in milliseconds
+	 * @return an user-friendly description of the given time amount
+	 */
+	public static String consolidateMillis(long timeAmountInMillis)
+	{
+		return consolidate(timeAmountInMillis, MILLISECONDS);
+	}
+	
+	/**
+	 * Constructs an user-friendly description of the given amount of time, specifying the number of days (if any), hours (if any), minutes (if any), seconds (if any) and milliseconds (if any). Otherwise, returns the string value {@code 0}.
+	 * @param timeAmount amount of time to be written
+	 * @param timeUnit unit of the given amount
+	 * @return an user-friendly description of the given time amount
+	 */
+	public static String consolidate(long timeAmount, TimeUnit timeUnit)
+	{
+		return consolidate(timeAmount, timeUnit, timeUnit, DAYS, "0 " + timeUnit.name().toLowerCase(Locale.ENGLISH));
+	}
+	
+	/**
+	 * Constructs an user-friendly description of the given amount of time.
+	 * @param timeAmount amount of time to be written
+	 * @param timeUnit unit of the given amount
+	 * @param minConsolidationUnit smallest unit to be included within the description
+	 * @param maxConsolidationUnit largest unit to be included within the description
+	 * @param noTimeUsedIndicator text to be written if the amount is not positive
+	 * @return an user-friendly description of the given time amount
+	 */
+	public static String consolidate(long timeAmount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator)
+	{
+		return appendConsolidated(new StringBuilder(), timeAmount, timeUnit, minConsolidationUnit, maxConsolidationUnit, noTimeUsedIndicator).toString();
+	}
+	
+	/**
+	 * Appends an user-friendly description of the given amount of time to the specified text builder.<BR>
+	 * <BR>
+	 * Please keep in mind, that this method is primarily designed to be used with heap text builders. Therefore, if the given text builder throws an {@link IOException}, this exception will be wrapped in a {@link RuntimeException} and returned to the caller as an unchecked exception.
+	 * @param <T>
+	 * @param textBuilder a character sequence builder
+	 * @param timeAmount amount of time to be written
+	 * @param timeUnit unit of the given amount
+	 * @param minConsolidationUnit smallest unit to be included within the description
+	 * @param maxConsolidationUnit largest unit to be included within the description
+	 * @param noTimeUsedIndicator text to be written if the amount is not positive
+	 * @return {@code textBuilder}
+	 * @throws RuntimeException if {@code textBuilder} throws an {@link IOException}
+	 */
+	@SuppressWarnings("unchecked")
+	public static <T extends Appendable & CharSequence> T appendConsolidated(T textBuilder, long timeAmount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator) throws RuntimeException
+	{
+		try
+		{
+			if (timeAmount < 1)
+			{
+				return (T) textBuilder.append(noTimeUsedIndicator);
+			}
+			
+			final int len = textBuilder.length();
+			for (int i = maxConsolidationUnit.ordinal(); i >= minConsolidationUnit.ordinal(); --i)
+			{
+				final TimeUnit activeUnit = UNIT_CACHE[i];
+				final long num = activeUnit.convert(timeAmount, timeUnit);
+				if (num == 0)
+				{
+					continue;
+				}
+				
+				if (textBuilder.length() > len)
+				{
+					textBuilder.append(", ");
+				}
+				textBuilder.append(String.valueOf(num)).append(' ');
+				final String unit = activeUnit.name().toLowerCase(Locale.ENGLISH);
+				textBuilder.append(unit, 0, num == 1 ? unit.length() - 1 : unit.length());
+				
+				timeAmount -= timeUnit.convert(num, activeUnit);
+			}
+			
+			if (textBuilder.length() == len)
+			{
+				return (T) textBuilder.append(noTimeUsedIndicator).append(' ').append(minConsolidationUnit.name().toLowerCase(Locale.ENGLISH));
+			}
+		}
+		catch (IOException e)
+		{
+			throw new RuntimeException(e);
+		}
+		return textBuilder;
+	}
+}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/AdminCommands.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/AdminCommands.xml
index cda7d5cced..f69ad984ba 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/AdminCommands.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/AdminCommands.xml
@@ -158,8 +158,6 @@
 	<admin command="admin_earthquake_menu" accessLevel="100" />
 	<admin command="admin_bighead" accessLevel="100" />
 	<admin command="admin_shrinkhead" accessLevel="100" />
-	<admin command="admin_gmspeed" accessLevel="100" />
-	<admin command="admin_gmspeed_menu" accessLevel="100" />
 	<admin command="admin_unpara_all" accessLevel="100" />
 	<admin command="admin_para_all" accessLevel="100" />
 	<admin command="admin_unpara" accessLevel="100" />
@@ -189,6 +187,13 @@
 	<admin command="admin_set_displayeffect_menu" accessLevel="100" />
 	<admin command="admin_playmovie" accessLevel="100" />
 
+	<!-- ADMIN SPEED -->
+	<admin command="admin_gmspeed" accessLevel="100" />
+	<admin command="admin_superhaste" accessLevel="100" />
+	<admin command="admin_superhaste_menu" accessLevel="100" />
+	<admin command="admin_speed" accessLevel="100" />
+	<admin command="admin_speed_menu" accessLevel="100" />
+	
 	<!-- ADMIN ELEMENT -->
 	<admin command="admin_setlh" accessLevel="100" />
 	<admin command="admin_setlc" accessLevel="100" />
@@ -612,4 +617,7 @@
 	<admin command="banchat" accessLevel="100" />
 	<admin command="debug" accessLevel="100" />
 	<admin command="unbanchat" accessLevel="100" />
+
+	<!-- HIDE -->
+	<admin command="admin_hide" accessLevel="100" />
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/General.ini b/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/General.ini
index 80d6358861..bc80390cd6 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/General.ini
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/config/General.ini
@@ -25,6 +25,10 @@ ServerGMOnly = False
 # Default: False
 GMHeroAura = False
 
+# Whether GM logins in builder hide mode by default.
+# Default: True
+GMStartupBuilderHide = True
+
 # Auto set invulnerable status to a GM on login.
 # Default: False
 GMStartupInvulnerable = True
@@ -79,6 +83,11 @@ GMGiveSpecialSkills = False
 # Default: False
 GMGiveSpecialAuraSkills = False
 
+# In case you are not satisfied with the retail-like implementation of //gmspeed",
+# with this config you can rollback it to the old custom L2J version of the GM Speed.
+# Default: False
+UseSuperHasteAsGMSpeed = False
+
 
 # ---------------------------------------------------------------------------
 # Server Security
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/gm_menu.htm b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/gm_menu.htm
index ba19fe1d81..51e6be4257 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/gm_menu.htm
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/gm_menu.htm
@@ -38,11 +38,11 @@
 </table><br1>
 <table width=270><tr>
 <td><font color="LEVEL">Super Haste:</font></td>
-<td><button value="1" action="bypass -h admin_gmspeed_menu 1" width=35 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="2" action="bypass -h admin_gmspeed_menu 2" width=35 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="3" action="bypass -h admin_gmspeed_menu 3" width=35 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="4" action="bypass -h admin_gmspeed_menu 4" width=35 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="Off" action="bypass -h admin_gmspeed_menu 0" width=35 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="1" action="bypass -h admin_superhaste 1" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="2" action="bypass -h admin_superhaste 2" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="3" action="bypass -h admin_superhaste 3" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="4" action="bypass -h admin_superhaste 4" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="Off" action="bypass -h admin_superhaste 0" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr></table><br>
 <center><multiedit var="new_announcement" width=250 height=80></center>
 <table width="160"><tr>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/MasterHandler.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/MasterHandler.java
index 0e053d06ac..0244d1f75d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/MasterHandler.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/MasterHandler.java
@@ -84,9 +84,11 @@ import handlers.admincommandhandlers.AdminFortSiege;
 import handlers.admincommandhandlers.AdminGeodata;
 import handlers.admincommandhandlers.AdminGm;
 import handlers.admincommandhandlers.AdminGmChat;
+import handlers.admincommandhandlers.AdminGmSpeed;
 import handlers.admincommandhandlers.AdminGraciaSeeds;
 import handlers.admincommandhandlers.AdminGrandBoss;
 import handlers.admincommandhandlers.AdminHeal;
+import handlers.admincommandhandlers.AdminHide;
 import handlers.admincommandhandlers.AdminHtml;
 import handlers.admincommandhandlers.AdminHwid;
 import handlers.admincommandhandlers.AdminInstance;
@@ -125,6 +127,7 @@ import handlers.admincommandhandlers.AdminShutdown;
 import handlers.admincommandhandlers.AdminSkill;
 import handlers.admincommandhandlers.AdminSpawn;
 import handlers.admincommandhandlers.AdminSummon;
+import handlers.admincommandhandlers.AdminSuperHaste;
 import handlers.admincommandhandlers.AdminTarget;
 import handlers.admincommandhandlers.AdminTargetSay;
 import handlers.admincommandhandlers.AdminTeleport;
@@ -415,9 +418,11 @@ public class MasterHandler
 			AdminGeodata.class,
 			AdminGm.class,
 			AdminGmChat.class,
+			AdminGmSpeed.class,
 			AdminGraciaSeeds.class,
 			AdminGrandBoss.class,
 			AdminHeal.class,
+			AdminHide.class,
 			AdminHtml.class,
 			AdminHwid.class,
 			AdminInstance.class,
@@ -456,6 +461,7 @@ public class MasterHandler
 			AdminSkill.class,
 			AdminSpawn.class,
 			AdminSummon.class,
+			AdminSuperHaste.class,
 			AdminTarget.class,
 			AdminTargetSay.class,
 			AdminTeleport.class,
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/actionshifthandlers/L2PcInstanceActionShift.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/actionshifthandlers/L2PcInstanceActionShift.java
index 6b1bb7ac43..72c01c3cf8 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/actionshifthandlers/L2PcInstanceActionShift.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/actionshifthandlers/L2PcInstanceActionShift.java
@@ -19,7 +19,6 @@ package handlers.actionshifthandlers;
 import com.l2jmobius.gameserver.enums.InstanceType;
 import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.IActionShiftHandler;
-import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 
@@ -37,11 +36,7 @@ public class L2PcInstanceActionShift implements IActionShiftHandler
 				activeChar.setTarget(target);
 			}
 			
-			final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler("admin_character_info");
-			if (ach != null)
-			{
-				ach.useAdminCommand("admin_character_info " + target.getName(), activeChar);
-			}
+			AdminCommandHandler.getInstance().useAdminCommand(activeChar, "admin_character_info " + target.getName(), true);
 		}
 		return true;
 	}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/actionshifthandlers/L2SummonActionShift.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/actionshifthandlers/L2SummonActionShift.java
index 67d403c9b3..6ee8a1173e 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/actionshifthandlers/L2SummonActionShift.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/actionshifthandlers/L2SummonActionShift.java
@@ -19,7 +19,6 @@ package handlers.actionshifthandlers;
 import com.l2jmobius.gameserver.enums.InstanceType;
 import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.IActionShiftHandler;
-import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 
@@ -36,11 +35,7 @@ public class L2SummonActionShift implements IActionShiftHandler
 				activeChar.setTarget(target);
 			}
 			
-			final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler("admin_summon_info");
-			if (ach != null)
-			{
-				ach.useAdminCommand("admin_summon_info", activeChar);
-			}
+			AdminCommandHandler.getInstance().useAdminCommand(activeChar, "admin_summon_info", true);
 		}
 		return true;
 	}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
index 6c2b00db74..467875568d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
@@ -19,7 +19,6 @@ package handlers.admincommandhandlers;
 import java.util.Arrays;
 import java.util.StringTokenizer;
 
-import com.l2jmobius.gameserver.data.xml.impl.SkillData;
 import com.l2jmobius.gameserver.enums.Movie;
 import com.l2jmobius.gameserver.enums.Team;
 import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
@@ -34,7 +33,6 @@ import com.l2jmobius.gameserver.model.html.PageBuilder;
 import com.l2jmobius.gameserver.model.html.PageResult;
 import com.l2jmobius.gameserver.model.html.styles.ButtonsStyle;
 import com.l2jmobius.gameserver.model.skills.AbnormalVisualEffect;
-import com.l2jmobius.gameserver.model.skills.Skill;
 import com.l2jmobius.gameserver.network.SystemMessageId;
 import com.l2jmobius.gameserver.network.serverpackets.Earthquake;
 import com.l2jmobius.gameserver.network.serverpackets.ExRedSky;
@@ -81,8 +79,6 @@ public class AdminEffects implements IAdminCommandHandler
 		"admin_earthquake_menu",
 		"admin_bighead",
 		"admin_shrinkhead",
-		"admin_gmspeed",
-		"admin_gmspeed_menu",
 		"admin_unpara_all",
 		"admin_para_all",
 		"admin_unpara",
@@ -351,35 +347,6 @@ public class AdminEffects implements IAdminCommandHandler
 			{
 			}
 		}
-		else if (command.startsWith("admin_gmspeed"))
-		{
-			try
-			{
-				final int val = Integer.parseInt(st.nextToken());
-				final boolean sendMessage = activeChar.isAffectedBySkill(7029);
-				activeChar.stopSkillEffects((val == 0) && sendMessage, 7029);
-				if ((val >= 1) && (val <= 4))
-				{
-					int time = 0;
-					if (st.hasMoreTokens())
-					{
-						time = Integer.parseInt(st.nextToken());
-					}
-					
-					final Skill gmSpeedSkill = SkillData.getInstance().getSkill(7029, val);
-					gmSpeedSkill.applyEffects(activeChar, activeChar, true, time);
-				}
-			}
-			catch (Exception e)
-			{
-				activeChar.sendMessage("Usage: //gmspeed <Effect level (0-4)> <Time in seconds>");
-			}
-			if (command.contains("_menu"))
-			{
-				command = "";
-				AdminHtml.showAdminHtml(activeChar, "gm_menu.htm");
-			}
-		}
 		else if (command.startsWith("admin_polyself"))
 		{
 			try
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmSpeed.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmSpeed.java
new file mode 100644
index 0000000000..5ab5f39a9b
--- /dev/null
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmSpeed.java
@@ -0,0 +1,119 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.admincommandhandlers;
+
+import java.util.EnumSet;
+import java.util.Set;
+import java.util.StringTokenizer;
+
+import com.l2jmobius.Config;
+import com.l2jmobius.gameserver.handler.AdminCommandHandler;
+import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
+import com.l2jmobius.gameserver.model.L2Object;
+import com.l2jmobius.gameserver.model.actor.L2Character;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.model.stats.Stats;
+import com.l2jmobius.gameserver.util.BuilderUtil;
+import com.l2jmobius.gameserver.util.Util;
+
+/**
+ * A retail-like implementation of //gmspeed builder command.
+ * @author lord_rex
+ */
+public final class AdminGmSpeed implements IAdminCommandHandler
+{
+	private static final String[] ADMIN_COMMANDS =
+	{
+		"admin_gmspeed",
+	};
+	
+	private static final Set<Stats> SPEED_STATS = EnumSet.of(Stats.RUN_SPEED, Stats.WALK_SPEED, Stats.SWIM_RUN_SPEED, Stats.SWIM_WALK_SPEED, Stats.FLY_RUN_SPEED, Stats.FLY_WALK_SPEED);
+	
+	@Override
+	public boolean useAdminCommand(String command, L2PcInstance player)
+	{
+		final StringTokenizer st = new StringTokenizer(command);
+		final String cmd = st.nextToken();
+		
+		if (cmd.equals("admin_gmspeed"))
+		{
+			if (!st.hasMoreTokens())
+			{
+				BuilderUtil.sendSysMessage(player, "//gmspeed [0...10]");
+				return false;
+			}
+			final String token = st.nextToken();
+			
+			// Rollback feature for old custom way, in order to make everyone happy.
+			if (Config.USE_SUPER_HASTE_AS_GM_SPEED)
+			{
+				AdminCommandHandler.getInstance().useAdminCommand(player, AdminSuperHaste.ADMIN_COMMANDS[0] + " " + token, false);
+				return true;
+			}
+			
+			if (!Util.isDouble(token))
+			{
+				BuilderUtil.sendSysMessage(player, "//gmspeed [0...10]");
+				return false;
+			}
+			final double runSpeedBoost = Double.parseDouble(token);
+			if ((runSpeedBoost < 0) || (runSpeedBoost > 10))
+			{
+				// Custom limit according to SDW's request - real retail limit is unknown.
+				BuilderUtil.sendSysMessage(player, "//gmspeed [0...10]");
+				return false;
+			}
+			
+			final L2Character targetCharacter;
+			final L2Object target = player.getTarget();
+			if ((target != null) && target.isCharacter())
+			{
+				targetCharacter = (L2Character) target;
+			}
+			else
+			{
+				// If there is no target, let's use the command executer.
+				targetCharacter = player;
+			}
+			
+			SPEED_STATS.forEach(speedStat -> targetCharacter.getStat().removeFixedValue(speedStat));
+			if (runSpeedBoost > 0)
+			{
+				SPEED_STATS.forEach(speedStat -> targetCharacter.getStat().addFixedValue(speedStat, targetCharacter.getTemplate().getBaseValue(speedStat, 120) * runSpeedBoost));
+			}
+			
+			targetCharacter.getStat().recalculateStats(false);
+			if (targetCharacter.isPlayer())
+			{
+				((L2PcInstance) targetCharacter).broadcastUserInfo();
+			}
+			else
+			{
+				targetCharacter.broadcastInfo();
+			}
+			
+			BuilderUtil.sendSysMessage(player, "[" + targetCharacter.getName() + "] speed is [" + (runSpeedBoost * 100) + "0]% fast.");
+		}
+		return true;
+	}
+	
+	@Override
+	public String[] getAdminCommandList()
+	{
+		return ADMIN_COMMANDS;
+	}
+}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminHide.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminHide.java
new file mode 100644
index 0000000000..600cbe1639
--- /dev/null
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminHide.java
@@ -0,0 +1,87 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.admincommandhandlers;
+
+import java.util.StringTokenizer;
+
+import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.util.BuilderUtil;
+
+/**
+ * @author lord_rex
+ */
+public final class AdminHide implements IAdminCommandHandler
+{
+	private static final String[] ADMIN_COMMANDS =
+	{
+		"admin_hide"
+	};
+	
+	@Override
+	public boolean useAdminCommand(String command, L2PcInstance player)
+	{
+		final StringTokenizer st = new StringTokenizer(command);
+		st.nextToken();
+		
+		try
+		{
+			final String param = st.nextToken();
+			switch (param)
+			{
+				case "on":
+				{
+					if (!BuilderUtil.setHiding(player, true))
+					{
+						BuilderUtil.sendSysMessage(player, "Currently, you cannot be seen.");
+						return true;
+					}
+					
+					BuilderUtil.sendSysMessage(player, "Now, you cannot be seen.");
+					return true;
+				}
+				case "off":
+				{
+					if (!BuilderUtil.setHiding(player, false))
+					{
+						BuilderUtil.sendSysMessage(player, "Currently, you can be seen.");
+						return true;
+					}
+					
+					BuilderUtil.sendSysMessage(player, "Now, you can be seen.");
+					return true;
+				}
+				default:
+				{
+					BuilderUtil.sendSysMessage(player, "//hide [on|off]");
+					return true;
+				}
+			}
+		}
+		catch (final Exception e)
+		{
+			BuilderUtil.sendSysMessage(player, "//hide [on|off]");
+			return true;
+		}
+	}
+	
+	@Override
+	public String[] getAdminCommandList()
+	{
+		return ADMIN_COMMANDS;
+	}
+}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java
index 5ab19d4b39..8c735f4265 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java
@@ -21,7 +21,6 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.gameserver.data.xml.impl.AdminData;
 import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.model.L2Clan;
@@ -187,14 +186,7 @@ public class AdminMenu implements IAdminCommandHandler
 			if (st.countTokens() > 1)
 			{
 				final String subCommand = "admin_ban_char";
-				if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel()))
-				{
-					activeChar.sendMessage("You don't have the access right to use this command!");
-					LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!");
-					return false;
-				}
-				final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand);
-				ach.useAdminCommand(subCommand + command.substring(14), activeChar);
+				AdminCommandHandler.getInstance().useAdminCommand(activeChar, subCommand + command.substring(14), true);
 			}
 			showMainPage(activeChar);
 		}
@@ -204,14 +196,7 @@ public class AdminMenu implements IAdminCommandHandler
 			if (st.countTokens() > 1)
 			{
 				final String subCommand = "admin_unban_char";
-				if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel()))
-				{
-					activeChar.sendMessage("You don't have the access right to use this command!");
-					LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!");
-					return false;
-				}
-				final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand);
-				ach.useAdminCommand(subCommand + command.substring(16), activeChar);
+				AdminCommandHandler.getInstance().useAdminCommand(activeChar, subCommand + command.substring(16), true);
 			}
 			showMainPage(activeChar);
 		}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java
index a818e7f3d3..f27d63e949 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java
@@ -16,9 +16,6 @@
  */
 package handlers.admincommandhandlers;
 
-import java.util.logging.Logger;
-
-import com.l2jmobius.gameserver.data.xml.impl.AdminData;
 import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -28,8 +25,6 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
  */
 public class AdminSummon implements IAdminCommandHandler
 {
-	private static final Logger LOGGER = Logger.getLogger(AdminSummon.class.getName());
-	
 	public static final String[] ADMIN_COMMANDS =
 	{
 		"admin_summon"
@@ -62,34 +57,24 @@ public class AdminSummon implements IAdminCommandHandler
 			return false;
 		}
 		
-		String subCommand;
+		final String subCommand;
 		if (id < 1000000)
 		{
 			subCommand = "admin_create_item";
-			if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel()))
-			{
-				activeChar.sendMessage("You don't have the access right to use this command!");
-				LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!");
-				return false;
-			}
-			final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand);
-			ach.useAdminCommand(subCommand + " " + id + " " + count, activeChar);
 		}
 		else
 		{
 			subCommand = "admin_spawn_once";
-			if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel()))
-			{
-				activeChar.sendMessage("You don't have the access right to use this command!");
-				LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!");
-				return false;
-			}
-			final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand);
 			
 			activeChar.sendMessage("This is only a temporary spawn.  The mob(s) will NOT respawn.");
 			id -= 1000000;
-			ach.useAdminCommand(subCommand + " " + id + " " + count, activeChar);
 		}
+		
+		if ((id > 0) && (count > 0))
+		{
+			AdminCommandHandler.getInstance().useAdminCommand(activeChar, subCommand + " " + id + " " + count, true);
+		}
+		
 		return true;
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminSuperHaste.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminSuperHaste.java
new file mode 100644
index 0000000000..4a3eb0c809
--- /dev/null
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminSuperHaste.java
@@ -0,0 +1,92 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.admincommandhandlers;
+
+import java.util.StringTokenizer;
+
+import com.l2jmobius.gameserver.data.xml.impl.SkillData;
+import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.model.skills.Skill;
+
+/**
+ * The classical custom L2J implementation of the old //gmspeed GM command.
+ * @author lord_rex (No, it wasn't me at all. Eclipse added my name there.)
+ */
+public final class AdminSuperHaste implements IAdminCommandHandler
+{
+	public static final String[] ADMIN_COMMANDS =
+	{
+		"admin_superhaste",
+		"admin_superhaste_menu",
+		"admin_speed",
+		"admin_speed_menu",
+	};
+	
+	private static final int SUPER_HASTE_ID = 7029;
+	
+	@Override
+	public boolean useAdminCommand(String command, L2PcInstance player)
+	{
+		final StringTokenizer st = new StringTokenizer(command);
+		final String cmd = st.nextToken();
+		switch (cmd)
+		{
+			case "admin_superhaste":
+			case "admin_speed":
+			{
+				try
+				{
+					final int val = Integer.parseInt(st.nextToken());
+					final boolean sendMessage = player.isAffectedBySkill(SUPER_HASTE_ID);
+					player.stopSkillEffects((val == 0) && sendMessage, SUPER_HASTE_ID);
+					if ((val >= 1) && (val <= 4))
+					{
+						int time = 0;
+						if (st.hasMoreTokens())
+						{
+							time = Integer.parseInt(st.nextToken());
+						}
+						
+						final Skill superHasteSkill = SkillData.getInstance().getSkill(SUPER_HASTE_ID, val);
+						superHasteSkill.applyEffects(player, player, true, time);
+					}
+				}
+				catch (final Exception e)
+				{
+					player.sendMessage("Usage: //superhaste <Effect level (0-4)> <Time in seconds>");
+				}
+				
+				break;
+			}
+			case "admin_superhaste_menu":
+			case "admin_speed_menu":
+			{
+				AdminHtml.showAdminHtml(player, "gm_menu.htm");
+				break;
+			}
+		}
+		
+		return true;
+	}
+	
+	@Override
+	public String[] getAdminCommandList()
+	{
+		return ADMIN_COMMANDS;
+	}
+}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/Config.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/Config.java
index 193113757b..ab607e6c0d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/Config.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/Config.java
@@ -399,6 +399,7 @@ public final class Config
 	public static int DEFAULT_ACCESS_LEVEL;
 	public static boolean SERVER_GMONLY;
 	public static boolean GM_HERO_AURA;
+	public static boolean GM_STARTUP_BUILDER_HIDE;
 	public static boolean GM_STARTUP_INVULNERABLE;
 	public static boolean GM_STARTUP_INVISIBLE;
 	public static boolean GM_STARTUP_SILENCE;
@@ -412,6 +413,7 @@ public final class Config
 	public static boolean GM_CRITANNOUNCER_NAME;
 	public static boolean GM_GIVE_SPECIAL_SKILLS;
 	public static boolean GM_GIVE_SPECIAL_AURA_SKILLS;
+	public static boolean USE_SUPER_HASTE_AS_GM_SPEED;
 	public static boolean GAMEGUARD_ENFORCE;
 	public static boolean GAMEGUARD_PROHIBITACTION;
 	public static boolean LOG_CHAT;
@@ -1744,6 +1746,7 @@ public final class Config
 			DEFAULT_ACCESS_LEVEL = General.getInt("DefaultAccessLevel", 0);
 			SERVER_GMONLY = General.getBoolean("ServerGMOnly", false);
 			GM_HERO_AURA = General.getBoolean("GMHeroAura", false);
+			GM_STARTUP_BUILDER_HIDE = General.getBoolean("GMStartupBuilderHide", false);
 			GM_STARTUP_INVULNERABLE = General.getBoolean("GMStartupInvulnerable", false);
 			GM_STARTUP_INVISIBLE = General.getBoolean("GMStartupInvisible", false);
 			GM_STARTUP_SILENCE = General.getBoolean("GMStartupSilence", false);
@@ -1757,6 +1760,7 @@ public final class Config
 			GM_CRITANNOUNCER_NAME = General.getBoolean("GMShowCritAnnouncerName", false);
 			GM_GIVE_SPECIAL_SKILLS = General.getBoolean("GMGiveSpecialSkills", false);
 			GM_GIVE_SPECIAL_AURA_SKILLS = General.getBoolean("GMGiveSpecialAuraSkills", false);
+			USE_SUPER_HASTE_AS_GM_SPEED = General.getBoolean("UseSuperHasteAsGMSpeed", false);
 			GAMEGUARD_ENFORCE = General.getBoolean("GameGuardEnforce", false);
 			GAMEGUARD_PROHIBITACTION = General.getBoolean("GameGuardProhibitAction", false);
 			LOG_CHAT = General.getBoolean("LogChat", false);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
index adf6462b78..c4faf3bd6d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
@@ -18,12 +18,26 @@ package com.l2jmobius.gameserver.handler;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.logging.Logger;
+
+import com.l2jmobius.Config;
+import com.l2jmobius.commons.concurrent.ThreadPool;
+import com.l2jmobius.gameserver.data.xml.impl.AdminData;
+import com.l2jmobius.gameserver.enums.PlayerAction;
+import com.l2jmobius.gameserver.model.L2Object;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.SystemMessageId;
+import com.l2jmobius.gameserver.network.serverpackets.ConfirmDlg;
+import com.l2jmobius.gameserver.util.GMAudit;
+import com.l2jmobius.gameserver.util.TimeAmountInterpreter;
 
 /**
  * @author UnAfraid
  */
 public class AdminCommandHandler implements IHandler<IAdminCommandHandler, String>
 {
+	private static final Logger LOGGER = Logger.getLogger(AdminCommandHandler.class.getName());
+	
 	private final Map<String, IAdminCommandHandler> _datatable;
 	
 	protected AdminCommandHandler()
@@ -49,10 +63,85 @@ public class AdminCommandHandler implements IHandler<IAdminCommandHandler, Strin
 		}
 	}
 	
+	/**
+	 * WARNING: Please use {@link #useAdminCommand(L2PcInstance, String, boolean)} instead.
+	 */
 	@Override
 	public IAdminCommandHandler getHandler(String adminCommand)
 	{
-		return _datatable.get(adminCommand.contains(" ") ? adminCommand.substring(0, adminCommand.indexOf(" ")) : adminCommand);
+		String command = adminCommand;
+		if (adminCommand.contains(" "))
+		{
+			command = adminCommand.substring(0, adminCommand.indexOf(" "));
+		}
+		return _datatable.get(command);
+	}
+	
+	public void useAdminCommand(L2PcInstance player, String fullCommand, boolean useConfirm)
+	{
+		final String command = fullCommand.split(" ")[0];
+		final String commandNoPrefix = command.substring(6);
+		
+		final IAdminCommandHandler handler = getHandler(command);
+		if (handler == null)
+		{
+			if (player.isGM())
+			{
+				player.sendMessage("The command '" + commandNoPrefix + "' does not exist!");
+			}
+			LOGGER.warning("No handler registered for admin command '" + command + "'");
+			return;
+		}
+		
+		if (!AdminData.getInstance().hasAccess(command, player.getAccessLevel()))
+		{
+			player.sendMessage("You don't have the access rights to use this command!");
+			LOGGER.warning("Player " + player.getName() + " tried to use admin command '" + command + "', without proper access level!");
+			return;
+		}
+		
+		if (useConfirm && AdminData.getInstance().requireConfirm(command))
+		{
+			player.setAdminConfirmCmd(fullCommand);
+			final ConfirmDlg dlg = new ConfirmDlg(SystemMessageId.S1_3);
+			dlg.addString("Are you sure you want execute command '" + commandNoPrefix + "' ?");
+			player.addAction(PlayerAction.ADMIN_COMMAND);
+			player.sendPacket(dlg);
+		}
+		else
+		{
+			// Admin Commands must run through a long running task, otherwise a command that takes too much time will freeze the server, this way you'll feel only a minor spike.
+			ThreadPool.execute(() ->
+			{
+				final long begin = System.currentTimeMillis();
+				try
+				{
+					if (Config.GMAUDIT)
+					{
+						final L2Object target = player.getTarget();
+						GMAudit.auditGMAction(player.getName() + " [" + player.getObjectId() + "]", fullCommand, (target != null ? target.getName() : "no-target"));
+					}
+					
+					handler.useAdminCommand(fullCommand, player);
+				}
+				catch (RuntimeException e)
+				{
+					player.sendMessage("Exception during execution of  '" + fullCommand + "': " + e.toString());
+					LOGGER.warning("Exception during execution of " + fullCommand + " " + e);
+				}
+				finally
+				{
+					final long runtime = System.currentTimeMillis() - begin;
+					
+					if (runtime < 5000)
+					{
+						return;
+					}
+					
+					player.sendMessage("The execution of '" + fullCommand + "' took " + TimeAmountInterpreter.consolidateMillis(runtime) + ".");
+				}
+			});
+		}
 	}
 	
 	@Override
@@ -63,11 +152,11 @@ public class AdminCommandHandler implements IHandler<IAdminCommandHandler, Strin
 	
 	public static AdminCommandHandler getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final AdminCommandHandler _instance = new AdminCommandHandler();
+		protected static final AdminCommandHandler INSTANCE = new AdminCommandHandler();
 	}
 }
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
index 018365c9d3..c171707228 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
@@ -98,8 +98,6 @@ import com.l2jmobius.gameserver.enums.SubclassInfoType;
 import com.l2jmobius.gameserver.enums.Team;
 import com.l2jmobius.gameserver.enums.UserInfoType;
 import com.l2jmobius.gameserver.geoengine.GeoEngine;
-import com.l2jmobius.gameserver.handler.AdminCommandHandler;
-import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.handler.IItemHandler;
 import com.l2jmobius.gameserver.handler.ItemHandler;
 import com.l2jmobius.gameserver.idfactory.IdFactory;
@@ -337,7 +335,6 @@ import com.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
 import com.l2jmobius.gameserver.util.Broadcast;
 import com.l2jmobius.gameserver.util.EnumIntBitmask;
 import com.l2jmobius.gameserver.util.FloodProtectors;
-import com.l2jmobius.gameserver.util.GMAudit;
 import com.l2jmobius.gameserver.util.Util;
 
 /**
@@ -9989,8 +9986,9 @@ public final class L2PcInstance extends L2Playable
 	{
 		startWarnUserTakeBreak();
 		
-		if (isGM())
+		if (isGM() && !Config.GM_STARTUP_BUILDER_HIDE)
 		{
+			// Bleah, see L2J custom below.
 			if (isInvul())
 			{
 				sendMessage("Entering world in Invulnerable mode.");
@@ -13631,50 +13629,6 @@ public final class L2PcInstance extends L2Playable
 		return (super.isVisibleFor(player) || ((player.getParty() != null) && (player.getParty() == getParty())));
 	}
 	
-	/**
-	 * @param fullCommand
-	 */
-	public void useAdminCommand(String fullCommand)
-	{
-		final String command = fullCommand.split(" ")[0];
-		
-		final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(command);
-		if (ach == null)
-		{
-			if (isGM())
-			{
-				sendMessage("The command " + command.substring(6) + " does not exist!");
-			}
-			LOGGER.warning("No handler registered for admin command '" + command + "'");
-			return;
-		}
-		
-		if (!AdminData.getInstance().hasAccess(command, getAccessLevel()))
-		{
-			sendMessage("You don't have the access rights to use this command!");
-			LOGGER.warning("Character " + getName() + " tried to use admin command " + command + ", without proper access level!");
-			return;
-		}
-		
-		if (AdminData.getInstance().requireConfirm(command))
-		{
-			setAdminConfirmCmd(fullCommand);
-			final ConfirmDlg dlg = new ConfirmDlg(SystemMessageId.S1_3);
-			dlg.addString("Are you sure you want execute command " + fullCommand.substring(6) + " ?");
-			addAction(PlayerAction.ADMIN_COMMAND);
-			sendPacket(dlg);
-		}
-		else
-		{
-			if (Config.GMAUDIT)
-			{
-				GMAudit.auditGMAction(getName() + " [" + getObjectId() + "]", fullCommand, (getTarget() != null ? getTarget().getName() : "no-target"));
-			}
-			
-			ach.useAdminCommand(fullCommand, this);
-		}
-	}
-	
 	/**
 	 * Set the Quest zone ID.
 	 * @param id the quest zone ID
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java
index f1eefdc748..2dd69a67f8 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java
@@ -16,12 +16,9 @@
  */
 package com.l2jmobius.gameserver.network.clientpackets;
 
-import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketReader;
-import com.l2jmobius.gameserver.data.xml.impl.AdminData;
 import com.l2jmobius.gameserver.enums.PlayerAction;
 import com.l2jmobius.gameserver.handler.AdminCommandHandler;
-import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.events.EventDispatcher;
 import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerDlgAnswer;
@@ -30,7 +27,6 @@ import com.l2jmobius.gameserver.model.holders.DoorRequestHolder;
 import com.l2jmobius.gameserver.model.holders.SummonRequestHolder;
 import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.util.GMAudit;
 
 /**
  * @author Dezmond_snz
@@ -75,16 +71,9 @@ public final class DlgAnswer implements IClientIncomingPacket
 				{
 					return;
 				}
-				final String command = cmd.split(" ")[0];
-				final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(command);
-				if (AdminData.getInstance().hasAccess(command, activeChar.getAccessLevel()))
-				{
-					if (Config.GMAUDIT)
-					{
-						GMAudit.auditGMAction(activeChar.getName() + " [" + activeChar.getObjectId() + "]", cmd, (activeChar.getTarget() != null ? activeChar.getTarget().getName() : "no-target"));
-					}
-					ach.useAdminCommand(cmd, activeChar);
-				}
+				
+				// The 'useConfirm' must be disabled here, as we don't want to repeat that process.
+				AdminCommandHandler.getInstance().useAdminCommand(activeChar, cmd, false);
 			}
 		}
 		else if ((_messageId == SystemMessageId.C1_IS_ATTEMPTING_TO_DO_A_RESURRECTION_THAT_RESTORES_S2_S3_XP_ACCEPT.getId()) || (_messageId == SystemMessageId.YOUR_CHARM_OF_COURAGE_IS_TRYING_TO_RESURRECT_YOU_WOULD_YOU_LIKE_TO_RESURRECT_NOW.getId()))
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index fc1ed0058e..c19ae2cf39 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -102,6 +102,7 @@ import com.l2jmobius.gameserver.network.serverpackets.attendance.ExVipAttendance
 import com.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward;
 import com.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList;
 import com.l2jmobius.gameserver.network.serverpackets.friend.L2FriendList;
+import com.l2jmobius.gameserver.util.BuilderUtil;
 
 /**
  * Enter World Packet Handler
@@ -209,35 +210,50 @@ public class EnterWorld implements IClientIncomingPacket
 		// Apply special GM properties to the GM when entering
 		if (activeChar.isGM())
 		{
-			if (Config.GM_STARTUP_INVULNERABLE && AdminData.getInstance().hasAccess("admin_invul", activeChar.getAccessLevel()))
+			gmStartupProcess:
 			{
-				activeChar.setIsInvul(true);
-			}
-			
-			if (Config.GM_STARTUP_INVISIBLE && AdminData.getInstance().hasAccess("admin_invisible", activeChar.getAccessLevel()))
-			{
-				activeChar.setInvisible(true);
-				activeChar.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.STEALTH);
-			}
-			
-			if (Config.GM_STARTUP_SILENCE && AdminData.getInstance().hasAccess("admin_silence", activeChar.getAccessLevel()))
-			{
-				activeChar.setSilenceMode(true);
-			}
-			
-			if (Config.GM_STARTUP_DIET_MODE && AdminData.getInstance().hasAccess("admin_diet", activeChar.getAccessLevel()))
-			{
-				activeChar.setDietMode(true);
-				activeChar.refreshOverloaded(true);
-			}
-			
-			if (Config.GM_STARTUP_AUTO_LIST && AdminData.getInstance().hasAccess("admin_gmliston", activeChar.getAccessLevel()))
-			{
-				AdminData.getInstance().addGm(activeChar, false);
-			}
-			else
-			{
-				AdminData.getInstance().addGm(activeChar, true);
+				if (Config.GM_STARTUP_BUILDER_HIDE && AdminData.getInstance().hasAccess("admin_hide", activeChar.getAccessLevel()))
+				{
+					BuilderUtil.setHiding(activeChar, true);
+					
+					BuilderUtil.sendSysMessage(activeChar, "hide is default for builder.");
+					BuilderUtil.sendSysMessage(activeChar, "FriendAddOff is default for builder.");
+					BuilderUtil.sendSysMessage(activeChar, "whisperoff is default for builder.");
+					
+					// It isn't recommend to use the below custom L2J GMStartup functions together with retail-like GMStartupBuilderHide, so breaking the process at that stage.
+					break gmStartupProcess;
+				}
+				
+				if (Config.GM_STARTUP_INVULNERABLE && AdminData.getInstance().hasAccess("admin_invul", activeChar.getAccessLevel()))
+				{
+					activeChar.setIsInvul(true);
+				}
+				
+				if (Config.GM_STARTUP_INVISIBLE && AdminData.getInstance().hasAccess("admin_invisible", activeChar.getAccessLevel()))
+				{
+					activeChar.setInvisible(true);
+					activeChar.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.STEALTH);
+				}
+				
+				if (Config.GM_STARTUP_SILENCE && AdminData.getInstance().hasAccess("admin_silence", activeChar.getAccessLevel()))
+				{
+					activeChar.setSilenceMode(true);
+				}
+				
+				if (Config.GM_STARTUP_DIET_MODE && AdminData.getInstance().hasAccess("admin_diet", activeChar.getAccessLevel()))
+				{
+					activeChar.setDietMode(true);
+					activeChar.refreshOverloaded(true);
+				}
+				
+				if (Config.GM_STARTUP_AUTO_LIST && AdminData.getInstance().hasAccess("admin_gmliston", activeChar.getAccessLevel()))
+				{
+					AdminData.getInstance().addGm(activeChar, false);
+				}
+				else
+				{
+					AdminData.getInstance().addGm(activeChar, true);
+				}
 			}
 			
 			if (Config.GM_GIVE_SPECIAL_SKILLS)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java
index 7621a7029e..27753dcf85 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java
@@ -23,6 +23,7 @@ import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.data.xml.impl.MultisellData;
+import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.BypassHandler;
 import com.l2jmobius.gameserver.handler.CommunityBoardHandler;
 import com.l2jmobius.gameserver.handler.IBypassHandler;
@@ -133,7 +134,7 @@ public final class RequestBypassToServer implements IClientIncomingPacket
 		{
 			if (_command.startsWith("admin_"))
 			{
-				activeChar.useAdminCommand(_command);
+				AdminCommandHandler.getInstance().useAdminCommand(activeChar, _command, true);
 			}
 			else if (CommunityBoardHandler.getInstance().isCommunityBoardCommand(_command))
 			{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
index 9805ae3e39..b6b85e45d9 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
@@ -24,6 +24,7 @@ import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.enums.PrivateStoreType;
+import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.instancemanager.CursedWeaponsManager;
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.L2World;
@@ -107,7 +108,7 @@ public final class RequestDestroyItem implements IClientIncomingPacket
 					{
 						count = ((L2ItemInstance) obj).getCount();
 					}
-					activeChar.useAdminCommand("admin_delete_item " + _objectId + " " + count);
+					AdminCommandHandler.getInstance().useAdminCommand(activeChar, "admin_delete_item " + _objectId + " " + count, true);
 				}
 				return;
 			}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialLinkHtml.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialLinkHtml.java
index e230c6ec10..eac5eea401 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialLinkHtml.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialLinkHtml.java
@@ -17,6 +17,7 @@
 package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
+import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.BypassHandler;
 import com.l2jmobius.gameserver.handler.IBypassHandler;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -45,7 +46,7 @@ public class RequestTutorialLinkHtml implements IClientIncomingPacket
 		
 		if (_bypass.startsWith("admin_"))
 		{
-			player.useAdminCommand(_bypass);
+			AdminCommandHandler.getInstance().useAdminCommand(player, _bypass, true);
 		}
 		else
 		{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialPassCmdToServer.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialPassCmdToServer.java
index 3b9d386e05..dc2e10cc02 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialPassCmdToServer.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialPassCmdToServer.java
@@ -17,6 +17,7 @@
 package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
+import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.BypassHandler;
 import com.l2jmobius.gameserver.handler.IBypassHandler;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -46,7 +47,7 @@ public class RequestTutorialPassCmdToServer implements IClientIncomingPacket
 		
 		if (_bypass.startsWith("admin_"))
 		{
-			player.useAdminCommand(_bypass);
+			AdminCommandHandler.getInstance().useAdminCommand(player, _bypass, true);
 		}
 		else
 		{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java
index 2255ca3502..2487fbe4a4 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java
@@ -16,14 +16,10 @@
  */
 package com.l2jmobius.gameserver.network.clientpackets;
 
-import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketReader;
-import com.l2jmobius.gameserver.data.xml.impl.AdminData;
 import com.l2jmobius.gameserver.handler.AdminCommandHandler;
-import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.network.L2GameClient;
-import com.l2jmobius.gameserver.util.GMAudit;
 
 /**
  * This class handles all GM commands triggered by //command
@@ -56,33 +52,6 @@ public final class SendBypassBuildCmd implements IClientIncomingPacket
 			return;
 		}
 		
-		final String command = "admin_" + _command.split(" ")[0];
-		
-		final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(command);
-		
-		if (ach == null)
-		{
-			if (activeChar.isGM())
-			{
-				activeChar.sendMessage("The command " + command.substring(6) + " does not exists!");
-			}
-			
-			LOGGER.warning("No handler registered for admin command '" + command + "'");
-			return;
-		}
-		
-		if (!AdminData.getInstance().hasAccess(command, activeChar.getAccessLevel()))
-		{
-			activeChar.sendMessage("You don't have the access right to use this command!");
-			LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + command + ", but have no access to it!");
-			return;
-		}
-		
-		if (Config.GMAUDIT)
-		{
-			GMAudit.auditGMAction(activeChar.getName() + " [" + activeChar.getObjectId() + "]", _command, (activeChar.getTarget() != null ? activeChar.getTarget().getName() : "no-target"));
-		}
-		
-		ach.useAdminCommand("admin_" + _command, activeChar);
+		AdminCommandHandler.getInstance().useAdminCommand(activeChar, "admin_" + _command, true);
 	}
 }
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java
index 8ae98bd315..274245a42a 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java
@@ -27,6 +27,7 @@ import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.ai.NextAction;
 import com.l2jmobius.gameserver.enums.ItemSkillType;
 import com.l2jmobius.gameserver.enums.PrivateStoreType;
+import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.IItemHandler;
 import com.l2jmobius.gameserver.handler.ItemHandler;
 import com.l2jmobius.gameserver.instancemanager.FortSiegeManager;
@@ -95,7 +96,7 @@ public final class UseItem implements IClientIncomingPacket
 				final L2Object obj = L2World.getInstance().findObject(_objectId);
 				if (obj instanceof L2ItemInstance)
 				{
-					activeChar.useAdminCommand("admin_use_item " + _objectId);
+					AdminCommandHandler.getInstance().useAdminCommand(activeChar, "admin_use_item " + _objectId, true);
 				}
 			}
 			return;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/BuilderUtil.java
new file mode 100644
index 0000000000..5d813d36b4
--- /dev/null
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/BuilderUtil.java
@@ -0,0 +1,72 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jmobius.gameserver.util;
+
+import com.l2jmobius.gameserver.enums.ChatType;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.serverpackets.CreatureSay;
+import com.l2jmobius.gameserver.network.serverpackets.ExUserInfoAbnormalVisualEffect;
+
+/**
+ * @author lord_rex
+ */
+public final class BuilderUtil
+{
+	private BuilderUtil()
+	{
+		// utility class
+	}
+	
+	/**
+	 * Sends builder system message to the player.
+	 * @param player
+	 * @param message
+	 */
+	public static void sendSysMessage(L2PcInstance player, String message)
+	{
+		player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "SYS", message));
+	}
+	
+	/**
+	 * Changes player's hiding state.
+	 * @param player
+	 * @param hide
+	 * @return {@code true} if hide state was changed, otherwise {@code false}
+	 */
+	public static boolean setHiding(L2PcInstance player, boolean hide)
+	{
+		if (player.isInvisible() && hide)
+		{
+			// already hiding
+			return false;
+		}
+		
+		if (!player.isInvisible() && !hide)
+		{
+			// already visible
+			return false;
+		}
+		
+		player.setSilenceMode(hide);
+		player.setIsInvul(hide);
+		player.setInvisible(hide);
+		
+		player.broadcastUserInfo();
+		player.sendPacket(new ExUserInfoAbnormalVisualEffect(player));
+		return true;
+	}
+}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/TimeAmountInterpreter.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/TimeAmountInterpreter.java
new file mode 100644
index 0000000000..a9f8029b98
--- /dev/null
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/TimeAmountInterpreter.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 1999 CERN - European Organization for Nuclear Research.
+ * 
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear in
+ * supporting documentation. CERN makes no representations about the
+ * suitability of this software for any purpose. It is provided "as is"
+ * without expressed or implied warranty.
+ */
+package com.l2jmobius.gameserver.util;
+
+import static java.util.concurrent.TimeUnit.DAYS;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
+
+import java.io.IOException;
+import java.util.Locale;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Allows to present time intervals in a standardized, user friendly manner.
+ * @author _dev_
+ */
+public class TimeAmountInterpreter
+{
+	private static final TimeUnit[] UNIT_CACHE = TimeUnit.values();
+	
+	private TimeAmountInterpreter()
+	{
+		// utility class
+	}
+	
+	/**
+	 * Calls {@link #consolidate(long, TimeUnit)} with {@link TimeUnit#NANOSECONDS}.
+	 * @param timeAmountInNanos amount of time in nanoseconds
+	 * @return an user-friendly description of the given time amount
+	 */
+	public static String consolidateNanos(long timeAmountInNanos)
+	{
+		return consolidate(timeAmountInNanos, NANOSECONDS);
+	}
+	
+	/**
+	 * Calls {@link #consolidate(long, TimeUnit)} with {@link TimeUnit#MILLISECONDS}.
+	 * @param timeAmountInMillis amount of time in milliseconds
+	 * @return an user-friendly description of the given time amount
+	 */
+	public static String consolidateMillis(long timeAmountInMillis)
+	{
+		return consolidate(timeAmountInMillis, MILLISECONDS);
+	}
+	
+	/**
+	 * Constructs an user-friendly description of the given amount of time, specifying the number of days (if any), hours (if any), minutes (if any), seconds (if any) and milliseconds (if any). Otherwise, returns the string value {@code 0}.
+	 * @param timeAmount amount of time to be written
+	 * @param timeUnit unit of the given amount
+	 * @return an user-friendly description of the given time amount
+	 */
+	public static String consolidate(long timeAmount, TimeUnit timeUnit)
+	{
+		return consolidate(timeAmount, timeUnit, timeUnit, DAYS, "0 " + timeUnit.name().toLowerCase(Locale.ENGLISH));
+	}
+	
+	/**
+	 * Constructs an user-friendly description of the given amount of time.
+	 * @param timeAmount amount of time to be written
+	 * @param timeUnit unit of the given amount
+	 * @param minConsolidationUnit smallest unit to be included within the description
+	 * @param maxConsolidationUnit largest unit to be included within the description
+	 * @param noTimeUsedIndicator text to be written if the amount is not positive
+	 * @return an user-friendly description of the given time amount
+	 */
+	public static String consolidate(long timeAmount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator)
+	{
+		return appendConsolidated(new StringBuilder(), timeAmount, timeUnit, minConsolidationUnit, maxConsolidationUnit, noTimeUsedIndicator).toString();
+	}
+	
+	/**
+	 * Appends an user-friendly description of the given amount of time to the specified text builder.<BR>
+	 * <BR>
+	 * Please keep in mind, that this method is primarily designed to be used with heap text builders. Therefore, if the given text builder throws an {@link IOException}, this exception will be wrapped in a {@link RuntimeException} and returned to the caller as an unchecked exception.
+	 * @param <T>
+	 * @param textBuilder a character sequence builder
+	 * @param timeAmount amount of time to be written
+	 * @param timeUnit unit of the given amount
+	 * @param minConsolidationUnit smallest unit to be included within the description
+	 * @param maxConsolidationUnit largest unit to be included within the description
+	 * @param noTimeUsedIndicator text to be written if the amount is not positive
+	 * @return {@code textBuilder}
+	 * @throws RuntimeException if {@code textBuilder} throws an {@link IOException}
+	 */
+	@SuppressWarnings("unchecked")
+	public static <T extends Appendable & CharSequence> T appendConsolidated(T textBuilder, long timeAmount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator) throws RuntimeException
+	{
+		try
+		{
+			if (timeAmount < 1)
+			{
+				return (T) textBuilder.append(noTimeUsedIndicator);
+			}
+			
+			final int len = textBuilder.length();
+			for (int i = maxConsolidationUnit.ordinal(); i >= minConsolidationUnit.ordinal(); --i)
+			{
+				final TimeUnit activeUnit = UNIT_CACHE[i];
+				final long num = activeUnit.convert(timeAmount, timeUnit);
+				if (num == 0)
+				{
+					continue;
+				}
+				
+				if (textBuilder.length() > len)
+				{
+					textBuilder.append(", ");
+				}
+				textBuilder.append(String.valueOf(num)).append(' ');
+				final String unit = activeUnit.name().toLowerCase(Locale.ENGLISH);
+				textBuilder.append(unit, 0, num == 1 ? unit.length() - 1 : unit.length());
+				
+				timeAmount -= timeUnit.convert(num, activeUnit);
+			}
+			
+			if (textBuilder.length() == len)
+			{
+				return (T) textBuilder.append(noTimeUsedIndicator).append(' ').append(minConsolidationUnit.name().toLowerCase(Locale.ENGLISH));
+			}
+		}
+		catch (IOException e)
+		{
+			throw new RuntimeException(e);
+		}
+		return textBuilder;
+	}
+}
diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/config/AdminCommands.xml b/L2J_Mobius_Classic_2.0_Zaken/dist/game/config/AdminCommands.xml
index cda7d5cced..f69ad984ba 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/config/AdminCommands.xml
+++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/config/AdminCommands.xml
@@ -158,8 +158,6 @@
 	<admin command="admin_earthquake_menu" accessLevel="100" />
 	<admin command="admin_bighead" accessLevel="100" />
 	<admin command="admin_shrinkhead" accessLevel="100" />
-	<admin command="admin_gmspeed" accessLevel="100" />
-	<admin command="admin_gmspeed_menu" accessLevel="100" />
 	<admin command="admin_unpara_all" accessLevel="100" />
 	<admin command="admin_para_all" accessLevel="100" />
 	<admin command="admin_unpara" accessLevel="100" />
@@ -189,6 +187,13 @@
 	<admin command="admin_set_displayeffect_menu" accessLevel="100" />
 	<admin command="admin_playmovie" accessLevel="100" />
 
+	<!-- ADMIN SPEED -->
+	<admin command="admin_gmspeed" accessLevel="100" />
+	<admin command="admin_superhaste" accessLevel="100" />
+	<admin command="admin_superhaste_menu" accessLevel="100" />
+	<admin command="admin_speed" accessLevel="100" />
+	<admin command="admin_speed_menu" accessLevel="100" />
+	
 	<!-- ADMIN ELEMENT -->
 	<admin command="admin_setlh" accessLevel="100" />
 	<admin command="admin_setlc" accessLevel="100" />
@@ -612,4 +617,7 @@
 	<admin command="banchat" accessLevel="100" />
 	<admin command="debug" accessLevel="100" />
 	<admin command="unbanchat" accessLevel="100" />
+
+	<!-- HIDE -->
+	<admin command="admin_hide" accessLevel="100" />
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/config/General.ini b/L2J_Mobius_Classic_2.0_Zaken/dist/game/config/General.ini
index 80d6358861..bc80390cd6 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/config/General.ini
+++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/config/General.ini
@@ -25,6 +25,10 @@ ServerGMOnly = False
 # Default: False
 GMHeroAura = False
 
+# Whether GM logins in builder hide mode by default.
+# Default: True
+GMStartupBuilderHide = True
+
 # Auto set invulnerable status to a GM on login.
 # Default: False
 GMStartupInvulnerable = True
@@ -79,6 +83,11 @@ GMGiveSpecialSkills = False
 # Default: False
 GMGiveSpecialAuraSkills = False
 
+# In case you are not satisfied with the retail-like implementation of //gmspeed",
+# with this config you can rollback it to the old custom L2J version of the GM Speed.
+# Default: False
+UseSuperHasteAsGMSpeed = False
+
 
 # ---------------------------------------------------------------------------
 # Server Security
diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/html/admin/gm_menu.htm b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/html/admin/gm_menu.htm
index ba19fe1d81..51e6be4257 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/html/admin/gm_menu.htm
+++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/html/admin/gm_menu.htm
@@ -38,11 +38,11 @@
 </table><br1>
 <table width=270><tr>
 <td><font color="LEVEL">Super Haste:</font></td>
-<td><button value="1" action="bypass -h admin_gmspeed_menu 1" width=35 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="2" action="bypass -h admin_gmspeed_menu 2" width=35 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="3" action="bypass -h admin_gmspeed_menu 3" width=35 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="4" action="bypass -h admin_gmspeed_menu 4" width=35 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="Off" action="bypass -h admin_gmspeed_menu 0" width=35 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="1" action="bypass -h admin_superhaste 1" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="2" action="bypass -h admin_superhaste 2" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="3" action="bypass -h admin_superhaste 3" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="4" action="bypass -h admin_superhaste 4" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="Off" action="bypass -h admin_superhaste 0" width=30 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr></table><br>
 <center><multiedit var="new_announcement" width=250 height=80></center>
 <table width="160"><tr>
diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/MasterHandler.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/MasterHandler.java
index 0e053d06ac..0244d1f75d 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/MasterHandler.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/MasterHandler.java
@@ -84,9 +84,11 @@ import handlers.admincommandhandlers.AdminFortSiege;
 import handlers.admincommandhandlers.AdminGeodata;
 import handlers.admincommandhandlers.AdminGm;
 import handlers.admincommandhandlers.AdminGmChat;
+import handlers.admincommandhandlers.AdminGmSpeed;
 import handlers.admincommandhandlers.AdminGraciaSeeds;
 import handlers.admincommandhandlers.AdminGrandBoss;
 import handlers.admincommandhandlers.AdminHeal;
+import handlers.admincommandhandlers.AdminHide;
 import handlers.admincommandhandlers.AdminHtml;
 import handlers.admincommandhandlers.AdminHwid;
 import handlers.admincommandhandlers.AdminInstance;
@@ -125,6 +127,7 @@ import handlers.admincommandhandlers.AdminShutdown;
 import handlers.admincommandhandlers.AdminSkill;
 import handlers.admincommandhandlers.AdminSpawn;
 import handlers.admincommandhandlers.AdminSummon;
+import handlers.admincommandhandlers.AdminSuperHaste;
 import handlers.admincommandhandlers.AdminTarget;
 import handlers.admincommandhandlers.AdminTargetSay;
 import handlers.admincommandhandlers.AdminTeleport;
@@ -415,9 +418,11 @@ public class MasterHandler
 			AdminGeodata.class,
 			AdminGm.class,
 			AdminGmChat.class,
+			AdminGmSpeed.class,
 			AdminGraciaSeeds.class,
 			AdminGrandBoss.class,
 			AdminHeal.class,
+			AdminHide.class,
 			AdminHtml.class,
 			AdminHwid.class,
 			AdminInstance.class,
@@ -456,6 +461,7 @@ public class MasterHandler
 			AdminSkill.class,
 			AdminSpawn.class,
 			AdminSummon.class,
+			AdminSuperHaste.class,
 			AdminTarget.class,
 			AdminTargetSay.class,
 			AdminTeleport.class,
diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/actionshifthandlers/L2PcInstanceActionShift.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/actionshifthandlers/L2PcInstanceActionShift.java
index 6b1bb7ac43..72c01c3cf8 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/actionshifthandlers/L2PcInstanceActionShift.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/actionshifthandlers/L2PcInstanceActionShift.java
@@ -19,7 +19,6 @@ package handlers.actionshifthandlers;
 import com.l2jmobius.gameserver.enums.InstanceType;
 import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.IActionShiftHandler;
-import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 
@@ -37,11 +36,7 @@ public class L2PcInstanceActionShift implements IActionShiftHandler
 				activeChar.setTarget(target);
 			}
 			
-			final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler("admin_character_info");
-			if (ach != null)
-			{
-				ach.useAdminCommand("admin_character_info " + target.getName(), activeChar);
-			}
+			AdminCommandHandler.getInstance().useAdminCommand(activeChar, "admin_character_info " + target.getName(), true);
 		}
 		return true;
 	}
diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/actionshifthandlers/L2SummonActionShift.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/actionshifthandlers/L2SummonActionShift.java
index 67d403c9b3..6ee8a1173e 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/actionshifthandlers/L2SummonActionShift.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/actionshifthandlers/L2SummonActionShift.java
@@ -19,7 +19,6 @@ package handlers.actionshifthandlers;
 import com.l2jmobius.gameserver.enums.InstanceType;
 import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.IActionShiftHandler;
-import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 
@@ -36,11 +35,7 @@ public class L2SummonActionShift implements IActionShiftHandler
 				activeChar.setTarget(target);
 			}
 			
-			final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler("admin_summon_info");
-			if (ach != null)
-			{
-				ach.useAdminCommand("admin_summon_info", activeChar);
-			}
+			AdminCommandHandler.getInstance().useAdminCommand(activeChar, "admin_summon_info", true);
 		}
 		return true;
 	}
diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
index 6c2b00db74..467875568d 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
@@ -19,7 +19,6 @@ package handlers.admincommandhandlers;
 import java.util.Arrays;
 import java.util.StringTokenizer;
 
-import com.l2jmobius.gameserver.data.xml.impl.SkillData;
 import com.l2jmobius.gameserver.enums.Movie;
 import com.l2jmobius.gameserver.enums.Team;
 import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
@@ -34,7 +33,6 @@ import com.l2jmobius.gameserver.model.html.PageBuilder;
 import com.l2jmobius.gameserver.model.html.PageResult;
 import com.l2jmobius.gameserver.model.html.styles.ButtonsStyle;
 import com.l2jmobius.gameserver.model.skills.AbnormalVisualEffect;
-import com.l2jmobius.gameserver.model.skills.Skill;
 import com.l2jmobius.gameserver.network.SystemMessageId;
 import com.l2jmobius.gameserver.network.serverpackets.Earthquake;
 import com.l2jmobius.gameserver.network.serverpackets.ExRedSky;
@@ -81,8 +79,6 @@ public class AdminEffects implements IAdminCommandHandler
 		"admin_earthquake_menu",
 		"admin_bighead",
 		"admin_shrinkhead",
-		"admin_gmspeed",
-		"admin_gmspeed_menu",
 		"admin_unpara_all",
 		"admin_para_all",
 		"admin_unpara",
@@ -351,35 +347,6 @@ public class AdminEffects implements IAdminCommandHandler
 			{
 			}
 		}
-		else if (command.startsWith("admin_gmspeed"))
-		{
-			try
-			{
-				final int val = Integer.parseInt(st.nextToken());
-				final boolean sendMessage = activeChar.isAffectedBySkill(7029);
-				activeChar.stopSkillEffects((val == 0) && sendMessage, 7029);
-				if ((val >= 1) && (val <= 4))
-				{
-					int time = 0;
-					if (st.hasMoreTokens())
-					{
-						time = Integer.parseInt(st.nextToken());
-					}
-					
-					final Skill gmSpeedSkill = SkillData.getInstance().getSkill(7029, val);
-					gmSpeedSkill.applyEffects(activeChar, activeChar, true, time);
-				}
-			}
-			catch (Exception e)
-			{
-				activeChar.sendMessage("Usage: //gmspeed <Effect level (0-4)> <Time in seconds>");
-			}
-			if (command.contains("_menu"))
-			{
-				command = "";
-				AdminHtml.showAdminHtml(activeChar, "gm_menu.htm");
-			}
-		}
 		else if (command.startsWith("admin_polyself"))
 		{
 			try
diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmSpeed.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmSpeed.java
new file mode 100644
index 0000000000..5ab5f39a9b
--- /dev/null
+++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmSpeed.java
@@ -0,0 +1,119 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.admincommandhandlers;
+
+import java.util.EnumSet;
+import java.util.Set;
+import java.util.StringTokenizer;
+
+import com.l2jmobius.Config;
+import com.l2jmobius.gameserver.handler.AdminCommandHandler;
+import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
+import com.l2jmobius.gameserver.model.L2Object;
+import com.l2jmobius.gameserver.model.actor.L2Character;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.model.stats.Stats;
+import com.l2jmobius.gameserver.util.BuilderUtil;
+import com.l2jmobius.gameserver.util.Util;
+
+/**
+ * A retail-like implementation of //gmspeed builder command.
+ * @author lord_rex
+ */
+public final class AdminGmSpeed implements IAdminCommandHandler
+{
+	private static final String[] ADMIN_COMMANDS =
+	{
+		"admin_gmspeed",
+	};
+	
+	private static final Set<Stats> SPEED_STATS = EnumSet.of(Stats.RUN_SPEED, Stats.WALK_SPEED, Stats.SWIM_RUN_SPEED, Stats.SWIM_WALK_SPEED, Stats.FLY_RUN_SPEED, Stats.FLY_WALK_SPEED);
+	
+	@Override
+	public boolean useAdminCommand(String command, L2PcInstance player)
+	{
+		final StringTokenizer st = new StringTokenizer(command);
+		final String cmd = st.nextToken();
+		
+		if (cmd.equals("admin_gmspeed"))
+		{
+			if (!st.hasMoreTokens())
+			{
+				BuilderUtil.sendSysMessage(player, "//gmspeed [0...10]");
+				return false;
+			}
+			final String token = st.nextToken();
+			
+			// Rollback feature for old custom way, in order to make everyone happy.
+			if (Config.USE_SUPER_HASTE_AS_GM_SPEED)
+			{
+				AdminCommandHandler.getInstance().useAdminCommand(player, AdminSuperHaste.ADMIN_COMMANDS[0] + " " + token, false);
+				return true;
+			}
+			
+			if (!Util.isDouble(token))
+			{
+				BuilderUtil.sendSysMessage(player, "//gmspeed [0...10]");
+				return false;
+			}
+			final double runSpeedBoost = Double.parseDouble(token);
+			if ((runSpeedBoost < 0) || (runSpeedBoost > 10))
+			{
+				// Custom limit according to SDW's request - real retail limit is unknown.
+				BuilderUtil.sendSysMessage(player, "//gmspeed [0...10]");
+				return false;
+			}
+			
+			final L2Character targetCharacter;
+			final L2Object target = player.getTarget();
+			if ((target != null) && target.isCharacter())
+			{
+				targetCharacter = (L2Character) target;
+			}
+			else
+			{
+				// If there is no target, let's use the command executer.
+				targetCharacter = player;
+			}
+			
+			SPEED_STATS.forEach(speedStat -> targetCharacter.getStat().removeFixedValue(speedStat));
+			if (runSpeedBoost > 0)
+			{
+				SPEED_STATS.forEach(speedStat -> targetCharacter.getStat().addFixedValue(speedStat, targetCharacter.getTemplate().getBaseValue(speedStat, 120) * runSpeedBoost));
+			}
+			
+			targetCharacter.getStat().recalculateStats(false);
+			if (targetCharacter.isPlayer())
+			{
+				((L2PcInstance) targetCharacter).broadcastUserInfo();
+			}
+			else
+			{
+				targetCharacter.broadcastInfo();
+			}
+			
+			BuilderUtil.sendSysMessage(player, "[" + targetCharacter.getName() + "] speed is [" + (runSpeedBoost * 100) + "0]% fast.");
+		}
+		return true;
+	}
+	
+	@Override
+	public String[] getAdminCommandList()
+	{
+		return ADMIN_COMMANDS;
+	}
+}
diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminHide.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminHide.java
new file mode 100644
index 0000000000..600cbe1639
--- /dev/null
+++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminHide.java
@@ -0,0 +1,87 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.admincommandhandlers;
+
+import java.util.StringTokenizer;
+
+import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.util.BuilderUtil;
+
+/**
+ * @author lord_rex
+ */
+public final class AdminHide implements IAdminCommandHandler
+{
+	private static final String[] ADMIN_COMMANDS =
+	{
+		"admin_hide"
+	};
+	
+	@Override
+	public boolean useAdminCommand(String command, L2PcInstance player)
+	{
+		final StringTokenizer st = new StringTokenizer(command);
+		st.nextToken();
+		
+		try
+		{
+			final String param = st.nextToken();
+			switch (param)
+			{
+				case "on":
+				{
+					if (!BuilderUtil.setHiding(player, true))
+					{
+						BuilderUtil.sendSysMessage(player, "Currently, you cannot be seen.");
+						return true;
+					}
+					
+					BuilderUtil.sendSysMessage(player, "Now, you cannot be seen.");
+					return true;
+				}
+				case "off":
+				{
+					if (!BuilderUtil.setHiding(player, false))
+					{
+						BuilderUtil.sendSysMessage(player, "Currently, you can be seen.");
+						return true;
+					}
+					
+					BuilderUtil.sendSysMessage(player, "Now, you can be seen.");
+					return true;
+				}
+				default:
+				{
+					BuilderUtil.sendSysMessage(player, "//hide [on|off]");
+					return true;
+				}
+			}
+		}
+		catch (final Exception e)
+		{
+			BuilderUtil.sendSysMessage(player, "//hide [on|off]");
+			return true;
+		}
+	}
+	
+	@Override
+	public String[] getAdminCommandList()
+	{
+		return ADMIN_COMMANDS;
+	}
+}
diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java
index 5ab19d4b39..8c735f4265 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java
@@ -21,7 +21,6 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import com.l2jmobius.Config;
-import com.l2jmobius.gameserver.data.xml.impl.AdminData;
 import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.model.L2Clan;
@@ -187,14 +186,7 @@ public class AdminMenu implements IAdminCommandHandler
 			if (st.countTokens() > 1)
 			{
 				final String subCommand = "admin_ban_char";
-				if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel()))
-				{
-					activeChar.sendMessage("You don't have the access right to use this command!");
-					LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!");
-					return false;
-				}
-				final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand);
-				ach.useAdminCommand(subCommand + command.substring(14), activeChar);
+				AdminCommandHandler.getInstance().useAdminCommand(activeChar, subCommand + command.substring(14), true);
 			}
 			showMainPage(activeChar);
 		}
@@ -204,14 +196,7 @@ public class AdminMenu implements IAdminCommandHandler
 			if (st.countTokens() > 1)
 			{
 				final String subCommand = "admin_unban_char";
-				if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel()))
-				{
-					activeChar.sendMessage("You don't have the access right to use this command!");
-					LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!");
-					return false;
-				}
-				final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand);
-				ach.useAdminCommand(subCommand + command.substring(16), activeChar);
+				AdminCommandHandler.getInstance().useAdminCommand(activeChar, subCommand + command.substring(16), true);
 			}
 			showMainPage(activeChar);
 		}
diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java
index a818e7f3d3..f27d63e949 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java
@@ -16,9 +16,6 @@
  */
 package handlers.admincommandhandlers;
 
-import java.util.logging.Logger;
-
-import com.l2jmobius.gameserver.data.xml.impl.AdminData;
 import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -28,8 +25,6 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
  */
 public class AdminSummon implements IAdminCommandHandler
 {
-	private static final Logger LOGGER = Logger.getLogger(AdminSummon.class.getName());
-	
 	public static final String[] ADMIN_COMMANDS =
 	{
 		"admin_summon"
@@ -62,34 +57,24 @@ public class AdminSummon implements IAdminCommandHandler
 			return false;
 		}
 		
-		String subCommand;
+		final String subCommand;
 		if (id < 1000000)
 		{
 			subCommand = "admin_create_item";
-			if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel()))
-			{
-				activeChar.sendMessage("You don't have the access right to use this command!");
-				LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!");
-				return false;
-			}
-			final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand);
-			ach.useAdminCommand(subCommand + " " + id + " " + count, activeChar);
 		}
 		else
 		{
 			subCommand = "admin_spawn_once";
-			if (!AdminData.getInstance().hasAccess(subCommand, activeChar.getAccessLevel()))
-			{
-				activeChar.sendMessage("You don't have the access right to use this command!");
-				LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!");
-				return false;
-			}
-			final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand);
 			
 			activeChar.sendMessage("This is only a temporary spawn.  The mob(s) will NOT respawn.");
 			id -= 1000000;
-			ach.useAdminCommand(subCommand + " " + id + " " + count, activeChar);
 		}
+		
+		if ((id > 0) && (count > 0))
+		{
+			AdminCommandHandler.getInstance().useAdminCommand(activeChar, subCommand + " " + id + " " + count, true);
+		}
+		
 		return true;
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminSuperHaste.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminSuperHaste.java
new file mode 100644
index 0000000000..4a3eb0c809
--- /dev/null
+++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminSuperHaste.java
@@ -0,0 +1,92 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.admincommandhandlers;
+
+import java.util.StringTokenizer;
+
+import com.l2jmobius.gameserver.data.xml.impl.SkillData;
+import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.model.skills.Skill;
+
+/**
+ * The classical custom L2J implementation of the old //gmspeed GM command.
+ * @author lord_rex (No, it wasn't me at all. Eclipse added my name there.)
+ */
+public final class AdminSuperHaste implements IAdminCommandHandler
+{
+	public static final String[] ADMIN_COMMANDS =
+	{
+		"admin_superhaste",
+		"admin_superhaste_menu",
+		"admin_speed",
+		"admin_speed_menu",
+	};
+	
+	private static final int SUPER_HASTE_ID = 7029;
+	
+	@Override
+	public boolean useAdminCommand(String command, L2PcInstance player)
+	{
+		final StringTokenizer st = new StringTokenizer(command);
+		final String cmd = st.nextToken();
+		switch (cmd)
+		{
+			case "admin_superhaste":
+			case "admin_speed":
+			{
+				try
+				{
+					final int val = Integer.parseInt(st.nextToken());
+					final boolean sendMessage = player.isAffectedBySkill(SUPER_HASTE_ID);
+					player.stopSkillEffects((val == 0) && sendMessage, SUPER_HASTE_ID);
+					if ((val >= 1) && (val <= 4))
+					{
+						int time = 0;
+						if (st.hasMoreTokens())
+						{
+							time = Integer.parseInt(st.nextToken());
+						}
+						
+						final Skill superHasteSkill = SkillData.getInstance().getSkill(SUPER_HASTE_ID, val);
+						superHasteSkill.applyEffects(player, player, true, time);
+					}
+				}
+				catch (final Exception e)
+				{
+					player.sendMessage("Usage: //superhaste <Effect level (0-4)> <Time in seconds>");
+				}
+				
+				break;
+			}
+			case "admin_superhaste_menu":
+			case "admin_speed_menu":
+			{
+				AdminHtml.showAdminHtml(player, "gm_menu.htm");
+				break;
+			}
+		}
+		
+		return true;
+	}
+	
+	@Override
+	public String[] getAdminCommandList()
+	{
+		return ADMIN_COMMANDS;
+	}
+}
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/Config.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/Config.java
index 5fc034a1b0..c1d9698cc5 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/Config.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/Config.java
@@ -399,6 +399,7 @@ public final class Config
 	public static int DEFAULT_ACCESS_LEVEL;
 	public static boolean SERVER_GMONLY;
 	public static boolean GM_HERO_AURA;
+	public static boolean GM_STARTUP_BUILDER_HIDE;
 	public static boolean GM_STARTUP_INVULNERABLE;
 	public static boolean GM_STARTUP_INVISIBLE;
 	public static boolean GM_STARTUP_SILENCE;
@@ -412,6 +413,7 @@ public final class Config
 	public static boolean GM_CRITANNOUNCER_NAME;
 	public static boolean GM_GIVE_SPECIAL_SKILLS;
 	public static boolean GM_GIVE_SPECIAL_AURA_SKILLS;
+	public static boolean USE_SUPER_HASTE_AS_GM_SPEED;
 	public static boolean GAMEGUARD_ENFORCE;
 	public static boolean GAMEGUARD_PROHIBITACTION;
 	public static boolean LOG_CHAT;
@@ -1748,6 +1750,7 @@ public final class Config
 			DEFAULT_ACCESS_LEVEL = General.getInt("DefaultAccessLevel", 0);
 			SERVER_GMONLY = General.getBoolean("ServerGMOnly", false);
 			GM_HERO_AURA = General.getBoolean("GMHeroAura", false);
+			GM_STARTUP_BUILDER_HIDE = General.getBoolean("GMStartupBuilderHide", false);
 			GM_STARTUP_INVULNERABLE = General.getBoolean("GMStartupInvulnerable", false);
 			GM_STARTUP_INVISIBLE = General.getBoolean("GMStartupInvisible", false);
 			GM_STARTUP_SILENCE = General.getBoolean("GMStartupSilence", false);
@@ -1761,6 +1764,7 @@ public final class Config
 			GM_CRITANNOUNCER_NAME = General.getBoolean("GMShowCritAnnouncerName", false);
 			GM_GIVE_SPECIAL_SKILLS = General.getBoolean("GMGiveSpecialSkills", false);
 			GM_GIVE_SPECIAL_AURA_SKILLS = General.getBoolean("GMGiveSpecialAuraSkills", false);
+			USE_SUPER_HASTE_AS_GM_SPEED = General.getBoolean("UseSuperHasteAsGMSpeed", false);
 			GAMEGUARD_ENFORCE = General.getBoolean("GameGuardEnforce", false);
 			GAMEGUARD_PROHIBITACTION = General.getBoolean("GameGuardProhibitAction", false);
 			LOG_CHAT = General.getBoolean("LogChat", false);
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
index adf6462b78..c4faf3bd6d 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java
@@ -18,12 +18,26 @@ package com.l2jmobius.gameserver.handler;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.logging.Logger;
+
+import com.l2jmobius.Config;
+import com.l2jmobius.commons.concurrent.ThreadPool;
+import com.l2jmobius.gameserver.data.xml.impl.AdminData;
+import com.l2jmobius.gameserver.enums.PlayerAction;
+import com.l2jmobius.gameserver.model.L2Object;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.SystemMessageId;
+import com.l2jmobius.gameserver.network.serverpackets.ConfirmDlg;
+import com.l2jmobius.gameserver.util.GMAudit;
+import com.l2jmobius.gameserver.util.TimeAmountInterpreter;
 
 /**
  * @author UnAfraid
  */
 public class AdminCommandHandler implements IHandler<IAdminCommandHandler, String>
 {
+	private static final Logger LOGGER = Logger.getLogger(AdminCommandHandler.class.getName());
+	
 	private final Map<String, IAdminCommandHandler> _datatable;
 	
 	protected AdminCommandHandler()
@@ -49,10 +63,85 @@ public class AdminCommandHandler implements IHandler<IAdminCommandHandler, Strin
 		}
 	}
 	
+	/**
+	 * WARNING: Please use {@link #useAdminCommand(L2PcInstance, String, boolean)} instead.
+	 */
 	@Override
 	public IAdminCommandHandler getHandler(String adminCommand)
 	{
-		return _datatable.get(adminCommand.contains(" ") ? adminCommand.substring(0, adminCommand.indexOf(" ")) : adminCommand);
+		String command = adminCommand;
+		if (adminCommand.contains(" "))
+		{
+			command = adminCommand.substring(0, adminCommand.indexOf(" "));
+		}
+		return _datatable.get(command);
+	}
+	
+	public void useAdminCommand(L2PcInstance player, String fullCommand, boolean useConfirm)
+	{
+		final String command = fullCommand.split(" ")[0];
+		final String commandNoPrefix = command.substring(6);
+		
+		final IAdminCommandHandler handler = getHandler(command);
+		if (handler == null)
+		{
+			if (player.isGM())
+			{
+				player.sendMessage("The command '" + commandNoPrefix + "' does not exist!");
+			}
+			LOGGER.warning("No handler registered for admin command '" + command + "'");
+			return;
+		}
+		
+		if (!AdminData.getInstance().hasAccess(command, player.getAccessLevel()))
+		{
+			player.sendMessage("You don't have the access rights to use this command!");
+			LOGGER.warning("Player " + player.getName() + " tried to use admin command '" + command + "', without proper access level!");
+			return;
+		}
+		
+		if (useConfirm && AdminData.getInstance().requireConfirm(command))
+		{
+			player.setAdminConfirmCmd(fullCommand);
+			final ConfirmDlg dlg = new ConfirmDlg(SystemMessageId.S1_3);
+			dlg.addString("Are you sure you want execute command '" + commandNoPrefix + "' ?");
+			player.addAction(PlayerAction.ADMIN_COMMAND);
+			player.sendPacket(dlg);
+		}
+		else
+		{
+			// Admin Commands must run through a long running task, otherwise a command that takes too much time will freeze the server, this way you'll feel only a minor spike.
+			ThreadPool.execute(() ->
+			{
+				final long begin = System.currentTimeMillis();
+				try
+				{
+					if (Config.GMAUDIT)
+					{
+						final L2Object target = player.getTarget();
+						GMAudit.auditGMAction(player.getName() + " [" + player.getObjectId() + "]", fullCommand, (target != null ? target.getName() : "no-target"));
+					}
+					
+					handler.useAdminCommand(fullCommand, player);
+				}
+				catch (RuntimeException e)
+				{
+					player.sendMessage("Exception during execution of  '" + fullCommand + "': " + e.toString());
+					LOGGER.warning("Exception during execution of " + fullCommand + " " + e);
+				}
+				finally
+				{
+					final long runtime = System.currentTimeMillis() - begin;
+					
+					if (runtime < 5000)
+					{
+						return;
+					}
+					
+					player.sendMessage("The execution of '" + fullCommand + "' took " + TimeAmountInterpreter.consolidateMillis(runtime) + ".");
+				}
+			});
+		}
 	}
 	
 	@Override
@@ -63,11 +152,11 @@ public class AdminCommandHandler implements IHandler<IAdminCommandHandler, Strin
 	
 	public static AdminCommandHandler getInstance()
 	{
-		return SingletonHolder._instance;
+		return SingletonHolder.INSTANCE;
 	}
 	
 	private static class SingletonHolder
 	{
-		protected static final AdminCommandHandler _instance = new AdminCommandHandler();
+		protected static final AdminCommandHandler INSTANCE = new AdminCommandHandler();
 	}
 }
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
index 271573d543..58da85f464 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
@@ -98,8 +98,6 @@ import com.l2jmobius.gameserver.enums.SubclassInfoType;
 import com.l2jmobius.gameserver.enums.Team;
 import com.l2jmobius.gameserver.enums.UserInfoType;
 import com.l2jmobius.gameserver.geoengine.GeoEngine;
-import com.l2jmobius.gameserver.handler.AdminCommandHandler;
-import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.handler.IItemHandler;
 import com.l2jmobius.gameserver.handler.ItemHandler;
 import com.l2jmobius.gameserver.idfactory.IdFactory;
@@ -337,7 +335,6 @@ import com.l2jmobius.gameserver.taskmanager.AttackStanceTaskManager;
 import com.l2jmobius.gameserver.util.Broadcast;
 import com.l2jmobius.gameserver.util.EnumIntBitmask;
 import com.l2jmobius.gameserver.util.FloodProtectors;
-import com.l2jmobius.gameserver.util.GMAudit;
 import com.l2jmobius.gameserver.util.Util;
 
 /**
@@ -9989,8 +9986,9 @@ public final class L2PcInstance extends L2Playable
 	{
 		startWarnUserTakeBreak();
 		
-		if (isGM())
+		if (isGM() && !Config.GM_STARTUP_BUILDER_HIDE)
 		{
+			// Bleah, see L2J custom below.
 			if (isInvul())
 			{
 				sendMessage("Entering world in Invulnerable mode.");
@@ -13631,50 +13629,6 @@ public final class L2PcInstance extends L2Playable
 		return (super.isVisibleFor(player) || ((player.getParty() != null) && (player.getParty() == getParty())));
 	}
 	
-	/**
-	 * @param fullCommand
-	 */
-	public void useAdminCommand(String fullCommand)
-	{
-		final String command = fullCommand.split(" ")[0];
-		
-		final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(command);
-		if (ach == null)
-		{
-			if (isGM())
-			{
-				sendMessage("The command " + command.substring(6) + " does not exist!");
-			}
-			LOGGER.warning("No handler registered for admin command '" + command + "'");
-			return;
-		}
-		
-		if (!AdminData.getInstance().hasAccess(command, getAccessLevel()))
-		{
-			sendMessage("You don't have the access rights to use this command!");
-			LOGGER.warning("Character " + getName() + " tried to use admin command " + command + ", without proper access level!");
-			return;
-		}
-		
-		if (AdminData.getInstance().requireConfirm(command))
-		{
-			setAdminConfirmCmd(fullCommand);
-			final ConfirmDlg dlg = new ConfirmDlg(SystemMessageId.S1_3);
-			dlg.addString("Are you sure you want execute command " + fullCommand.substring(6) + " ?");
-			addAction(PlayerAction.ADMIN_COMMAND);
-			sendPacket(dlg);
-		}
-		else
-		{
-			if (Config.GMAUDIT)
-			{
-				GMAudit.auditGMAction(getName() + " [" + getObjectId() + "]", fullCommand, (getTarget() != null ? getTarget().getName() : "no-target"));
-			}
-			
-			ach.useAdminCommand(fullCommand, this);
-		}
-	}
-	
 	/**
 	 * Set the Quest zone ID.
 	 * @param id the quest zone ID
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java
index f1eefdc748..2dd69a67f8 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java
@@ -16,12 +16,9 @@
  */
 package com.l2jmobius.gameserver.network.clientpackets;
 
-import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketReader;
-import com.l2jmobius.gameserver.data.xml.impl.AdminData;
 import com.l2jmobius.gameserver.enums.PlayerAction;
 import com.l2jmobius.gameserver.handler.AdminCommandHandler;
-import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.events.EventDispatcher;
 import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerDlgAnswer;
@@ -30,7 +27,6 @@ import com.l2jmobius.gameserver.model.holders.DoorRequestHolder;
 import com.l2jmobius.gameserver.model.holders.SummonRequestHolder;
 import com.l2jmobius.gameserver.network.L2GameClient;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.util.GMAudit;
 
 /**
  * @author Dezmond_snz
@@ -75,16 +71,9 @@ public final class DlgAnswer implements IClientIncomingPacket
 				{
 					return;
 				}
-				final String command = cmd.split(" ")[0];
-				final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(command);
-				if (AdminData.getInstance().hasAccess(command, activeChar.getAccessLevel()))
-				{
-					if (Config.GMAUDIT)
-					{
-						GMAudit.auditGMAction(activeChar.getName() + " [" + activeChar.getObjectId() + "]", cmd, (activeChar.getTarget() != null ? activeChar.getTarget().getName() : "no-target"));
-					}
-					ach.useAdminCommand(cmd, activeChar);
-				}
+				
+				// The 'useConfirm' must be disabled here, as we don't want to repeat that process.
+				AdminCommandHandler.getInstance().useAdminCommand(activeChar, cmd, false);
 			}
 		}
 		else if ((_messageId == SystemMessageId.C1_IS_ATTEMPTING_TO_DO_A_RESURRECTION_THAT_RESTORES_S2_S3_XP_ACCEPT.getId()) || (_messageId == SystemMessageId.YOUR_CHARM_OF_COURAGE_IS_TRYING_TO_RESURRECT_YOU_WOULD_YOU_LIKE_TO_RESURRECT_NOW.getId()))
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index d6195e0635..4d7cdbeb61 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -102,6 +102,7 @@ import com.l2jmobius.gameserver.network.serverpackets.attendance.ExVipAttendance
 import com.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward;
 import com.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList;
 import com.l2jmobius.gameserver.network.serverpackets.friend.L2FriendList;
+import com.l2jmobius.gameserver.util.BuilderUtil;
 
 /**
  * Enter World Packet Handler
@@ -209,35 +210,50 @@ public class EnterWorld implements IClientIncomingPacket
 		// Apply special GM properties to the GM when entering
 		if (activeChar.isGM())
 		{
-			if (Config.GM_STARTUP_INVULNERABLE && AdminData.getInstance().hasAccess("admin_invul", activeChar.getAccessLevel()))
+			gmStartupProcess:
 			{
-				activeChar.setIsInvul(true);
-			}
-			
-			if (Config.GM_STARTUP_INVISIBLE && AdminData.getInstance().hasAccess("admin_invisible", activeChar.getAccessLevel()))
-			{
-				activeChar.setInvisible(true);
-				activeChar.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.STEALTH);
-			}
-			
-			if (Config.GM_STARTUP_SILENCE && AdminData.getInstance().hasAccess("admin_silence", activeChar.getAccessLevel()))
-			{
-				activeChar.setSilenceMode(true);
-			}
-			
-			if (Config.GM_STARTUP_DIET_MODE && AdminData.getInstance().hasAccess("admin_diet", activeChar.getAccessLevel()))
-			{
-				activeChar.setDietMode(true);
-				activeChar.refreshOverloaded(true);
-			}
-			
-			if (Config.GM_STARTUP_AUTO_LIST && AdminData.getInstance().hasAccess("admin_gmliston", activeChar.getAccessLevel()))
-			{
-				AdminData.getInstance().addGm(activeChar, false);
-			}
-			else
-			{
-				AdminData.getInstance().addGm(activeChar, true);
+				if (Config.GM_STARTUP_BUILDER_HIDE && AdminData.getInstance().hasAccess("admin_hide", activeChar.getAccessLevel()))
+				{
+					BuilderUtil.setHiding(activeChar, true);
+					
+					BuilderUtil.sendSysMessage(activeChar, "hide is default for builder.");
+					BuilderUtil.sendSysMessage(activeChar, "FriendAddOff is default for builder.");
+					BuilderUtil.sendSysMessage(activeChar, "whisperoff is default for builder.");
+					
+					// It isn't recommend to use the below custom L2J GMStartup functions together with retail-like GMStartupBuilderHide, so breaking the process at that stage.
+					break gmStartupProcess;
+				}
+				
+				if (Config.GM_STARTUP_INVULNERABLE && AdminData.getInstance().hasAccess("admin_invul", activeChar.getAccessLevel()))
+				{
+					activeChar.setIsInvul(true);
+				}
+				
+				if (Config.GM_STARTUP_INVISIBLE && AdminData.getInstance().hasAccess("admin_invisible", activeChar.getAccessLevel()))
+				{
+					activeChar.setInvisible(true);
+					activeChar.getEffectList().startAbnormalVisualEffect(AbnormalVisualEffect.STEALTH);
+				}
+				
+				if (Config.GM_STARTUP_SILENCE && AdminData.getInstance().hasAccess("admin_silence", activeChar.getAccessLevel()))
+				{
+					activeChar.setSilenceMode(true);
+				}
+				
+				if (Config.GM_STARTUP_DIET_MODE && AdminData.getInstance().hasAccess("admin_diet", activeChar.getAccessLevel()))
+				{
+					activeChar.setDietMode(true);
+					activeChar.refreshOverloaded(true);
+				}
+				
+				if (Config.GM_STARTUP_AUTO_LIST && AdminData.getInstance().hasAccess("admin_gmliston", activeChar.getAccessLevel()))
+				{
+					AdminData.getInstance().addGm(activeChar, false);
+				}
+				else
+				{
+					AdminData.getInstance().addGm(activeChar, true);
+				}
 			}
 			
 			if (Config.GM_GIVE_SPECIAL_SKILLS)
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java
index 7621a7029e..27753dcf85 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java
@@ -23,6 +23,7 @@ import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.data.xml.impl.MultisellData;
+import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.BypassHandler;
 import com.l2jmobius.gameserver.handler.CommunityBoardHandler;
 import com.l2jmobius.gameserver.handler.IBypassHandler;
@@ -133,7 +134,7 @@ public final class RequestBypassToServer implements IClientIncomingPacket
 		{
 			if (_command.startsWith("admin_"))
 			{
-				activeChar.useAdminCommand(_command);
+				AdminCommandHandler.getInstance().useAdminCommand(activeChar, _command, true);
 			}
 			else if (CommunityBoardHandler.getInstance().isCommunityBoardCommand(_command))
 			{
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
index 9805ae3e39..b6b85e45d9 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java
@@ -24,6 +24,7 @@ import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
 import com.l2jmobius.commons.network.PacketReader;
 import com.l2jmobius.gameserver.enums.PrivateStoreType;
+import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.instancemanager.CursedWeaponsManager;
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.L2World;
@@ -107,7 +108,7 @@ public final class RequestDestroyItem implements IClientIncomingPacket
 					{
 						count = ((L2ItemInstance) obj).getCount();
 					}
-					activeChar.useAdminCommand("admin_delete_item " + _objectId + " " + count);
+					AdminCommandHandler.getInstance().useAdminCommand(activeChar, "admin_delete_item " + _objectId + " " + count, true);
 				}
 				return;
 			}
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialLinkHtml.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialLinkHtml.java
index e230c6ec10..eac5eea401 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialLinkHtml.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialLinkHtml.java
@@ -17,6 +17,7 @@
 package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
+import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.BypassHandler;
 import com.l2jmobius.gameserver.handler.IBypassHandler;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -45,7 +46,7 @@ public class RequestTutorialLinkHtml implements IClientIncomingPacket
 		
 		if (_bypass.startsWith("admin_"))
 		{
-			player.useAdminCommand(_bypass);
+			AdminCommandHandler.getInstance().useAdminCommand(player, _bypass, true);
 		}
 		else
 		{
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialPassCmdToServer.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialPassCmdToServer.java
index 3b9d386e05..dc2e10cc02 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialPassCmdToServer.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestTutorialPassCmdToServer.java
@@ -17,6 +17,7 @@
 package com.l2jmobius.gameserver.network.clientpackets;
 
 import com.l2jmobius.commons.network.PacketReader;
+import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.BypassHandler;
 import com.l2jmobius.gameserver.handler.IBypassHandler;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -46,7 +47,7 @@ public class RequestTutorialPassCmdToServer implements IClientIncomingPacket
 		
 		if (_bypass.startsWith("admin_"))
 		{
-			player.useAdminCommand(_bypass);
+			AdminCommandHandler.getInstance().useAdminCommand(player, _bypass, true);
 		}
 		else
 		{
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java
index 2255ca3502..2487fbe4a4 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java
@@ -16,14 +16,10 @@
  */
 package com.l2jmobius.gameserver.network.clientpackets;
 
-import com.l2jmobius.Config;
 import com.l2jmobius.commons.network.PacketReader;
-import com.l2jmobius.gameserver.data.xml.impl.AdminData;
 import com.l2jmobius.gameserver.handler.AdminCommandHandler;
-import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.network.L2GameClient;
-import com.l2jmobius.gameserver.util.GMAudit;
 
 /**
  * This class handles all GM commands triggered by //command
@@ -56,33 +52,6 @@ public final class SendBypassBuildCmd implements IClientIncomingPacket
 			return;
 		}
 		
-		final String command = "admin_" + _command.split(" ")[0];
-		
-		final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(command);
-		
-		if (ach == null)
-		{
-			if (activeChar.isGM())
-			{
-				activeChar.sendMessage("The command " + command.substring(6) + " does not exists!");
-			}
-			
-			LOGGER.warning("No handler registered for admin command '" + command + "'");
-			return;
-		}
-		
-		if (!AdminData.getInstance().hasAccess(command, activeChar.getAccessLevel()))
-		{
-			activeChar.sendMessage("You don't have the access right to use this command!");
-			LOGGER.warning("Character " + activeChar.getName() + " tryed to use admin command " + command + ", but have no access to it!");
-			return;
-		}
-		
-		if (Config.GMAUDIT)
-		{
-			GMAudit.auditGMAction(activeChar.getName() + " [" + activeChar.getObjectId() + "]", _command, (activeChar.getTarget() != null ? activeChar.getTarget().getName() : "no-target"));
-		}
-		
-		ach.useAdminCommand("admin_" + _command, activeChar);
+		AdminCommandHandler.getInstance().useAdminCommand(activeChar, "admin_" + _command, true);
 	}
 }
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java
index 8ae98bd315..274245a42a 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java
@@ -27,6 +27,7 @@ import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.ai.NextAction;
 import com.l2jmobius.gameserver.enums.ItemSkillType;
 import com.l2jmobius.gameserver.enums.PrivateStoreType;
+import com.l2jmobius.gameserver.handler.AdminCommandHandler;
 import com.l2jmobius.gameserver.handler.IItemHandler;
 import com.l2jmobius.gameserver.handler.ItemHandler;
 import com.l2jmobius.gameserver.instancemanager.FortSiegeManager;
@@ -95,7 +96,7 @@ public final class UseItem implements IClientIncomingPacket
 				final L2Object obj = L2World.getInstance().findObject(_objectId);
 				if (obj instanceof L2ItemInstance)
 				{
-					activeChar.useAdminCommand("admin_use_item " + _objectId);
+					AdminCommandHandler.getInstance().useAdminCommand(activeChar, "admin_use_item " + _objectId, true);
 				}
 			}
 			return;
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/util/BuilderUtil.java
new file mode 100644
index 0000000000..5d813d36b4
--- /dev/null
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/util/BuilderUtil.java
@@ -0,0 +1,72 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jmobius.gameserver.util;
+
+import com.l2jmobius.gameserver.enums.ChatType;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.network.serverpackets.CreatureSay;
+import com.l2jmobius.gameserver.network.serverpackets.ExUserInfoAbnormalVisualEffect;
+
+/**
+ * @author lord_rex
+ */
+public final class BuilderUtil
+{
+	private BuilderUtil()
+	{
+		// utility class
+	}
+	
+	/**
+	 * Sends builder system message to the player.
+	 * @param player
+	 * @param message
+	 */
+	public static void sendSysMessage(L2PcInstance player, String message)
+	{
+		player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "SYS", message));
+	}
+	
+	/**
+	 * Changes player's hiding state.
+	 * @param player
+	 * @param hide
+	 * @return {@code true} if hide state was changed, otherwise {@code false}
+	 */
+	public static boolean setHiding(L2PcInstance player, boolean hide)
+	{
+		if (player.isInvisible() && hide)
+		{
+			// already hiding
+			return false;
+		}
+		
+		if (!player.isInvisible() && !hide)
+		{
+			// already visible
+			return false;
+		}
+		
+		player.setSilenceMode(hide);
+		player.setIsInvul(hide);
+		player.setInvisible(hide);
+		
+		player.broadcastUserInfo();
+		player.sendPacket(new ExUserInfoAbnormalVisualEffect(player));
+		return true;
+	}
+}
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/util/TimeAmountInterpreter.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/util/TimeAmountInterpreter.java
new file mode 100644
index 0000000000..a9f8029b98
--- /dev/null
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/util/TimeAmountInterpreter.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 1999 CERN - European Organization for Nuclear Research.
+ * 
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear in
+ * supporting documentation. CERN makes no representations about the
+ * suitability of this software for any purpose. It is provided "as is"
+ * without expressed or implied warranty.
+ */
+package com.l2jmobius.gameserver.util;
+
+import static java.util.concurrent.TimeUnit.DAYS;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
+
+import java.io.IOException;
+import java.util.Locale;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Allows to present time intervals in a standardized, user friendly manner.
+ * @author _dev_
+ */
+public class TimeAmountInterpreter
+{
+	private static final TimeUnit[] UNIT_CACHE = TimeUnit.values();
+	
+	private TimeAmountInterpreter()
+	{
+		// utility class
+	}
+	
+	/**
+	 * Calls {@link #consolidate(long, TimeUnit)} with {@link TimeUnit#NANOSECONDS}.
+	 * @param timeAmountInNanos amount of time in nanoseconds
+	 * @return an user-friendly description of the given time amount
+	 */
+	public static String consolidateNanos(long timeAmountInNanos)
+	{
+		return consolidate(timeAmountInNanos, NANOSECONDS);
+	}
+	
+	/**
+	 * Calls {@link #consolidate(long, TimeUnit)} with {@link TimeUnit#MILLISECONDS}.
+	 * @param timeAmountInMillis amount of time in milliseconds
+	 * @return an user-friendly description of the given time amount
+	 */
+	public static String consolidateMillis(long timeAmountInMillis)
+	{
+		return consolidate(timeAmountInMillis, MILLISECONDS);
+	}
+	
+	/**
+	 * Constructs an user-friendly description of the given amount of time, specifying the number of days (if any), hours (if any), minutes (if any), seconds (if any) and milliseconds (if any). Otherwise, returns the string value {@code 0}.
+	 * @param timeAmount amount of time to be written
+	 * @param timeUnit unit of the given amount
+	 * @return an user-friendly description of the given time amount
+	 */
+	public static String consolidate(long timeAmount, TimeUnit timeUnit)
+	{
+		return consolidate(timeAmount, timeUnit, timeUnit, DAYS, "0 " + timeUnit.name().toLowerCase(Locale.ENGLISH));
+	}
+	
+	/**
+	 * Constructs an user-friendly description of the given amount of time.
+	 * @param timeAmount amount of time to be written
+	 * @param timeUnit unit of the given amount
+	 * @param minConsolidationUnit smallest unit to be included within the description
+	 * @param maxConsolidationUnit largest unit to be included within the description
+	 * @param noTimeUsedIndicator text to be written if the amount is not positive
+	 * @return an user-friendly description of the given time amount
+	 */
+	public static String consolidate(long timeAmount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator)
+	{
+		return appendConsolidated(new StringBuilder(), timeAmount, timeUnit, minConsolidationUnit, maxConsolidationUnit, noTimeUsedIndicator).toString();
+	}
+	
+	/**
+	 * Appends an user-friendly description of the given amount of time to the specified text builder.<BR>
+	 * <BR>
+	 * Please keep in mind, that this method is primarily designed to be used with heap text builders. Therefore, if the given text builder throws an {@link IOException}, this exception will be wrapped in a {@link RuntimeException} and returned to the caller as an unchecked exception.
+	 * @param <T>
+	 * @param textBuilder a character sequence builder
+	 * @param timeAmount amount of time to be written
+	 * @param timeUnit unit of the given amount
+	 * @param minConsolidationUnit smallest unit to be included within the description
+	 * @param maxConsolidationUnit largest unit to be included within the description
+	 * @param noTimeUsedIndicator text to be written if the amount is not positive
+	 * @return {@code textBuilder}
+	 * @throws RuntimeException if {@code textBuilder} throws an {@link IOException}
+	 */
+	@SuppressWarnings("unchecked")
+	public static <T extends Appendable & CharSequence> T appendConsolidated(T textBuilder, long timeAmount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator) throws RuntimeException
+	{
+		try
+		{
+			if (timeAmount < 1)
+			{
+				return (T) textBuilder.append(noTimeUsedIndicator);
+			}
+			
+			final int len = textBuilder.length();
+			for (int i = maxConsolidationUnit.ordinal(); i >= minConsolidationUnit.ordinal(); --i)
+			{
+				final TimeUnit activeUnit = UNIT_CACHE[i];
+				final long num = activeUnit.convert(timeAmount, timeUnit);
+				if (num == 0)
+				{
+					continue;
+				}
+				
+				if (textBuilder.length() > len)
+				{
+					textBuilder.append(", ");
+				}
+				textBuilder.append(String.valueOf(num)).append(' ');
+				final String unit = activeUnit.name().toLowerCase(Locale.ENGLISH);
+				textBuilder.append(unit, 0, num == 1 ? unit.length() - 1 : unit.length());
+				
+				timeAmount -= timeUnit.convert(num, activeUnit);
+			}
+			
+			if (textBuilder.length() == len)
+			{
+				return (T) textBuilder.append(noTimeUsedIndicator).append(' ').append(minConsolidationUnit.name().toLowerCase(Locale.ENGLISH));
+			}
+		}
+		catch (IOException e)
+		{
+			throw new RuntimeException(e);
+		}
+		return textBuilder;
+	}
+}