diff --git a/trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/AwakeningMaster.java b/trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/AwakeningMaster.java
index ff92fc74aa..cb6a96d59a 100644
--- a/trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/AwakeningMaster.java
+++ b/trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/AwakeningMaster.java
@@ -66,6 +66,8 @@ public final class AwakeningMaster extends AbstractNpcAI
 	private final static int NAVIAROPE_POWER = 32269;
 	private final static int LEISTER_POWER = 32270;
 	private final static int LAKCIS_POWER = 32271;
+	// Other
+	private final static int AWAKENING_END_USM_ID = 10;
 	
 	private AwakeningMaster()
 	{
@@ -283,7 +285,7 @@ public final class AwakeningMaster extends AbstractNpcAI
 		
 		ThreadPoolManager.getInstance().scheduleGeneral(() ->
 		{
-			player.sendPacket(ExShowUsm.AWAKENING_END);
+			player.sendPacket(new ExShowUsm(AWAKENING_END_USM_ID));
 		}, 10000);
 	}
 	
diff --git a/trunk/dist/game/data/scripts/quests/Q10732_AForeignLand/Q10732_AForeignLand.java b/trunk/dist/game/data/scripts/quests/Q10732_AForeignLand/Q10732_AForeignLand.java
index 2a7c8fe5d5..0ad0d83d27 100644
--- a/trunk/dist/game/data/scripts/quests/Q10732_AForeignLand/Q10732_AForeignLand.java
+++ b/trunk/dist/game/data/scripts/quests/Q10732_AForeignLand/Q10732_AForeignLand.java
@@ -34,6 +34,7 @@ public class Q10732_AForeignLand extends Quest
 	private static final int GERETH = 33932;
 	// Misc
 	private static final int MAX_LEVEL = 20;
+	private final static int ERTHEIA_FIRST_QUEST_USM_ID = 14;
 	
 	public Q10732_AForeignLand()
 	{
@@ -60,7 +61,7 @@ public class Q10732_AForeignLand extends Quest
 			case "33931-03.html":
 			{
 				qs.startQuest();
-				player.sendPacket(ExShowUsm.ERTHEIA_FIRST_QUEST);
+				player.sendPacket(new ExShowUsm(ERTHEIA_FIRST_QUEST_USM_ID));
 				htmltext = event;
 				break;
 			}
diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index d31af39eb3..ca50036e33 100644
--- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -110,10 +110,12 @@ import com.l2jmobius.gameserver.network.serverpackets.friend.L2FriendList;
  */
 public class EnterWorld extends L2GameClientPacket
 {
-	private static final String _C__11_ENTERWORLD = "[C] 11 EnterWorld";
-	
+	private final static String _C__11_ENTERWORLD = "[C] 11 EnterWorld";
 	private final int[][] tracert = new int[5][4];
 	
+	private final static int ERTHEIA_INTRO_FOR_ERTHEIA_USM_ID = 147;
+	private final static int ERTHEIA_INTRO_FOR_OTHERS_USM_ID = 148;
+	
 	@Override
 	protected void readImpl()
 	{
@@ -474,11 +476,11 @@ public class EnterWorld extends L2GameClientPacket
 			activeChar.getVariables().remove("intro_god_video");
 			if (activeChar.getRace() == Race.ERTHEIA)
 			{
-				activeChar.sendPacket(ExShowUsm.ERTHEIA_INTRO_FOR_ERTHEIA);
+				activeChar.sendPacket(new ExShowUsm(ERTHEIA_INTRO_FOR_ERTHEIA_USM_ID));
 			}
 			else
 			{
-				activeChar.sendPacket(ExShowUsm.ERTHEIA_INTRO_FOR_OTHERS);
+				activeChar.sendPacket(new ExShowUsm(ERTHEIA_INTRO_FOR_OTHERS_USM_ID));
 			}
 		}
 		
diff --git a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java
index 3514ef155b..64bf866d07 100644
--- a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java
+++ b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExShowUsm.java
@@ -21,15 +21,9 @@ package com.l2jmobius.gameserver.network.serverpackets;
  */
 public class ExShowUsm extends L2GameServerPacket
 {
-	public static final ExShowUsm GOD_INTRO = new ExShowUsm(2);
-	public static final ExShowUsm AWAKENING_END = new ExShowUsm(10);
-	public static final ExShowUsm ERTHEIA_FIRST_QUEST = new ExShowUsm(14);
-	public static final ExShowUsm ERTHEIA_INTRO_FOR_ERTHEIA = new ExShowUsm(147);
-	public static final ExShowUsm ERTHEIA_INTRO_FOR_OTHERS = new ExShowUsm(148);
-	
 	private final int _videoId;
 	
-	private ExShowUsm(int videoId)
+	public ExShowUsm(int videoId)
 	{
 		_videoId = videoId;
 	}
@@ -39,7 +33,6 @@ public class ExShowUsm extends L2GameServerPacket
 	{
 		writeC(0xFE);
 		writeH(0x109);
-		
 		writeD(_videoId);
 	}
 }