diff --git a/CHANGELOG.md b/CHANGELOG.md
index a4e3ddc3b..e7cb88ebb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+# 2.5.4
+## New
+- Updated for Hearthstone 27.2.2
+## Fixes
+- Fixed turn timer, card turn number, etc... not updating after previous change
+- Fixed Tier 7 pre lobby showing as disabled
+- Added missing Caverns of Time icon.
+## Bob's Buddy
+- Fixed an issue with a player having multiple Recurring Nightmares.
+- Fixed various card issues related to cards updated in Hearthstone 27.2.2.
+
 # 2.5.3
 ## New
 **Bob's Buddy**
diff --git a/HSTracker.xcodeproj/project.pbxproj b/HSTracker.xcodeproj/project.pbxproj
index 5b2a6f726..2c919347c 100644
--- a/HSTracker.xcodeproj/project.pbxproj
+++ b/HSTracker.xcodeproj/project.pbxproj
@@ -3946,7 +3946,7 @@
 				);
 				LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/downloaded-frameworks/mono/runtimes/osx-x64/native";
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 2.5.3;
+				MARKETING_VERSION = 2.5.4;
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_CODE_SIGN_FLAGS = "--deep";
 				OTHER_LDFLAGS = "$(inherited)";
@@ -3991,7 +3991,7 @@
 				);
 				LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/downloaded-frameworks/mono/runtimes/osx-x64/native";
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 2.5.3;
+				MARKETING_VERSION = 2.5.4;
 				OTHER_CODE_SIGN_FLAGS = "--deep";
 				OTHER_LDFLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = net.hearthsim.hstracker;
diff --git a/HSTracker/HearthMirror-version.txt b/HSTracker/HearthMirror-version.txt
index acb2369ed..e4b2cedc9 100644
--- a/HSTracker/HearthMirror-version.txt
+++ b/HSTracker/HearthMirror-version.txt
@@ -1 +1 @@
-9217a3effd6e3a2fb35f43cbcb82fbdea477baa4
+9a2b42db04c0044c245f3adba39d66e4c3bf9153
diff --git a/HSTracker/Logging/Enums/GameTag.swift b/HSTracker/Logging/Enums/GameTag.swift
index d623d3e7e..d56098825 100644
--- a/HSTracker/Logging/Enums/GameTag.swift
+++ b/HSTracker/Logging/Enums/GameTag.swift
@@ -351,6 +351,7 @@ enum GameTag: Int, WrappableEnum, CaseIterable, Codable {
     sidequest = 1192,
     mega_windfury = 1207,
     creator_dbid = 1284,
+    bacon_dummy_player = 1349,
     allow_move_minion = 1356,
     next_opponent_player_id = 1360,
     invoke_counter = 1366,
diff --git a/HSTracker/Logging/Parsers/PowerGameStateParser.swift b/HSTracker/Logging/Parsers/PowerGameStateParser.swift
index fbb0d6942..57677e86e 100644
--- a/HSTracker/Logging/Parsers/PowerGameStateParser.swift
+++ b/HSTracker/Logging/Parsers/PowerGameStateParser.swift
@@ -134,7 +134,7 @@ class PowerGameStateParser: LogEventParser {
                 var entity = eventHandler.entities.values
                     .first { $0.name == rawEntity }
 
-                if let entity = entity {
+                    if let entity = entity {
                     tagChangeHandler.tagChange(eventHandler: eventHandler, rawTag: tag,
                                                id: entity.id, rawValue: value)
                 } else {
@@ -167,6 +167,10 @@ class PowerGameStateParser: LogEventParser {
                             _tag == .current_player && tagValue == 0 {
                             entity = eventHandler.entities.values
                                 .first { $0.has(tag: .current_player) }
+                        } else if _tag == .hero_entity {
+                            if let bob = players.first(where: { x in x.has(tag: .bacon_dummy_player) }) {
+                                entity = bob
+                            }
                         }
 
                         if let entity = entity, let tmpEntity = tmpEntity {