diff --git a/src/ChatCommands.cc b/src/ChatCommands.cc
index e1a2f55a..35e9fd19 100644
--- a/src/ChatCommands.cc
+++ b/src/ChatCommands.cc
@@ -1373,7 +1373,7 @@ ChatCommandDefinition cc_loadchar(
         // TODO: Support extended player info on other versions
         auto s = a.c->require_server_state();
         if (!a.c->config.check_flag(Client::Flag::HAS_SEND_FUNCTION_CALL) ||
-            a.c->config.check_flag(Client::Flag::SEND_FUNCTION_CALL_CHECKSUM_ONLY)) {
+            !a.c->config.check_flag(Client::Flag::SEND_FUNCTION_CALL_ACTUALLY_RUNS_CODE)) {
           throw precondition_failed_printf("Can\'t load character\ndata on this game\nversion");
         }
 
@@ -1588,7 +1588,7 @@ ChatCommandDefinition cc_patch(
           send_function_call(c, fn, pca.label_writes);
           c->function_call_response_queue.emplace_back(empty_function_call_response_handler);
         } catch (const out_of_range&) {
-          throw precondition_failed("Invalid patch name");
+          send_text_message(c, "$C6Invalid patch name");
         }
       });
     },
@@ -1607,7 +1607,7 @@ ChatCommandDefinition cc_patch(
           // Don't forward the patch response to the server
           ses->function_call_return_handler_queue.emplace_back(empty_function_call_response_handler);
         } catch (const out_of_range&) {
-          throw precondition_failed("Invalid patch name");
+          send_text_message(ses->client_channel, "$C6Invalid patch name");
         }
       };
 
diff --git a/src/Client.cc b/src/Client.cc
index 40f453d6..1eacf8f3 100644
--- a/src/Client.cc
+++ b/src/Client.cc
@@ -51,20 +51,23 @@ void Client::Config::set_flags_for_version(Version version, int64_t sub_version)
         case Version::DC_V2:
           this->set_flag(Flag::NO_D6);
           this->set_flag(Flag::HAS_SEND_FUNCTION_CALL);
+          this->set_flag(Flag::SEND_FUNCTION_CALL_ACTUALLY_RUNS_CODE);
           this->set_flag(Flag::SEND_FUNCTION_CALL_NO_CACHE_PATCH);
           break;
         case Version::PC_NTE:
         case Version::PC_V2:
           this->set_flag(Flag::NO_D6);
           this->set_flag(Flag::HAS_SEND_FUNCTION_CALL);
-          this->set_flag(Flag::SEND_FUNCTION_CALL_CHECKSUM_ONLY);
+          // SEND_FUNCTION_CALL_ACTUALLY_RUNS_CODE not set here
           this->set_flag(Flag::SEND_FUNCTION_CALL_NO_CACHE_PATCH);
           break;
         case Version::GC_NTE:
           this->set_flag(Flag::HAS_SEND_FUNCTION_CALL);
+          this->set_flag(Flag::SEND_FUNCTION_CALL_ACTUALLY_RUNS_CODE);
           break;
         case Version::GC_EP3_NTE:
           this->set_flag(Flag::HAS_SEND_FUNCTION_CALL);
+          this->set_flag(Flag::SEND_FUNCTION_CALL_ACTUALLY_RUNS_CODE);
           this->set_flag(Flag::ENCRYPTED_SEND_FUNCTION_CALL);
           break;
         case Version::GC_V3:
@@ -76,6 +79,7 @@ void Client::Config::set_flags_for_version(Version version, int64_t sub_version)
           // TODO: Do all versions of XB need this flag? US does, at least.
           this->set_flag(Flag::NO_D6_AFTER_LOBBY);
           this->set_flag(Flag::HAS_SEND_FUNCTION_CALL);
+          this->set_flag(Flag::SEND_FUNCTION_CALL_ACTUALLY_RUNS_CODE);
           this->set_flag(Flag::SEND_FUNCTION_CALL_NO_CACHE_PATCH);
           break;
         default:
@@ -95,27 +99,32 @@ void Client::Config::set_flags_for_version(Version version, int64_t sub_version)
     case 0x28: // DCv2 EU 60Hz (presumably)
       this->set_flag(Flag::NO_D6);
       this->set_flag(Flag::HAS_SEND_FUNCTION_CALL);
+      this->set_flag(Flag::SEND_FUNCTION_CALL_ACTUALLY_RUNS_CODE);
       this->set_flag(Flag::SEND_FUNCTION_CALL_NO_CACHE_PATCH);
       break;
     case 0x29: // PC
       this->set_flag(Flag::NO_D6);
       this->set_flag(Flag::HAS_SEND_FUNCTION_CALL);
-      this->set_flag(Flag::SEND_FUNCTION_CALL_CHECKSUM_ONLY);
+      // SEND_FUNCTION_CALL_ACTUALLY_RUNS_CODE not set here
       this->set_flag(Flag::SEND_FUNCTION_CALL_NO_CACHE_PATCH);
+      this->set_flag(Flag::CAN_RECEIVE_ENABLE_B2_QUEST);
       break;
     case 0x30: // GC Ep1&2 GameJam demo, GC Ep1&2 Trial Edition, GC Ep1&2 JP v1.2, XB JP
     case 0x31: // GC Ep1&2 US v1.0, GC US v1.1, XB US
       this->set_flag(Flag::HAS_SEND_FUNCTION_CALL);
+      this->set_flag(Flag::SEND_FUNCTION_CALL_ACTUALLY_RUNS_CODE);
       break;
     case 0x32: // GC Ep1&2 EU 50Hz
     case 0x33: // GC Ep1&2 EU 60Hz
     case 0x34: // GC Ep1&2 JP v1.3
       this->set_flag(Flag::NO_D6_AFTER_LOBBY);
       this->set_flag(Flag::HAS_SEND_FUNCTION_CALL);
+      this->set_flag(Flag::SEND_FUNCTION_CALL_ACTUALLY_RUNS_CODE);
       break;
     case 0x35: // GC Ep1&2 JP v1.4 (Plus)
       this->set_flag(Flag::NO_D6_AFTER_LOBBY);
       this->set_flag(Flag::HAS_SEND_FUNCTION_CALL);
+      this->set_flag(Flag::SEND_FUNCTION_CALL_ACTUALLY_RUNS_CODE);
       this->set_flag(Flag::ENCRYPTED_SEND_FUNCTION_CALL);
       this->set_flag(Flag::SEND_FUNCTION_CALL_NO_CACHE_PATCH);
       break;
@@ -130,6 +139,7 @@ void Client::Config::set_flags_for_version(Version version, int64_t sub_version)
     case 0x40: // GC Ep3 JP and Trial Edition (and BB)
       this->set_flag(Flag::NO_D6_AFTER_LOBBY);
       this->set_flag(Flag::HAS_SEND_FUNCTION_CALL);
+      this->set_flag(Flag::SEND_FUNCTION_CALL_ACTUALLY_RUNS_CODE);
       this->set_flag(Flag::ENCRYPTED_SEND_FUNCTION_CALL);
       this->set_flag(Flag::SEND_FUNCTION_CALL_NO_CACHE_PATCH);
       // sub_version can't be used to tell JP final and Trial Edition apart; we
diff --git a/src/Client.hh b/src/Client.hh
index e9b902b0..3132fe06 100644
--- a/src/Client.hh
+++ b/src/Client.hh
@@ -46,7 +46,7 @@ public:
     // Flags describing the behavior for send_function_call
     HAS_SEND_FUNCTION_CALL                     = 0x0000000000001000,
     ENCRYPTED_SEND_FUNCTION_CALL               = 0x0000000000002000,
-    SEND_FUNCTION_CALL_CHECKSUM_ONLY           = 0x0000000000004000,
+    SEND_FUNCTION_CALL_ACTUALLY_RUNS_CODE      = 0x0000000000004000,
     SEND_FUNCTION_CALL_NO_CACHE_PATCH          = 0x0000000000008000,
     CAN_RECEIVE_ENABLE_B2_QUEST                = 0x0000000000020000,
     AWAITING_ENABLE_B2_QUEST                   = 0x0000000000040000, // Server-side only
diff --git a/src/FunctionCompiler.cc b/src/FunctionCompiler.cc
index 99d2ea95..08c51f51 100644
--- a/src/FunctionCompiler.cc
+++ b/src/FunctionCompiler.cc
@@ -311,7 +311,9 @@ FunctionCodeIndex::FunctionCodeIndex(const string& directory) {
             arch = CompiledFunctionCode::Architecture::SH4;
           } else if (specific_version_is_gc(specific_version)) {
             arch = CompiledFunctionCode::Architecture::POWERPC;
-          } else if (specific_version_is_xb(specific_version) || specific_version_is_bb(specific_version)) {
+          } else if (specific_version_is_pc_v2(specific_version) ||
+              specific_version_is_xb(specific_version) ||
+              specific_version_is_bb(specific_version)) {
             arch = CompiledFunctionCode::Architecture::X86;
           } else {
             throw runtime_error("unable to determine architecture from specific_version");
@@ -370,7 +372,7 @@ shared_ptr<const Menu> FunctionCodeIndex::patch_menu(uint32_t specific_version)
         fn->menu_item_id,
         fn->long_name.empty() ? fn->short_name : fn->long_name,
         fn->description,
-        MenuItem::Flag::REQUIRES_SEND_FUNCTION_CALL);
+        MenuItem::Flag::REQUIRES_SEND_FUNCTION_CALL_RUNS_CODE);
   }
   return ret;
 }
@@ -389,7 +391,7 @@ shared_ptr<const Menu> FunctionCodeIndex::patch_switches_menu(
     string name;
     name.push_back(auto_patches_enabled.count(fn->short_name) ? '*' : '-');
     name += fn->long_name.empty() ? fn->short_name : fn->long_name;
-    ret->items.emplace_back(fn->menu_item_id, name, fn->description, MenuItem::Flag::REQUIRES_SEND_FUNCTION_CALL);
+    ret->items.emplace_back(fn->menu_item_id, name, fn->description, MenuItem::Flag::REQUIRES_SEND_FUNCTION_CALL_RUNS_CODE);
   }
   return ret;
 }
@@ -479,7 +481,7 @@ DOLFileIndex::DOLFileIndex(const string& directory) {
       this->name_to_file.emplace(dol->name, dol);
       this->item_id_to_file.emplace_back(dol);
 
-      menu->items.emplace_back(dol->menu_item_id, dol->name, description, MenuItem::Flag::REQUIRES_SEND_FUNCTION_CALL);
+      menu->items.emplace_back(dol->menu_item_id, dol->name, description, MenuItem::Flag::REQUIRES_SEND_FUNCTION_CALL_RUNS_CODE);
 
     } catch (const exception& e) {
       function_compiler_log.warning("Failed to load DOL file %s: %s", filename.c_str(), e.what());
diff --git a/src/Menu.hh b/src/Menu.hh
index 064b8ea3..00be47c6 100644
--- a/src/Menu.hh
+++ b/src/Menu.hh
@@ -125,7 +125,7 @@ struct MenuItem {
     XB_ONLY = INVISIBLE_ON_DC | INVISIBLE_ON_PC | INVISIBLE_ON_GC | INVISIBLE_ON_BB,
     BB_ONLY = INVISIBLE_ON_DC | INVISIBLE_ON_PC | INVISIBLE_ON_GC | INVISIBLE_ON_XB,
     REQUIRES_MESSAGE_BOXES = 0x100,
-    REQUIRES_SEND_FUNCTION_CALL = 0x200,
+    REQUIRES_SEND_FUNCTION_CALL_RUNS_CODE = 0x200,
     REQUIRES_SAVE_DISABLED = 0x400,
     INVISIBLE_IN_INFO_MENU = 0x800,
   };
diff --git a/src/ReceiveCommands.cc b/src/ReceiveCommands.cc
index e30c14d1..f49946ca 100644
--- a/src/ReceiveCommands.cc
+++ b/src/ReceiveCommands.cc
@@ -374,13 +374,13 @@ static void send_main_menu(shared_ptr<Client> c) {
   if (!s->is_replay) {
     if (!s->function_code_index->patch_menu_empty(c->config.specific_version)) {
       main_menu->items.emplace_back(MainMenuItemID::PATCHES, "Patches",
-          "Change game\nbehaviors", MenuItem::Flag::INVISIBLE_ON_PC | MenuItem::Flag::REQUIRES_SEND_FUNCTION_CALL);
+          "Change game\nbehaviors", MenuItem::Flag::REQUIRES_SEND_FUNCTION_CALL_RUNS_CODE);
       main_menu->items.emplace_back(MainMenuItemID::PATCH_SWITCHES, "Patch switches",
-          "Automatically\napply patches every\ntime you connect", MenuItem::Flag::INVISIBLE_ON_PC | MenuItem::Flag::REQUIRES_SEND_FUNCTION_CALL);
+          "Automatically\napply patches every\ntime you connect", MenuItem::Flag::REQUIRES_SEND_FUNCTION_CALL_RUNS_CODE);
     }
     if (!s->dol_file_index->empty()) {
       main_menu->items.emplace_back(MainMenuItemID::PROGRAMS, "Programs",
-          "Run GameCube\nprograms", MenuItem::Flag::GC_ONLY | MenuItem::Flag::REQUIRES_SEND_FUNCTION_CALL | MenuItem::Flag::REQUIRES_SAVE_DISABLED);
+          "Run GameCube\nprograms", MenuItem::Flag::GC_ONLY | MenuItem::Flag::REQUIRES_SEND_FUNCTION_CALL_RUNS_CODE | MenuItem::Flag::REQUIRES_SAVE_DISABLED);
     }
   }
   main_menu->items.emplace_back(MainMenuItemID::DISCONNECT, "Disconnect",
@@ -427,30 +427,44 @@ void on_login_complete(shared_ptr<Client> c) {
       auto s = c->require_server_state();
 
       if (c->config.check_flag(Client::Flag::CAN_RECEIVE_ENABLE_B2_QUEST) &&
-          !c->config.check_flag(Client::Flag::HAS_SEND_FUNCTION_CALL)) {
+          (!c->config.check_flag(Client::Flag::HAS_SEND_FUNCTION_CALL) ||
+              !c->config.check_flag(Client::Flag::SEND_FUNCTION_CALL_ACTUALLY_RUNS_CODE))) {
         shared_ptr<const Quest> q;
         try {
           int64_t quest_num = s->enable_send_function_call_quest_numbers.at(c->config.specific_version);
           q = s->default_quest_index->get(quest_num);
         } catch (const out_of_range&) {
         }
-        if (q) {
+        if (!q) {
+          c->log.info("There is no quest to enable server function calls for specific version %08" PRIX32, c->config.specific_version);
+        } else if (q) {
           auto vq = q->version(is_ep3(c->version()) ? Version::GC_V3 : c->version(), 1);
           if (vq) {
             c->config.set_flag(Client::Flag::HAS_SEND_FUNCTION_CALL);
+            c->config.set_flag(Client::Flag::SEND_FUNCTION_CALL_ACTUALLY_RUNS_CODE);
             c->config.set_flag(Client::Flag::SEND_FUNCTION_CALL_NO_CACHE_PATCH);
             c->config.set_flag(Client::Flag::AWAITING_ENABLE_B2_QUEST);
             send_update_client_config(c, false);
 
-            c->log.info("Sending %c version of quest \"%s\"", char_for_language_code(vq->language), vq->name.c_str());
-            string bin_filename = vq->bin_filename();
-            string dat_filename = vq->dat_filename();
-            string xb_filename = vq->xb_filename();
-            send_open_quest_file(c, bin_filename, bin_filename, xb_filename, vq->quest_number, QuestFileType::ONLINE, vq->bin_contents);
-            send_open_quest_file(c, dat_filename, dat_filename, xb_filename, vq->quest_number, QuestFileType::ONLINE, vq->dat_contents);
+            // PCv2 will crash if it receives an online quest file while it's
+            // not in a game, so we have to put it into a fake game first
+            if (c->version() == Version::PC_V2) {
+              S_JoinGame_PC_64 cmd;
+              auto& lobby_data = cmd.lobby_data[0];
+              lobby_data.player_tag = 0x00010000;
+              lobby_data.guild_card_number = c->login->account->account_id;
+              send_command_t(c, 0x64, 0x01, cmd);
+            } else {
+              c->log.info("Sending %c version of quest \"%s\"", char_for_language_code(vq->language), vq->name.c_str());
+              string bin_filename = vq->bin_filename();
+              string dat_filename = vq->dat_filename();
+              string xb_filename = vq->xb_filename();
+              send_open_quest_file(c, bin_filename, bin_filename, xb_filename, vq->quest_number, QuestFileType::ONLINE, vq->bin_contents);
+              send_open_quest_file(c, dat_filename, dat_filename, xb_filename, vq->quest_number, QuestFileType::ONLINE, vq->dat_contents);
 
-            if (!is_v1_or_v2(c->version())) {
-              send_command(c, 0xAC, 0x00);
+              if (!is_v1_or_v2(c->version())) {
+                send_command(c, 0xAC, 0x00);
+              }
             }
           }
         }
@@ -1066,7 +1080,43 @@ static void on_9D_9E(shared_ptr<Client> c, uint16_t command, uint32_t, string& d
     c->should_disconnect = true;
   } else {
     send_update_client_config(c, true);
-    on_login_complete(c);
+    // On PCv2, we send a B2 command to get the client's specific_version and
+    // check whether it has patch support or not; we'll call on_login_complete
+    // once we receive the B3 response
+    if (c->version() == Version::PC_V2) {
+      try {
+        auto code = s->function_code_index->name_to_function.at("ReturnTokenX86");
+        send_function_call(c, code, {{"token", c->login->account->account_id}}, nullptr, 0, 0x00400000, 0x0000E000, 0, true);
+        c->function_call_response_queue.emplace_back([wc = weak_ptr<Client>(c)](uint32_t return_value, uint32_t checksum) -> void {
+          auto c = wc.lock();
+          if (!c) {
+            return;
+          }
+          if (!c->login) {
+            throw logic_error("received PC_V2 version detect response with no login");
+          }
+          if (return_value == c->login->account->account_id) {
+            // Client already has the patch that enables patches
+            c->config.set_flag(Client::Flag::HAS_SEND_FUNCTION_CALL);
+            c->config.set_flag(Client::Flag::SEND_FUNCTION_CALL_ACTUALLY_RUNS_CODE);
+            c->config.set_flag(Client::Flag::SEND_FUNCTION_CALL_NO_CACHE_PATCH);
+          }
+          if (checksum == 0x3677024C) {
+            c->config.specific_version = SPECIFIC_VERSION_PC_V2_DEFAULT;
+            c->log.info("Version detected as %08" PRIX32 " from PE header checksum %08" PRIX32,
+                c->config.specific_version, checksum);
+          } else {
+            c->config.specific_version = SPECIFIC_VERSION_PC_V2_INDETERMINATE;
+            c->log.info("Version cannot be determined from PE header checksum %08" PRIX32, checksum);
+          }
+          on_login_complete(c);
+        });
+      } catch (const out_of_range&) {
+        on_login_complete(c);
+      }
+    } else {
+      on_login_complete(c);
+    }
   }
 }
 
@@ -4714,15 +4764,49 @@ static void on_8A(shared_ptr<Client> c, uint16_t, uint32_t, string& data) {
 
   } else {
     check_size_v(data.size(), 0);
-    auto l = c->require_lobby();
-    send_lobby_name(c, l->name.c_str());
+    auto l = c->lobby.lock();
+    if (!l) {
+      if (c->config.check_flag(Client::Flag::AWAITING_ENABLE_B2_QUEST)) {
+        send_lobby_name(c, "");
+      } else {
+        throw std::runtime_error("received 8A command from client not in any lobby");
+      }
+    } else {
+      send_lobby_name(c, l->name.c_str());
+    }
   }
 }
 
 static void on_6F(shared_ptr<Client> c, uint16_t command, uint32_t, string& data) {
   check_size_v(data.size(), 0);
 
-  auto l = c->require_lobby();
+  auto l = c->lobby.lock();
+  if (!l) {
+    if (!c->config.check_flag(Client::Flag::AWAITING_ENABLE_B2_QUEST)) {
+      throw runtime_error("client is not in any lobby and is not awaiting a patch enabler quest");
+    }
+    auto s = c->require_server_state();
+    shared_ptr<const Quest> q;
+    try {
+      int64_t quest_num = s->enable_send_function_call_quest_numbers.at(c->config.specific_version);
+      q = s->default_quest_index->get(quest_num);
+    } catch (const out_of_range&) {
+      throw std::logic_error("cannot find patch enable quest after it was previously found during login");
+    }
+    auto vq = q->version(is_ep3(c->version()) ? Version::GC_V3 : c->version(), 1);
+    if (!vq) {
+      throw std::logic_error("cannot find patch enable quest version after it was previously found during login");
+    }
+    c->log.info("Sending %c version of quest \"%s\"", char_for_language_code(vq->language), vq->name.c_str());
+    string bin_filename = vq->bin_filename();
+    string dat_filename = vq->dat_filename();
+    string xb_filename = vq->xb_filename();
+    send_open_quest_file(c, bin_filename, bin_filename, xb_filename, vq->quest_number, QuestFileType::ONLINE, vq->bin_contents);
+    send_open_quest_file(c, dat_filename, dat_filename, xb_filename, vq->quest_number, QuestFileType::ONLINE, vq->dat_contents);
+    return;
+  }
+  // Now l is not null
+
   if (!l->is_game()) {
     throw runtime_error("client sent ready command outside of game");
   }
diff --git a/src/SendCommands.cc b/src/SendCommands.cc
index 4e0569c3..ac13f589 100644
--- a/src/SendCommands.cc
+++ b/src/SendCommands.cc
@@ -335,6 +335,7 @@ void prepare_client_for_patches(shared_ptr<Client> c, function<void()> on_comple
     if (!c) {
       return;
     }
+
     const char* version_detect_name = nullptr;
     if (c->version() == Version::DC_V2) {
       version_detect_name = "VersionDetectDC";
@@ -447,7 +448,8 @@ void send_function_call(
     size_t suffix_size,
     uint32_t checksum_addr,
     uint32_t checksum_size,
-    uint32_t override_relocations_offset) {
+    uint32_t override_relocations_offset,
+    bool ignore_actually_runs_code_flag) {
   return send_function_call(
       c->channel,
       c->config,
@@ -457,7 +459,8 @@ void send_function_call(
       suffix_size,
       checksum_addr,
       checksum_size,
-      override_relocations_offset);
+      override_relocations_offset,
+      ignore_actually_runs_code_flag);
 }
 
 void send_function_call(
@@ -469,11 +472,14 @@ void send_function_call(
     size_t suffix_size,
     uint32_t checksum_addr,
     uint32_t checksum_size,
-    uint32_t override_relocations_offset) {
+    uint32_t override_relocations_offset,
+    bool ignore_actually_runs_code_flag) {
   if (!client_config.check_flag(Client::Flag::HAS_SEND_FUNCTION_CALL)) {
     throw logic_error("client does not support function calls");
   }
-  if (code.get() && client_config.check_flag(Client::Flag::SEND_FUNCTION_CALL_CHECKSUM_ONLY)) {
+  if (!ignore_actually_runs_code_flag &&
+      code.get() &&
+      !client_config.check_flag(Client::Flag::SEND_FUNCTION_CALL_ACTUALLY_RUNS_CODE)) {
     throw logic_error("client only supports checksums in send_function_call");
   }
 
@@ -508,7 +514,7 @@ bool send_protected_command(std::shared_ptr<Client> c, const void* data, size_t
       auto s = c->require_server_state();
       if (!s->enable_v3_v4_protected_subcommands ||
           !c->config.check_flag(Client::Flag::HAS_SEND_FUNCTION_CALL) ||
-          c->config.check_flag(Client::Flag::SEND_FUNCTION_CALL_CHECKSUM_ONLY)) {
+          !c->config.check_flag(Client::Flag::SEND_FUNCTION_CALL_ACTUALLY_RUNS_CODE)) {
         return false;
       }
 
@@ -1426,8 +1432,8 @@ void send_menu_t(shared_ptr<Client> c, shared_ptr<const Menu> menu, bool is_info
     if (item.flags & MenuItem::Flag::REQUIRES_MESSAGE_BOXES) {
       is_visible &= !c->config.check_flag(Client::Flag::NO_D6);
     }
-    if (item.flags & MenuItem::Flag::REQUIRES_SEND_FUNCTION_CALL) {
-      is_visible &= c->config.check_flag(Client::Flag::HAS_SEND_FUNCTION_CALL);
+    if (item.flags & MenuItem::Flag::REQUIRES_SEND_FUNCTION_CALL_RUNS_CODE) {
+      is_visible &= (c->config.check_flag(Client::Flag::HAS_SEND_FUNCTION_CALL) && c->config.check_flag(Client::Flag::SEND_FUNCTION_CALL_ACTUALLY_RUNS_CODE));
     }
     if (item.flags & MenuItem::Flag::REQUIRES_SAVE_DISABLED) {
       is_visible &= !c->config.check_flag(Client::Flag::SAVE_ENABLED);
@@ -2402,7 +2408,7 @@ void send_get_player_info(shared_ptr<Client> c, bool request_extended) {
 
   if (request_extended &&
       c->config.check_flag(Client::Flag::HAS_SEND_FUNCTION_CALL) &&
-      !c->config.check_flag(Client::Flag::SEND_FUNCTION_CALL_CHECKSUM_ONLY)) {
+      c->config.check_flag(Client::Flag::SEND_FUNCTION_CALL_ACTUALLY_RUNS_CODE)) {
     auto s = c->require_server_state();
     prepare_client_for_patches(c, [wc = weak_ptr<Client>(c)]() {
       auto c = wc.lock();
diff --git a/src/SendCommands.hh b/src/SendCommands.hh
index 122b2944..a1783d7c 100644
--- a/src/SendCommands.hh
+++ b/src/SendCommands.hh
@@ -169,7 +169,8 @@ void send_function_call(
     size_t suffix_size = 0,
     uint32_t checksum_addr = 0,
     uint32_t checksum_size = 0,
-    uint32_t override_relocations_offset = 0);
+    uint32_t override_relocations_offset = 0,
+    bool ignore_actually_runs_code_flag = false);
 void send_function_call(
     std::shared_ptr<Client> c,
     std::shared_ptr<const CompiledFunctionCode> code,
@@ -178,7 +179,8 @@ void send_function_call(
     size_t suffix_size = 0,
     uint32_t checksum_addr = 0,
     uint32_t checksum_size = 0,
-    uint32_t override_relocations_offset = 0);
+    uint32_t override_relocations_offset = 0,
+    bool ignore_actually_runs_code_flag = false);
 bool send_protected_command(std::shared_ptr<Client> c, const void* data, size_t size, bool echo_to_lobby);
 
 void send_reconnect(std::shared_ptr<Client> c, uint32_t address, uint16_t port);
diff --git a/src/Version.cc b/src/Version.cc
index f863fc16..2c20ce0a 100644
--- a/src/Version.cc
+++ b/src/Version.cc
@@ -253,7 +253,7 @@ uint32_t default_specific_version_for_version(Version version, int64_t sub_versi
     case Version::DC_V2:
       return SPECIFIC_VERSION_DC_V2_INDETERMINATE; // 2___; need to send VersionDetectDC
     case Version::PC_V2:
-      return SPECIFIC_VERSION_PC_V2; // 2OJW
+      return SPECIFIC_VERSION_PC_V2_INDETERMINATE; // 2OJ_; need to send checksum command
     case Version::GC_NTE:
       return SPECIFIC_VERSION_GC_NTE; // 3OJT
     case Version::GC_V3:
@@ -310,7 +310,11 @@ bool specific_version_is_dc(uint32_t specific_version) {
   if (major_version < 0x31 || major_version > 0x32) {
     return false;
   }
-  return (specific_version != 0x324F4A57);
+  return (specific_version != SPECIFIC_VERSION_PC_V2_DEFAULT);
+}
+
+bool specific_version_is_pc_v2(uint32_t specific_version) {
+  return (specific_version == SPECIFIC_VERSION_PC_V2_DEFAULT);
 }
 
 bool specific_version_is_gc(uint32_t specific_version) {
diff --git a/src/Version.hh b/src/Version.hh
index d40c9a0c..0806f33b 100644
--- a/src/Version.hh
+++ b/src/Version.hh
@@ -191,7 +191,8 @@ constexpr uint32_t SPECIFIC_VERSION_DC_V1_US = 0x314F4546; // 1OEF
 constexpr uint32_t SPECIFIC_VERSION_DC_V1_EU_INDETERMINATE = 0x314F5000; // 1OP_
 constexpr uint32_t SPECIFIC_VERSION_DC_V1_INDETERMINATE = 0x31000000; // 1___
 constexpr uint32_t SPECIFIC_VERSION_DC_V2_INDETERMINATE = 0x32000000; // 2___
-constexpr uint32_t SPECIFIC_VERSION_PC_V2 = 0x324F4A57; // 2OJW
+constexpr uint32_t SPECIFIC_VERSION_PC_V2_INDETERMINATE = 0x324F4A00; // 2OJW
+constexpr uint32_t SPECIFIC_VERSION_PC_V2_DEFAULT = 0x324F4A57; // 2OJW
 constexpr uint32_t SPECIFIC_VERSION_GC_NTE = 0x334F4A54; // 3OJT
 constexpr uint32_t SPECIFIC_VERSION_GC_V3_EU = 0x334F5030; // 3OP0
 constexpr uint32_t SPECIFIC_VERSION_GC_V3_US_12 = 0x334F4532; // 3OE2
@@ -212,6 +213,7 @@ uint32_t default_sub_version_for_version(Version version);
 uint32_t default_specific_version_for_version(Version version, int64_t sub_version);
 bool specific_version_is_indeterminate(uint32_t specific_version);
 bool specific_version_is_dc(uint32_t specific_version);
+bool specific_version_is_pc_v2(uint32_t specific_version);
 bool specific_version_is_gc(uint32_t specific_version);
 bool specific_version_is_xb(uint32_t specific_version);
 bool specific_version_is_bb(uint32_t specific_version);
diff --git a/tests/GC-CustomizationSegregation.test.txt b/tests/GC-CustomizationSegregation.test.txt
index 25a239e0..240ae7ac 100644
--- a/tests/GC-CustomizationSegregation.test.txt
+++ b/tests/GC-CustomizationSegregation.test.txt
@@ -5078,7 +5078,7 @@ I 88613 2024-06-23 23:51:31 - [Commands] Received from C-3 @ ipss:N-2: (version=
 0140 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 I 88613 2024-06-23 23:51:31 - [Commands] Sending to C-3 @ ipss:N-2: (version=GC_V3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 50 4F 33 00 11 00 40 20 00 00 00 00 00 00 00 | 0PO3   @
+0010 | 30 50 4F 33 00 51 00 40 20 00 00 00 00 00 00 00 | 0PO3   @
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 88613 2024-06-23 23:51:31 - [Commands] Sending to C-3 @ ipss:N-2: (version=GC_V3 command=D5 flag=00)
 0000 | B1 00 20 00 32 30 32 34 3A 31 32 3A 32 39 3A 20 |     2024:12:29:
@@ -5091,7 +5091,7 @@ I 88613 2024-06-23 23:51:31 - [Commands] Received from C-3 @ ipss:N-2: (version=
 0000 | 96 00 0C 00 C4 56 21 2D 0A 00 00 00             |      V!-
 I 88613 2024-06-23 23:51:31 - [Commands] Sending to C-3 @ ipss:N-2: (version=GC_V3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 50 4F 33 00 11 00 40 20 00 04 00 00 00 00 00 | 0PO3   @
+0010 | 30 50 4F 33 00 51 00 40 20 00 04 00 00 00 00 00 | 0PO3   @
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 88613 2024-06-23 23:51:31 - [Commands] Received from C-3 @ ipss:N-2: (version=GC_V3 command=D6 flag=00)
 0000 | D6 00 04 00                                     |
@@ -5115,7 +5115,7 @@ I 88613 2024-06-23 23:51:31 - [Commands] Sending to C-3 @ ipss:N-2: (version=GC_
 0000 | 97 01 04 00                                     |
 I 88613 2024-06-23 23:51:31 - [Commands] Sending to C-3 @ ipss:N-2: (version=GC_V3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 50 4F 33 00 11 00 44 20 00 00 00 00 00 00 00 | 0PO3   D
+0010 | 30 50 4F 33 00 51 00 44 20 00 00 00 00 00 00 00 | 0PO3   D
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 88613 2024-06-23 23:51:31 - [Commands] Received from C-3 @ ipss:N-2: (version=GC_V3 command=B1 flag=00)
 0000 | B1 00 04 00                                     |
@@ -5165,11 +5165,11 @@ I 88613 2024-06-23 23:51:31 - [Commands] Received from C-4 @ ipss:N-2: (version=
 00A0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 00B0 | 00 00 00 00 00 00 00 00 00 00 00 00 54 61 6C 69 |             Tali
 00C0 | 00 00 00 00 00 00 00 00 00 00 00 00 32 AC 99 83 |             2
-00D0 | 30 50 4F 33 00 91 00 44 60 00 00 00 00 00 00 00 | 0PO3   D`
+00D0 | 30 50 4F 33 00 D1 00 44 60 00 00 00 00 00 00 00 | 0PO3   D`
 00E0 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 88613 2024-06-23 23:51:31 - [Commands] Sending to C-4 @ ipss:N-2: (version=GC_V3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 50 4F 33 00 91 00 44 60 00 00 00 00 00 00 00 | 0PO3   D`
+0010 | 30 50 4F 33 00 D1 00 44 60 00 00 00 00 00 00 00 | 0PO3   D`
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 88613 2024-06-23 23:51:31 - [Commands] Sending to C-4 @ ipss:N-2: (version=GC_V3 command=83 flag=0F)
 0000 | 83 0F B8 00 33 00 00 33 01 00 00 00 00 00 00 00 |     3  3
@@ -5389,7 +5389,7 @@ I 88613 2024-06-23 23:51:31 - [Commands] Sending to C-4 (Tali) @ ipss:N-2: (vers
 0440 | FF FF FF FF FF FF FF FF FF FF FF FF             |
 I 88613 2024-06-23 23:51:31 - [Commands] Sending to C-4 (Tali) @ ipss:N-2: (version=GC_V3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 50 4F 33 00 93 00 44 60 00 00 00 00 00 00 00 | 0PO3   D`
+0010 | 30 50 4F 33 00 D3 00 44 60 00 00 00 00 00 00 00 | 0PO3   D`
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 88613 2024-06-23 23:51:32 - [Commands] Received from C-4 (Tali) @ ipss:N-2: (version=GC_V3 command=60 flag=00)
 0000 | 60 00 1C 00 3F 06 00 00 00 00 00 80 0F 00 FF FF | `   ?
diff --git a/tests/GC-Episode2PrivateDrops2P.test.txt b/tests/GC-Episode2PrivateDrops2P.test.txt
index 8c7cb9e5..1ced3124 100644
--- a/tests/GC-Episode2PrivateDrops2P.test.txt
+++ b/tests/GC-Episode2PrivateDrops2P.test.txt
@@ -61,7 +61,7 @@ I 94381 2023-12-29 15:36:14 - [Commands] Received from C-1 (version=GC_V3 comman
 0140 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 I 94381 2023-12-29 15:36:14 - [Commands] Sending to C-1 (version=GC_V3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 50 4F 33 00 11 00 40 20 00 00 00 00 00 00 00 | 0PO3   B
+0010 | 30 50 4F 33 00 51 00 40 20 00 00 00 00 00 00 00 | 0PO3   B
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 94381 2023-12-29 15:36:14 - [Commands] Sending to C-1 (version=GC_V3 command=04 flag=00)
 0000 | B1 00 20 00 32 30 32 34 3A 31 32 3A 32 39 3A 20 |     2024:12:29:
@@ -74,7 +74,7 @@ I 94381 2023-12-29 15:36:14 - [Commands] Received from C-1 (version=GC_V3 comman
 0000 | 96 00 0C 00 C7 32 CE 2A 63 02 00 00             |      2 *c
 I 94381 2023-12-29 15:36:14 - [Commands] Sending to C-1 (version=GC_V3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 50 4F 33 00 11 00 40 20 00 04 00 00 00 00 00 | 0PO3   B
+0010 | 30 50 4F 33 00 51 00 40 20 00 04 00 00 00 00 00 | 0PO3   B
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 94381 2023-12-29 15:36:14 - [Commands] Received from C-1 (version=GC_V3 command=D6 flag=00)
 0000 | D6 00 04 00                                     |
@@ -98,7 +98,7 @@ I 94381 2023-12-29 15:36:15 - [Commands] Sending to C-1 (version=GC_V3 command=9
 0000 | 97 01 04 00                                     |
 I 94381 2023-12-29 15:36:15 - [Commands] Sending to C-1 (version=GC_V3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 50 4F 33 00 11 00 44 20 00 00 00 00 00 00 00 | 0PO3   D
+0010 | 30 50 4F 33 00 51 00 44 20 00 00 00 00 00 00 00 | 0PO3   D
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 94381 2023-12-29 15:36:15 - [Commands] Received from C-1 (version=GC_V3 command=B1 flag=00)
 0000 | B1 00 04 00                                     |
@@ -147,11 +147,11 @@ I 94381 2023-12-29 15:36:15 - [Commands] Received from C-2 (version=GC_V3 comman
 00A0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 00B0 | 00 00 00 00 00 00 00 00 00 00 00 00 4A 65 73 73 |             Jess
 00C0 | 00 00 00 00 00 00 00 00 00 00 00 00 32 AC 99 83 |             2
-00D0 | 30 50 4F 33 00 11 00 40 20 00 00 00 00 00 00 00 | 0PO3   D
+00D0 | 30 50 4F 33 00 51 00 40 20 00 00 00 00 00 00 00 | 0PO3   D
 00E0 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 94381 2023-12-29 15:36:15 - [Commands] Sending to C-2 (version=GC_V3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 50 4F 33 00 11 00 40 20 00 00 00 00 00 00 00 | 0PO3   D
+0010 | 30 50 4F 33 00 51 00 40 20 00 00 00 00 00 00 00 | 0PO3   D
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 94381 2023-12-29 15:36:15 - [Commands] Sending to C-2 (version=GC_V3 command=83 flag=0F)
 0000 | 83 0F B8 00 33 00 00 33 01 00 00 00 00 00 00 00 |     3  3
@@ -372,7 +372,7 @@ I 94381 2023-12-29 15:36:15 - [Commands] Sending to C-2 (Jess) (version=GC_V3 co
 0440 | 0D FF 05 04 03 01 00 07 00 FF FF FF             |
 I 94381 2023-12-29 15:36:15 - [Commands] Sending to C-2 (Jess) (version=GC_V3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 50 4F 33 00 13 00 40 20 00 00 00 00 00 00 00 | 0PO3   D
+0010 | 30 50 4F 33 00 53 00 40 20 00 00 00 00 00 00 00 | 0PO3   D
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 94381 2023-12-29 15:36:15 - [Commands] Received from C-2 (Jess) (version=GC_V3 command=60 flag=00)
 0000 | 60 00 1C 00 3F 06 00 00 00 00 00 80 0F 00 FF FF | `   ?
@@ -465,7 +465,7 @@ I 94381 2023-12-29 15:36:19 - [Commands] Received from C-4 (version=GC_V3 comman
 0140 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 I 94381 2023-12-29 15:36:19 - [Commands] Sending to C-4 (version=GC_V3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 00 00 4F 33 00 10 00 40 20 00 00 00 00 00 00 00 |    3   B
+0010 | 00 00 4F 33 00 50 00 40 20 00 00 00 00 00 00 00 |    3   B
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 94381 2023-12-29 15:36:19 - [Commands] Sending to C-4 (version=GC_V3 command=D5 flag=00)
 0000 | B1 00 20 00 32 30 32 34 3A 31 32 3A 32 39 3A 20 |     2024:12:29:
@@ -478,7 +478,7 @@ I 94381 2023-12-29 15:36:19 - [Commands] Received from C-4 (version=GC_V3 comman
 0000 | 96 00 0C 00 7B 9E 17 2C 1D 00 00 00             |     {  ,
 I 94381 2023-12-29 15:36:19 - [Commands] Sending to C-4 (version=GC_V3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 00 00 4F 33 00 10 00 40 20 00 04 00 00 00 00 00 |    3   B
+0010 | 00 00 4F 33 00 50 00 40 20 00 04 00 00 00 00 00 |    3   B
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 94381 2023-12-29 15:36:19 - [Commands] Received from C-4 (version=GC_V3 command=D6 flag=00)
 0000 | D6 00 04 00                                     |
@@ -502,7 +502,7 @@ I 94381 2023-12-29 15:36:19 - [Commands] Sending to C-4 (version=GC_V3 command=9
 0000 | 97 01 04 00                                     |
 I 94381 2023-12-29 15:36:19 - [Commands] Sending to C-4 (version=GC_V3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 00 00 4F 33 00 10 00 44 20 00 00 00 00 00 00 00 |    3   D
+0010 | 00 00 4F 33 00 50 00 44 20 00 00 00 00 00 00 00 |    3   D
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 94381 2023-12-29 15:36:19 - [Commands] Received from C-4 (version=GC_V3 command=B1 flag=00)
 0000 | B1 00 04 00                                     |
@@ -551,11 +551,11 @@ I 94381 2023-12-29 15:36:20 - [Commands] Received from C-5 (version=GC_V3 comman
 00A0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 00B0 | 00 00 00 00 00 00 00 00 00 00 00 00 4A 6F 6E 61 |             Jona
 00C0 | 68 00 00 00 00 00 00 00 00 00 00 00 32 AC 99 83 | h           2
-00D0 | 00 00 4F 33 00 10 00 44 20 00 00 00 00 00 00 00 |    3   D
+00D0 | 00 00 4F 33 00 50 00 44 20 00 00 00 00 00 00 00 |    3   D
 00E0 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 94381 2023-12-29 15:36:20 - [Commands] Sending to C-5 (version=GC_V3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 00 00 4F 33 00 10 00 44 20 00 00 00 00 00 00 00 |    3   D
+0010 | 00 00 4F 33 00 50 00 44 20 00 00 00 00 00 00 00 |    3   D
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 94381 2023-12-29 15:36:20 - [Commands] Sending to C-5 (version=GC_V3 command=83 flag=0F)
 0000 | 83 0F B8 00 33 00 00 33 01 00 00 00 00 00 00 00 |     3  3
diff --git a/tests/GC-Episode3BattleVirusAndCreatureTech.rdtest.txt b/tests/GC-Episode3BattleVirusAndCreatureTech.rdtest.txt
index f6d0dbe9..8c7cb057 100644
--- a/tests/GC-Episode3BattleVirusAndCreatureTech.rdtest.txt
+++ b/tests/GC-Episode3BattleVirusAndCreatureTech.rdtest.txt
@@ -66,7 +66,7 @@ I 94811 2024-09-01 16:33:07 - [Commands] Sending to C-1 @ ipss:N-1:127.0.0.1:519
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 94811 2024-09-01 16:33:07 - [Commands] Sending to C-1 @ ipss:N-1:127.0.0.1:51929 (version=GC_EP3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 45 53 33 00 91 02 40 20 00 00 00 00 00 00 00 | 0ES3   @
+0010 | 30 45 53 33 00 D1 02 40 20 00 00 00 00 00 00 00 | 0ES3   @
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 94811 2024-09-01 16:33:07 - [C-1] Sending E version of quest "GC Ep3 USA patch enabler"
 I 94811 2024-09-01 16:33:07 - [Commands] Sending to C-1 @ ipss:N-1:127.0.0.1:51929 (version=GC_EP3 command=44 flag=00)
@@ -221,7 +221,7 @@ I 94811 2024-09-01 16:33:07 - [Commands] Received from C-1 @ ipss:N-1:127.0.0.1:
 0000 | 96 00 0C 00 65 06 AF 2D 77 00 00 00             |     e  -w
 I 94811 2024-09-01 16:33:07 - [Commands] Sending to C-1 @ ipss:N-1:127.0.0.1:51929 (version=GC_EP3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 45 53 33 00 91 02 40 20 00 04 00 00 00 00 00 | 0ES3   @
+0010 | 30 45 53 33 00 D1 02 40 20 00 04 00 00 00 00 00 | 0ES3   @
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 94811 2024-09-01 16:33:07 - [Commands] Received from C-1 @ ipss:N-1:127.0.0.1:51929 (version=GC_EP3 command=44 flag=00)
 0000 | 44 00 14 00 71 75 65 73 74 38 38 35 33 32 2E 62 | D   quest88532.b
@@ -2780,7 +2780,7 @@ I 94811 2024-09-01 16:33:08 - [Commands] Sending to C-1 @ ipss:N-1:127.0.0.1:519
 0500 | 00 00 00 00 00 00 00 00 00 00 00 00             |
 I 94811 2024-09-01 16:33:08 - [Commands] Sending to C-1 @ ipss:N-1:127.0.0.1:51929 (version=GC_EP3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 45 53 33 00 91 02 48 20 00 04 00 00 00 00 00 | 0ES3   X
+0010 | 30 45 53 33 00 D1 02 48 20 00 04 00 00 00 00 00 | 0ES3   X
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 94811 2024-09-01 16:33:08 - [Commands] Received from C-1 (Tali) @ ipss:N-1:127.0.0.1:51929 (version=GC_EP3 command=BA flag=01)
 0000 | BA 01 10 00 02 00 00 00 00 00 00 00 00 00 D0 2F |                /
@@ -3589,7 +3589,7 @@ I 94811 2024-09-01 16:33:08 - [Commands] Sending to C-1 (Tali) @ ipss:N-1:127.0.
 0000 | 97 01 04 00                                     |
 I 94811 2024-09-01 16:33:08 - [Commands] Sending to C-1 (Tali) @ ipss:N-1:127.0.0.1:51929 (version=GC_EP3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 45 53 33 00 91 02 4C 20 00 00 00 00 00 00 00 | 0ES3   \
+0010 | 30 45 53 33 00 D1 02 4C 20 00 00 00 00 00 00 00 | 0ES3   \
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 94811 2024-09-01 16:33:08 - [Commands] Received from C-1 (Tali) @ ipss:N-1:127.0.0.1:51929 (version=GC_EP3 command=B1 flag=00)
 0000 | B1 00 04 00                                     |
@@ -3638,12 +3638,12 @@ I 94811 2024-09-01 16:33:09 - [Commands] Received from C-2 @ ipss:N-1:127.0.0.1:
 00A0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 00B0 | 00 00 00 00 00 00 00 00 00 00 00 00 54 61 6C 69 |             Tali
 00C0 | 00 00 00 00 00 00 00 00 00 00 00 00 32 AC 99 83 |             2
-00D0 | 30 45 53 33 00 91 02 5C 60 00 00 00 00 00 00 00 | 0ES3   \`
+00D0 | 30 45 53 33 00 D1 02 5C 60 00 00 00 00 00 00 00 | 0ES3   \`
 00E0 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 94811 2024-09-01 16:33:09 - [C-2] Game version changed to GC_EP3
 I 94811 2024-09-01 16:33:09 - [Commands] Sending to C-2 @ ipss:N-1:127.0.0.1:51929 (version=GC_EP3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 45 53 33 00 91 02 5C 60 00 00 00 00 00 00 00 | 0ES3   \`
+0010 | 30 45 53 33 00 D1 02 5C 60 00 00 00 00 00 00 00 | 0ES3   \`
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 94811 2024-09-01 16:33:09 - [Commands] Sending to C-2 @ ipss:N-1:127.0.0.1:51929 (version=GC_EP3 command=B7 flag=00)
 0000 | B7 00 20 00 00 00 00 00 00 00 00 00 00 00 00 00 |
@@ -4532,7 +4532,7 @@ I 94811 2024-09-01 16:33:09 - [Commands] Sending to C-2 (Tali) @ ipss:N-1:127.0.
 0440 | FF FF FF FF FF FF FF FF FF FF FF FF             |
 I 94811 2024-09-01 16:33:09 - [Commands] Sending to C-2 (Tali) @ ipss:N-1:127.0.0.1:51929 (version=GC_EP3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 45 53 33 00 93 02 5C 60 00 00 00 00 00 00 00 | 0ES3   \`
+0010 | 30 45 53 33 00 D3 02 5C 60 00 00 00 00 00 00 00 | 0ES3   \`
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 94811 2024-09-01 16:33:09 - [Commands] Received from C-2 (Tali) @ ipss:N-1:127.0.0.1:51929 (version=GC_EP3 command=60 flag=00)
 0000 | 60 00 1C 00 3F 06 00 00 00 00 00 00 0F 00 FF FF | `   ?
@@ -28813,7 +28813,7 @@ I 94811 2024-09-01 16:40:16 - [Commands] Sending to C-2 (Tali) @ ipss:N-1:127.0.
 0500 | 00 00 00 00 00 00 00 00 00 00 00 00             |
 I 94811 2024-09-01 16:40:16 - [Commands] Sending to C-2 (Tali) @ ipss:N-1:127.0.0.1:51929 (version=GC_EP3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 45 53 33 00 93 02 7C 60 00 00 00 55 55 55 55 | 0ES3   |`   UUUU
+0010 | 30 45 53 33 00 D3 02 7C 60 00 00 00 55 55 55 55 | 0ES3   |`   UUUU
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 94811 2024-09-01 16:40:16 - [Game:15] Deleted
 I 94811 2024-09-01 16:40:17 - [Commands] Received from C-2 (Tali) @ ipss:N-1:127.0.0.1:51929 (version=GC_EP3 command=BA flag=01)
diff --git a/tests/GC-Episode3BattleWithSpectatorTeam.rdtest.txt b/tests/GC-Episode3BattleWithSpectatorTeam.rdtest.txt
index 7710dd2d..9195e545 100644
--- a/tests/GC-Episode3BattleWithSpectatorTeam.rdtest.txt
+++ b/tests/GC-Episode3BattleWithSpectatorTeam.rdtest.txt
@@ -66,7 +66,7 @@ I 64538 2024-09-01 15:24:00 - [Commands] Sending to C-7 @ ipss:N-4: (version=GC_
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 64538 2024-09-01 15:24:00 - [Commands] Sending to C-7 @ ipss:N-4: (version=GC_EP3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 45 53 33 00 91 02 40 20 00 00 00 00 00 00 00 | 0ES3   @
+0010 | 30 45 53 33 00 D1 02 40 20 00 00 00 00 00 00 00 | 0ES3   @
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 64538 2024-09-01 15:24:00 - [C-7] Sending E version of quest "GC Ep3 USA patch enabler"
 I 64538 2024-09-01 15:24:00 - [Commands] Sending to C-7 @ ipss:N-4: (version=GC_EP3 command=44 flag=00)
@@ -221,7 +221,7 @@ I 64538 2024-09-01 15:24:00 - [Commands] Received from C-7 @ ipss:N-4: (version=
 0000 | 96 00 0C 00 65 06 AF 2D 6F 00 00 00             |     e  -o
 I 64538 2024-09-01 15:24:00 - [Commands] Sending to C-7 @ ipss:N-4: (version=GC_EP3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 45 53 33 00 91 02 40 20 00 04 00 00 00 00 00 | 0ES3   @
+0010 | 30 45 53 33 00 D1 02 40 20 00 04 00 00 00 00 00 | 0ES3   @
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 64538 2024-09-01 15:24:00 - [Commands] Received from C-7 @ ipss:N-4: (version=GC_EP3 command=44 flag=00)
 0000 | 44 00 14 00 71 75 65 73 74 38 38 35 33 32 2E 62 | D   quest88532.b
@@ -2780,7 +2780,7 @@ I 64538 2024-09-01 15:24:01 - [Commands] Sending to C-7 @ ipss:N-4: (version=GC_
 0500 | 00 00 00 00 00 00 00 00 00 00 00 00             |
 I 64538 2024-09-01 15:24:01 - [Commands] Sending to C-7 @ ipss:N-4: (version=GC_EP3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 45 53 33 00 91 02 48 20 00 04 00 00 00 00 00 | 0ES3   X
+0010 | 30 45 53 33 00 D1 02 48 20 00 04 00 00 00 00 00 | 0ES3   X
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 64538 2024-09-01 15:24:02 - [Commands] Received from C-7 (Tali) @ ipss:N-4: (version=GC_EP3 command=BA flag=01)
 0000 | BA 01 10 00 02 00 00 00 00 00 00 00 00 00 64 46 |               dF
@@ -3589,7 +3589,7 @@ I 64538 2024-09-01 15:24:03 - [Commands] Sending to C-7 (Tali) @ ipss:N-4: (vers
 0000 | 97 01 04 00                                     |
 I 64538 2024-09-01 15:24:03 - [Commands] Sending to C-7 (Tali) @ ipss:N-4: (version=GC_EP3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 45 53 33 00 91 02 4C 20 00 00 00 00 00 00 00 | 0ES3   \
+0010 | 30 45 53 33 00 D1 02 4C 20 00 00 00 00 00 00 00 | 0ES3   \
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 64538 2024-09-01 15:24:03 - [Commands] Received from C-7 (Tali) @ ipss:N-4: (version=GC_EP3 command=B1 flag=00)
 0000 | B1 00 04 00                                     |
@@ -3638,12 +3638,12 @@ I 64538 2024-09-01 15:24:03 - [Commands] Received from C-8 @ ipss:N-4: (version=
 00A0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 00B0 | 00 00 00 00 00 00 00 00 00 00 00 00 54 61 6C 69 |             Tali
 00C0 | 00 00 00 00 00 00 00 00 00 00 00 00 32 AC 99 83 |             2
-00D0 | 30 45 53 33 00 91 02 5C 60 00 00 00 00 00 00 00 | 0ES3   \`
+00D0 | 30 45 53 33 00 D1 02 5C 60 00 00 00 00 00 00 00 | 0ES3   \`
 00E0 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 64538 2024-09-01 15:24:03 - [C-8] Game version changed to GC_EP3
 I 64538 2024-09-01 15:24:03 - [Commands] Sending to C-8 @ ipss:N-4: (version=GC_EP3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 45 53 33 00 91 02 5C 60 00 00 00 00 00 00 00 | 0ES3   \`
+0010 | 30 45 53 33 00 D1 02 5C 60 00 00 00 00 00 00 00 | 0ES3   \`
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 64538 2024-09-01 15:24:03 - [Commands] Sending to C-8 @ ipss:N-4: (version=GC_EP3 command=B7 flag=00)
 0000 | B7 00 20 00 00 00 00 00 00 00 00 00 00 00 00 00 |
@@ -4532,7 +4532,7 @@ I 64538 2024-09-01 15:24:03 - [Commands] Sending to C-8 (Tali) @ ipss:N-4: (vers
 0440 | FF FF FF FF FF FF FF FF FF FF FF FF             |
 I 64538 2024-09-01 15:24:03 - [Commands] Sending to C-8 (Tali) @ ipss:N-4: (version=GC_EP3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 45 53 33 00 93 02 5C 60 00 00 00 00 00 00 00 | 0ES3   \`
+0010 | 30 45 53 33 00 D3 02 5C 60 00 00 00 00 00 00 00 | 0ES3   \`
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 64538 2024-09-01 15:24:03 - [Commands] Received from C-8 (Tali) @ ipss:N-4: (version=GC_EP3 command=60 flag=00)
 0000 | 60 00 1C 00 3F 06 00 00 00 00 00 00 0F 00 FF FF | `   ?
@@ -4645,7 +4645,7 @@ I 64538 2024-09-01 15:24:43 - [Commands] Sending to C-9 @ ipss:N-6:127.0.0.1:593
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 64538 2024-09-01 15:24:43 - [Commands] Sending to C-9 @ ipss:N-6:127.0.0.1:59366 (version=GC_EP3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 50 53 33 00 91 02 40 20 00 00 00 00 00 00 00 | 0PS3   @
+0010 | 30 50 53 33 00 D1 02 40 20 00 00 00 00 00 00 00 | 0PS3   @
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 64538 2024-09-01 15:24:43 - [C-9] Sending E version of quest "GC Ep3 EU patch enabler"
 I 64538 2024-09-01 15:24:43 - [Commands] Sending to C-9 @ ipss:N-6:127.0.0.1:59366 (version=GC_EP3 command=44 flag=00)
@@ -4800,7 +4800,7 @@ I 64538 2024-09-01 15:24:43 - [Commands] Received from C-9 @ ipss:N-6:127.0.0.1:
 0000 | 96 00 0C 00 D5 2A DD 2D 0C 00 00 00             |      * -
 I 64538 2024-09-01 15:24:43 - [Commands] Sending to C-9 @ ipss:N-6:127.0.0.1:59366 (version=GC_EP3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 50 53 33 00 91 02 40 20 00 04 00 00 00 00 00 | 0PS3   @
+0010 | 30 50 53 33 00 D1 02 40 20 00 04 00 00 00 00 00 | 0PS3   @
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 64538 2024-09-01 15:24:43 - [Commands] Received from C-9 @ ipss:N-6:127.0.0.1:59366 (version=GC_EP3 command=44 flag=00)
 0000 | 44 00 14 00 71 75 65 73 74 38 38 35 33 33 2E 62 | D   quest88533.b
@@ -7359,7 +7359,7 @@ I 64538 2024-09-01 15:24:43 - [Commands] Sending to C-9 @ ipss:N-6:127.0.0.1:593
 0500 | 00 00 00 00 00 00 00 00 00 00 00 00             |
 I 64538 2024-09-01 15:24:43 - [Commands] Sending to C-9 @ ipss:N-6:127.0.0.1:59366 (version=GC_EP3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 50 53 33 00 91 02 48 20 00 04 00 00 00 00 00 | 0PS3   X
+0010 | 30 50 53 33 00 D1 02 48 20 00 04 00 00 00 00 00 | 0PS3   X
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 64538 2024-09-01 15:24:44 - [Commands] Received from C-9 (Dono) @ ipss:N-6:127.0.0.1:59366 (version=GC_EP3 command=BA flag=01)
 0000 | BA 01 10 00 02 00 00 00 00 00 00 00 00 00 E2 CE |
@@ -8168,7 +8168,7 @@ I 64538 2024-09-01 15:24:44 - [Commands] Sending to C-9 (Dono) @ ipss:N-6:127.0.
 0000 | 97 01 04 00                                     |
 I 64538 2024-09-01 15:24:44 - [Commands] Sending to C-9 (Dono) @ ipss:N-6:127.0.0.1:59366 (version=GC_EP3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 50 53 33 00 91 02 4C 20 00 00 00 00 00 00 00 | 0PS3   \
+0010 | 30 50 53 33 00 D1 02 4C 20 00 00 00 00 00 00 00 | 0PS3   \
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 64538 2024-09-01 15:24:44 - [Commands] Received from C-9 (Dono) @ ipss:N-6:127.0.0.1:59366 (version=GC_EP3 command=B1 flag=00)
 0000 | B1 00 04 00                                     |
@@ -8217,12 +8217,12 @@ I 64538 2024-09-01 15:24:45 - [Commands] Received from C-A @ ipss:N-6:127.0.0.1:
 00A0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 00B0 | 00 00 00 00 00 00 00 00 00 00 00 00 44 6F 6E 6F |             Dono
 00C0 | 00 00 00 00 00 00 00 00 00 00 00 00 32 AC 99 83 |             2
-00D0 | 30 50 53 33 00 91 02 5C 60 00 00 00 00 00 00 00 | 0PS3   \`
+00D0 | 30 50 53 33 00 D1 02 5C 60 00 00 00 00 00 00 00 | 0PS3   \`
 00E0 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 64538 2024-09-01 15:24:45 - [C-A] Game version changed to GC_EP3
 I 64538 2024-09-01 15:24:45 - [Commands] Sending to C-A @ ipss:N-6:127.0.0.1:59366 (version=GC_EP3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 50 53 33 00 91 02 5C 60 00 00 00 00 00 00 00 | 0PS3   \`
+0010 | 30 50 53 33 00 D1 02 5C 60 00 00 00 00 00 00 00 | 0PS3   \`
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 64538 2024-09-01 15:24:45 - [Commands] Sending to C-A @ ipss:N-6:127.0.0.1:59366 (version=GC_EP3 command=B7 flag=00)
 0000 | B7 00 20 00 00 00 00 00 00 00 00 00 00 00 00 00 |
@@ -9286,7 +9286,7 @@ I 64538 2024-09-01 15:24:45 - [Commands] Sending to C-A (Dono) @ ipss:N-6:127.0.
 0880 | FF FF FF FF FF FF FF FF                         |
 I 64538 2024-09-01 15:24:45 - [Commands] Sending to C-A (Dono) @ ipss:N-6:127.0.0.1:59366 (version=GC_EP3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 50 53 33 00 93 02 5C 60 00 00 00 00 00 00 00 | 0PS3   \`
+0010 | 30 50 53 33 00 D3 02 5C 60 00 00 00 00 00 00 00 | 0PS3   \`
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 64538 2024-09-01 15:24:45 - [Commands] Received from C-A (Dono) @ ipss:N-6:127.0.0.1:59366 (version=GC_EP3 command=60 flag=00)
 0000 | 60 00 1C 00 3F 06 01 00 00 00 00 00 0F 00 FF FF | `   ?
@@ -9383,7 +9383,7 @@ I 64538 2024-09-01 15:24:47 - [Commands] Received from C-B @ ipss:N-5:127.0.0.1:
 0140 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 I 64538 2024-09-01 15:24:47 - [Commands] Sending to C-B @ ipss:N-5:127.0.0.1:59362 (version=GC_EP3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 F1 CF AF 20 32 AC 99 83 |   ,         2
-0010 | 00 4A 53 33 00 B1 00 40 20 00 00 00 00 00 00 00 |  JS3   @
+0010 | 00 4A 53 33 00 F1 00 40 20 00 00 00 00 00 00 00 |  JS3   @
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 64538 2024-09-01 15:24:47 - [Commands] Sending to C-B @ ipss:N-5:127.0.0.1:59362 (version=GC_EP3 command=B7 flag=00)
 0000 | B1 00 20 00 32 30 32 34 3A 31 32 3A 32 39 3A 20 |     2024:12:29:
@@ -9401,7 +9401,7 @@ I 64538 2024-09-01 15:24:47 - [Commands] Received from C-B @ ipss:N-5:127.0.0.1:
 0000 | 96 00 0C 00 1C F1 65 2E 04 00 00 00             |       e.
 I 64538 2024-09-01 15:24:47 - [Commands] Sending to C-B @ ipss:N-5:127.0.0.1:59362 (version=GC_EP3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 F1 CF AF 20 32 AC 99 83 |   ,         2
-0010 | 00 4A 53 33 00 B1 00 40 20 00 04 00 00 00 00 00 |  JS3   @
+0010 | 00 4A 53 33 00 F1 00 40 20 00 04 00 00 00 00 00 |  JS3   @
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 64538 2024-09-01 15:24:47 - [Commands] Received from C-B @ ipss:N-5:127.0.0.1:59362 (version=GC_EP3 command=B7 flag=00)
 0000 | B7 00 04 00                                     |
@@ -11948,7 +11948,7 @@ I 64538 2024-09-01 15:24:47 - [Commands] Sending to C-B @ ipss:N-5:127.0.0.1:593
 0500 | 00 00 00 00 00 00 00 00 00 00 00 00             |
 I 64538 2024-09-01 15:24:47 - [Commands] Sending to C-B @ ipss:N-5:127.0.0.1:59362 (version=GC_EP3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 F1 CF AF 20 32 AC 99 83 |   ,         2
-0010 | 30 4A 53 33 00 B1 00 48 20 00 04 00 00 00 00 00 | 0JS3   X
+0010 | 30 4A 53 33 00 F1 00 48 20 00 04 00 00 00 00 00 | 0JS3   X
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 64538 2024-09-01 15:24:47 - [Commands] Received from C-B (Sona) @ ipss:N-5:127.0.0.1:59362 (version=GC_EP3 command=B8 flag=00)
 0000 | B8 00 04 00                                     |
@@ -12298,7 +12298,7 @@ I 64538 2024-09-01 15:24:55 - [Commands] Sending to C-B (Sona) @ ipss:N-5:127.0.
 0000 | 97 01 04 00                                     |
 I 64538 2024-09-01 15:24:55 - [Commands] Sending to C-B (Sona) @ ipss:N-5:127.0.0.1:59362 (version=GC_EP3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 F1 CF AF 20 32 AC 99 83 |   ,         2
-0010 | 30 4A 53 33 00 B1 00 4C 20 00 00 00 00 00 00 00 | 0JS3   \
+0010 | 30 4A 53 33 00 F1 00 4C 20 00 00 00 00 00 00 00 | 0JS3   \
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 64538 2024-09-01 15:24:56 - [Commands] Received from C-B (Sona) @ ipss:N-5:127.0.0.1:59362 (version=GC_EP3 command=B1 flag=00)
 0000 | B1 00 04 00                                     |
@@ -12349,12 +12349,12 @@ I 64538 2024-09-01 15:24:56 - [Commands] Received from C-C @ ipss:N-5:127.0.0.1:
 00A0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 00B0 | 00 00 00 00 00 00 00 00 00 00 00 00 53 6F 6E 61 |             Sona
 00C0 | 00 00 00 00 00 00 00 00 00 00 00 00 32 AC 99 83 |             2
-00D0 | 30 4A 53 33 00 B1 00 5C 20 00 00 00 00 00 00 00 | 0JS3   \
+00D0 | 30 4A 53 33 00 F1 00 5C 20 00 00 00 00 00 00 00 | 0JS3   \
 00E0 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 64538 2024-09-01 15:24:56 - [C-C] Game version changed to GC_EP3
 I 64538 2024-09-01 15:24:56 - [Commands] Sending to C-C @ ipss:N-5:127.0.0.1:59362 (version=GC_EP3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 F1 CF AF 20 32 AC 99 83 |   ,         2
-0010 | 30 4A 53 33 00 B1 00 5C 20 00 00 00 00 00 00 00 | 0JS3   \
+0010 | 30 4A 53 33 00 F1 00 5C 20 00 00 00 00 00 00 00 | 0JS3   \
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 64538 2024-09-01 15:24:56 - [Commands] Sending to C-C @ ipss:N-5:127.0.0.1:59362 (version=GC_EP3 command=B7 flag=00)
 0000 | B7 00 20 00 00 00 00 00 00 00 00 00 00 00 00 00 |
@@ -13329,7 +13329,7 @@ I 64538 2024-09-01 15:24:56 - [Commands] Sending to C-C (Sona) @ ipss:N-5:127.0.
 0880 | FF FF FF FF FF FF FF FF                         |
 I 64538 2024-09-01 15:24:56 - [Commands] Sending to C-C (Sona) @ ipss:N-5:127.0.0.1:59362 (version=GC_EP3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 F1 CF AF 20 32 AC 99 83 |   ,         2
-0010 | 30 4A 53 33 00 B3 00 5C 20 00 00 00 00 00 00 00 | 0JS3   \
+0010 | 30 4A 53 33 00 F3 00 5C 20 00 00 00 00 00 00 00 | 0JS3   \
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 64538 2024-09-01 15:24:56 - [Commands] Sending to C-A (Dono) @ ipss:N-6:127.0.0.1:59366 (version=GC_EP3 command=C5 flag=01)
 0000 | C5 01 20 01 00 00 00 00 FF 7F 00 00 00 00 00 00 |
@@ -54576,7 +54576,7 @@ I 64538 2024-09-01 15:33:27 - [Commands] Sending to C-8 (Tali) @ ipss:N-4: (vers
 0500 | 00 00 00 00 00 00 00 00 00 00 00 00             |
 I 64538 2024-09-01 15:33:27 - [Commands] Sending to C-8 (Tali) @ ipss:N-4: (version=GC_EP3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 45 53 33 00 93 02 7C 60 00 00 00 55 55 55 55 | 0ES3   |`   UUUU
+0010 | 30 45 53 33 00 D3 02 7C 60 00 00 00 55 55 55 55 | 0ES3   |`   UUUU
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 64538 2024-09-01 15:33:27 - [Game:17] Deleted
 I 64538 2024-09-01 15:33:27 - [Commands] Received from C-8 (Tali) @ ipss:N-4: (version=GC_EP3 command=BA flag=01)
diff --git a/tests/GC-Episode3CardTrade.rdtest.txt b/tests/GC-Episode3CardTrade.rdtest.txt
index 5dfadb4f..d6cf78fb 100644
--- a/tests/GC-Episode3CardTrade.rdtest.txt
+++ b/tests/GC-Episode3CardTrade.rdtest.txt
@@ -66,7 +66,7 @@ I 54825 2024-11-05 21:17:56 - [Commands] Sending to C-1 @ ipss:N-1:127.0.0.1:623
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 54825 2024-11-05 21:17:56 - [Commands] Sending to C-1 @ ipss:N-1:127.0.0.1:62373 (version=GC_EP3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 45 53 33 00 91 02 40 20 00 00 00 00 00 00 00 | 0ES3   @!
+0010 | 30 45 53 33 00 D1 02 40 20 00 00 00 00 00 00 00 | 0ES3   @!
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 54825 2024-11-05 21:17:56 - [C-1] Sending E version of quest "GC Ep3 USA patch enabler"
 I 54825 2024-11-05 21:17:56 - [Commands] Sending to C-1 @ ipss:N-1:127.0.0.1:62373 (version=GC_EP3 command=44 flag=00)
@@ -221,7 +221,7 @@ I 54825 2024-11-05 21:17:56 - [Commands] Received from C-1 @ ipss:N-1:127.0.0.1:
 0000 | 96 00 0C 00 65 06 AF 2D C7 00 00 00             |     e  -
 I 54825 2024-11-05 21:17:56 - [Commands] Sending to C-1 @ ipss:N-1:127.0.0.1:62373 (version=GC_EP3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 45 53 33 00 91 02 40 20 00 04 00 00 00 00 00 | 0ES3   @!
+0010 | 30 45 53 33 00 D1 02 40 20 00 04 00 00 00 00 00 | 0ES3   @!
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 54825 2024-11-05 21:17:56 - [Commands] Received from C-1 @ ipss:N-1:127.0.0.1:62373 (version=GC_EP3 command=44 flag=00)
 0000 | 44 00 14 00 71 75 65 73 74 38 38 35 33 32 2E 62 | D   quest88532.b
@@ -2780,7 +2780,7 @@ I 54825 2024-11-05 21:17:57 - [Commands] Sending to C-1 @ ipss:N-1:127.0.0.1:623
 0500 | 00 00 00 00 00 00 00 00 00 00 00 00             |
 I 54825 2024-11-05 21:17:57 - [Commands] Sending to C-1 @ ipss:N-1:127.0.0.1:62373 (version=GC_EP3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 45 53 33 00 91 02 48 20 00 04 00 00 00 00 00 | 0ES3   X!
+0010 | 30 45 53 33 00 D1 02 48 20 00 04 00 00 00 00 00 | 0ES3   X!
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 54825 2024-11-05 21:17:58 - [Commands] Received from C-1 (Tali) @ ipss:N-1:127.0.0.1:62373 (version=GC_EP3 command=BA flag=01)
 0000 | BA 01 10 00 02 00 00 00 00 00 00 00 00 00 9C 1C |
@@ -3593,7 +3593,7 @@ I 54825 2024-11-05 21:17:58 - [Commands] Sending to C-1 (Tali) @ ipss:N-1:127.0.
 0000 | 97 01 04 00                                     |
 I 54825 2024-11-05 21:17:58 - [Commands] Sending to C-1 (Tali) @ ipss:N-1:127.0.0.1:62373 (version=GC_EP3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 45 53 33 00 91 02 4C 20 00 00 00 00 00 00 00 | 0ES3   \!
+0010 | 30 45 53 33 00 D1 02 4C 20 00 00 00 00 00 00 00 | 0ES3   \!
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 54825 2024-11-05 21:17:58 - [Commands] Received from C-1 (Tali) @ ipss:N-1:127.0.0.1:62373 (version=GC_EP3 command=B1 flag=00)
 0000 | B1 00 04 00                                     |
@@ -3642,12 +3642,12 @@ I 54825 2024-11-05 21:17:58 - [Commands] Received from C-2 @ ipss:N-1:127.0.0.1:
 00A0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 00B0 | 00 00 00 00 00 00 00 00 00 00 00 00 54 61 6C 69 |             Tali
 00C0 | 00 00 00 00 00 00 00 00 00 00 00 00 32 AC 99 83 |             2
-00D0 | 30 45 53 33 00 91 02 4C 60 00 00 00 00 00 00 00 | 0ES3   \a
+00D0 | 30 45 53 33 00 D1 02 4C 60 00 00 00 00 00 00 00 | 0ES3   \a
 00E0 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 54825 2024-11-05 21:17:58 - [C-2] Game version changed to GC_EP3
 I 54825 2024-11-05 21:17:58 - [Commands] Sending to C-2 @ ipss:N-1:127.0.0.1:62373 (version=GC_EP3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 45 53 33 00 91 02 4C 60 00 00 00 00 00 00 00 | 0ES3   \a
+0010 | 30 45 53 33 00 D1 02 4C 60 00 00 00 00 00 00 00 | 0ES3   \a
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 54825 2024-11-05 21:17:58 - [Commands] Sending to C-2 @ ipss:N-1:127.0.0.1:62373 (version=GC_EP3 command=B7 flag=00)
 0000 | B7 00 20 00 00 00 00 00 00 00 00 00 00 00 00 00 |
@@ -4536,7 +4536,7 @@ I 54825 2024-11-05 21:17:59 - [Commands] Sending to C-2 (Tali) @ ipss:N-1:127.0.
 0440 | FF FF FF FF FF FF FF FF FF FF FF FF             |
 I 54825 2024-11-05 21:17:59 - [Commands] Sending to C-2 (Tali) @ ipss:N-1:127.0.0.1:62373 (version=GC_EP3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 45 53 33 00 93 02 4C 60 00 00 00 00 00 00 00 | 0ES3   \a
+0010 | 30 45 53 33 00 D3 02 4C 60 00 00 00 00 00 00 00 | 0ES3   \a
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 54825 2024-11-05 21:17:59 - [Commands] Received from C-2 (Tali) @ ipss:N-1:127.0.0.1:62373 (version=GC_EP3 command=60 flag=00)
 0000 | 60 00 1C 00 3F 06 00 00 00 00 00 00 0F 00 FF FF | `   ?
@@ -5187,7 +5187,7 @@ I 54825 2024-11-05 21:18:16 - [Commands] Sending to C-3 @ ipss:N-2: (version=GC_
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 54825 2024-11-05 21:18:16 - [Commands] Sending to C-3 @ ipss:N-2: (version=GC_EP3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 45 53 33 00 91 02 40 20 00 00 00 00 00 00 00 | 0ES3   @!
+0010 | 30 45 53 33 00 D1 02 40 20 00 00 00 00 00 00 00 | 0ES3   @!
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 54825 2024-11-05 21:18:16 - [C-3] Sending E version of quest "GC Ep3 USA patch enabler"
 I 54825 2024-11-05 21:18:16 - [Commands] Sending to C-3 @ ipss:N-2: (version=GC_EP3 command=44 flag=00)
@@ -5342,7 +5342,7 @@ I 54825 2024-11-05 21:18:16 - [Commands] Received from C-3 @ ipss:N-2: (version=
 0000 | 96 00 0C 00 F5 5F A6 2E 08 00 00 00             |      _ .
 I 54825 2024-11-05 21:18:16 - [Commands] Sending to C-3 @ ipss:N-2: (version=GC_EP3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 45 53 33 00 91 02 40 20 00 04 00 00 00 00 00 | 0ES3   @!
+0010 | 30 45 53 33 00 D1 02 40 20 00 04 00 00 00 00 00 | 0ES3   @!
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 54825 2024-11-05 21:18:16 - [Commands] Received from C-3 @ ipss:N-2: (version=GC_EP3 command=44 flag=00)
 0000 | 44 00 14 00 71 75 65 73 74 38 38 35 33 32 2E 62 | D   quest88532.b
@@ -7901,7 +7901,7 @@ I 54825 2024-11-05 21:18:17 - [Commands] Sending to C-3 @ ipss:N-2: (version=GC_
 0500 | 00 00 00 00 00 00 00 00 00 00 00 00             |
 I 54825 2024-11-05 21:18:17 - [Commands] Sending to C-3 @ ipss:N-2: (version=GC_EP3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 45 53 33 00 91 02 48 20 00 04 00 00 00 00 00 | 0ES3   X!
+0010 | 30 45 53 33 00 D1 02 48 20 00 04 00 00 00 00 00 | 0ES3   X!
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 54825 2024-11-05 21:18:17 - [Commands] Received from C-3 (11) @ ipss:N-2: (version=GC_EP3 command=BA flag=01)
 0000 | BA 01 10 00 02 00 00 00 00 00 00 00 00 00 C6 2D |                -
@@ -8714,7 +8714,7 @@ I 54825 2024-11-05 21:18:18 - [Commands] Sending to C-3 (11) @ ipss:N-2: (versio
 0000 | 97 01 04 00                                     |
 I 54825 2024-11-05 21:18:18 - [Commands] Sending to C-3 (11) @ ipss:N-2: (version=GC_EP3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 45 53 33 00 91 02 4C 20 00 00 00 00 00 00 00 | 0ES3   \!
+0010 | 30 45 53 33 00 D1 02 4C 20 00 00 00 00 00 00 00 | 0ES3   \!
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 54825 2024-11-05 21:18:18 - [Commands] Received from C-3 (11) @ ipss:N-2: (version=GC_EP3 command=B1 flag=00)
 0000 | B1 00 04 00                                     |
@@ -8763,12 +8763,12 @@ I 54825 2024-11-05 21:18:18 - [Commands] Received from C-4 @ ipss:N-2: (version=
 00A0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 00B0 | 00 00 00 00 00 00 00 00 00 00 00 00 31 31 00 00 |             11
 00C0 | 00 00 00 00 00 00 00 00 00 00 00 00 32 AC 99 83 |             2
-00D0 | 30 45 53 33 00 91 02 4C 60 00 00 00 00 00 00 00 | 0ES3   \a
+00D0 | 30 45 53 33 00 D1 02 4C 60 00 00 00 00 00 00 00 | 0ES3   \a
 00E0 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 54825 2024-11-05 21:18:18 - [C-4] Game version changed to GC_EP3
 I 54825 2024-11-05 21:18:18 - [Commands] Sending to C-4 @ ipss:N-2: (version=GC_EP3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 45 53 33 00 91 02 4C 60 00 00 00 00 00 00 00 | 0ES3   \a
+0010 | 30 45 53 33 00 D1 02 4C 60 00 00 00 00 00 00 00 | 0ES3   \a
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 54825 2024-11-05 21:18:18 - [Commands] Sending to C-4 @ ipss:N-2: (version=GC_EP3 command=B7 flag=00)
 0000 | B7 00 20 00 00 00 00 00 00 00 00 00 00 00 00 00 |
@@ -9657,7 +9657,7 @@ I 54825 2024-11-05 21:18:18 - [Commands] Sending to C-4 (11) @ ipss:N-2: (versio
 0440 | FF FF FF FF FF FF FF FF FF FF FF FF             |
 I 54825 2024-11-05 21:18:18 - [Commands] Sending to C-4 (11) @ ipss:N-2: (version=GC_EP3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 45 53 33 00 93 02 4C 60 00 00 00 00 00 00 00 | 0ES3   \a
+0010 | 30 45 53 33 00 D3 02 4C 60 00 00 00 00 00 00 00 | 0ES3   \a
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 54825 2024-11-05 21:18:18 - [Commands] Received from C-4 (11) @ ipss:N-2: (version=GC_EP3 command=60 flag=00)
 0000 | 60 00 1C 00 3F 06 00 00 00 00 00 00 0F 00 FF FF | `   ?
diff --git a/tests/GC-Episode3TrialEditionLobbySmokeTest.test.txt b/tests/GC-Episode3TrialEditionLobbySmokeTest.test.txt
index 72210665..9fc5883a 100644
--- a/tests/GC-Episode3TrialEditionLobbySmokeTest.test.txt
+++ b/tests/GC-Episode3TrialEditionLobbySmokeTest.test.txt
@@ -62,7 +62,7 @@ I 25793 2023-11-24 23:03:38 - [Commands] Received from C-4 (version=GC_EP3 comma
 0140 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 I 25793 2023-11-24 23:03:38 - [Commands] Sending to C-4 (version=GC_EP3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 11 11 11 11 32 AC 99 83 |   ,         2
-0010 | 00 4A 53 33 00 B1 00 40 20 00 00 00 00 00 00 00 |    3   B`
+0010 | 00 4A 53 33 00 F1 00 40 20 00 00 00 00 00 00 00 |    3   B`
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 25793 2023-11-24 23:03:38 - [Commands] Sending to C-4 (version=GC_EP3 command=B7 flag=00)
 0000 | B1 00 20 00 32 30 32 34 3A 31 32 3A 32 39 3A 20 |     2024:12:29:
@@ -80,7 +80,7 @@ I 25793 2023-11-24 23:03:38 - [Commands] Received from C-4 (version=GC_EP3 comma
 0000 | 96 00 0C 00 5C E6 6B 2C 3B 00 00 00             |     \ k,;
 I 25793 2023-11-24 23:03:38 - [Commands] Sending to C-4 (version=GC_EP3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 11 11 11 11 32 AC 99 83 |   ,         2
-0010 | 00 4A 53 33 00 B1 00 40 20 00 04 00 00 00 00 00 |    3   B`
+0010 | 00 4A 53 33 00 F1 00 40 20 00 04 00 00 00 00 00 |    3   B`
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 25793 2023-11-24 23:03:38 - [Commands] Received from C-4 (version=GC_EP3 command=B7 flag=00)
 0000 | B7 00 04 00                                     |
@@ -2134,7 +2134,7 @@ I 25793 2023-11-24 23:03:38 - [Commands] Sending to C-4 (version=GC_EP3_NTE comm
 7940 | 00 00 00 00                                     |
 I 25793 2023-11-24 23:03:38 - [Commands] Sending to C-4 (version=GC_EP3_NTE command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 11 11 11 11 32 AC 99 83 |   ,         2
-0010 | 54 4A 53 33 00 91 00 48 20 00 04 00 00 00 00 00 | TJS3   J`
+0010 | 54 4A 53 33 00 D1 00 48 20 00 04 00 00 00 00 00 | TJS3   J`
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 25793 2023-11-24 23:03:38 - [Commands] Received from C-4 (Tali) (version=GC_EP3_NTE command=D6 flag=00)
 0000 | D6 00 04 00                                     |
@@ -2168,7 +2168,7 @@ I 25793 2023-11-24 23:03:41 - [Commands] Sending to C-4 (Tali) (version=GC_EP3_N
 0000 | 97 01 04 00                                     |
 I 25793 2023-11-24 23:03:41 - [Commands] Sending to C-4 (Tali) (version=GC_EP3_NTE command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 11 11 11 11 32 AC 99 83 |   ,         2
-0010 | 54 4A 53 33 00 91 00 4C 20 00 00 00 00 00 00 00 | TJS3   L`
+0010 | 54 4A 53 33 00 D1 00 4C 20 00 00 00 00 00 00 00 | TJS3   L`
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 25793 2023-11-24 23:03:42 - [Commands] Received from C-4 (Tali) (version=GC_EP3_NTE command=B1 flag=00)
 0000 | B1 00 04 00                                     |
@@ -2217,12 +2217,12 @@ I 25793 2023-11-24 23:03:44 - [Commands] Received from C-5 (version=GC_V3 comman
 00A0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 00B0 | 00 00 00 00 00 00 00 00 00 00 00 00 54 61 6C 69 |             Tali
 00C0 | 00 00 00 00 00 00 00 00 00 00 00 00 32 AC 99 83 |             2
-00D0 | 54 4A 53 33 00 91 00 4C 20 00 00 00 00 00 00 00 | TJS3   L`
+00D0 | 54 4A 53 33 00 D1 00 4C 20 00 00 00 00 00 00 00 | TJS3   L`
 00E0 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 25793 2023-11-24 23:03:44 - [C-5] Game version changed to GC_EP3
 I 25793 2023-11-24 23:03:44 - [Commands] Sending to C-5 (version=GC_EP3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 11 11 11 11 32 AC 99 83 |   ,         2
-0010 | 54 4A 53 33 00 B1 00 4C 20 00 00 00 00 00 00 00 | TJS3   L`
+0010 | 54 4A 53 33 00 F1 00 4C 20 00 00 00 00 00 00 00 | TJS3   L`
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 25793 2023-11-24 23:03:44 - [Commands] Sending to C-5 (version=GC_EP3 command=B7 flag=00)
 0000 | B7 00 20 00 00 00 00 00 00 00 00 00 00 00 00 00 |
@@ -2356,7 +2356,7 @@ I 25793 2023-11-24 23:03:44 - [Commands] Received from C-5 (version=GC_EP3 comma
 I 25793 2023-11-24 23:03:44 - [C-5] Game version changed to GC_EP3_NTE
 I 25793 2023-11-24 23:03:44 - [Commands] Sending to C-5 (Tali) (version=GC_EP3_NTE command=C5 flag=01)
 0000 | 04 00 2C 00 00 00 01 00 11 11 11 11 32 AC 99 83 |   ,         2
-0010 | 54 4A 53 33 00 91 00 4C 20 00 00 00 00 00 00 00 | TJS3   L`
+0010 | 54 4A 53 33 00 D1 00 4C 20 00 00 00 00 00 00 00 | TJS3   L`
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 25793 2023-11-24 23:03:44 - [Commands] Sending to C-5 (Tali) (version=GC_EP3_NTE command=C5 flag=01)
 0000 | C5 01 20 01 00 00 00 00 FF 7F 00 00 00 00 00 00 |
@@ -2449,7 +2449,7 @@ I 25793 2023-11-24 23:03:44 - [Commands] Sending to C-5 (Tali) (version=GC_EP3_N
 0440 | FF FF FF FF FF FF FF FF FF FF FF FF             |
 I 25793 2023-11-24 23:03:44 - [Commands] Sending to C-5 (Tali) (version=GC_EP3_NTE command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 11 11 11 11 32 AC 99 83 |   ,         2
-0010 | 54 4A 53 33 00 93 00 4C 20 00 00 00 00 00 00 00 | TJS3   L`
+0010 | 54 4A 53 33 00 D3 00 4C 20 00 00 00 00 00 00 00 | TJS3   L`
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 25793 2023-11-24 23:03:45 - [Commands] Received from C-5 (Tali) (version=GC_EP3_NTE command=60 flag=00)
 0000 | 60 00 1C 00 3F 06 00 00 00 00 00 00 0F 00 FF FF | `   ?
@@ -2681,7 +2681,7 @@ I 25793 2023-11-24 23:04:08 - [Commands] Received from C-6 (version=GC_EP3 comma
 00A0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 00B0 | 00 00 00 00 00 00 00 00 00 00 00 00 54 61 6C 69 |             Tali
 00C0 | 00 00 00 00 00 00 00 00 00 00 00 00 32 AC 99 83 |             2
-00D0 | 54 4A 53 33 00 93 00 4C 20 00 00 00 00 00 00 00 | TJS3   L`
+00D0 | 54 4A 53 33 00 D3 00 4C 20 00 00 00 00 00 00 00 | TJS3   L`
 00E0 | 00 00 00 00 00 00 FF FF 80 FF FF FF 00 00 00 00 |
 00F0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 0100 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
@@ -2691,7 +2691,7 @@ I 25793 2023-11-24 23:04:08 - [Commands] Received from C-6 (version=GC_EP3 comma
 0140 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 I 25793 2023-11-24 23:04:08 - [Commands] Sending to C-6 (version=GC_EP3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 11 11 11 11 32 AC 99 83 |   ,         2
-0010 | 54 4A 53 33 00 B3 00 4C 20 00 00 00 00 00 00 00 | TJS3   L`
+0010 | 54 4A 53 33 00 F3 00 4C 20 00 00 00 00 00 00 00 | TJS3   L`
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 25793 2023-11-24 23:04:08 - [Commands] Sending to C-6 (version=GC_EP3 command=B7 flag=00)
 0000 | B1 00 20 00 32 30 32 34 3A 31 32 3A 32 39 3A 20 |     2024:12:29:
diff --git a/tests/GC-ForestGame.test.txt b/tests/GC-ForestGame.test.txt
index f6a1d975..567545cc 100644
--- a/tests/GC-ForestGame.test.txt
+++ b/tests/GC-ForestGame.test.txt
@@ -58,7 +58,7 @@ I 49108 2023-05-26 16:18:01 - [Commands] Received from C-1 (version=GC command=9
 0140 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 I 49108 2023-05-26 16:18:01 - [Commands] Sending to C-1 (version=GC command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 11 11 11 11 32 AC 99 83 |   ,         2
-0010 | 30 50 4F 33 00 11 00 40 20 00 00 00 00 00 00 00 |    3    `
+0010 | 30 50 4F 33 00 51 00 40 20 00 00 00 00 00 00 00 |    3    `
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 49108 2023-05-26 16:18:01 - [Commands] Sending to C-1 (version=GC command=D5 flag=00)
 0000 | B1 00 20 00 32 30 32 34 3A 31 32 3A 32 39 3A 20 |     2024:12:29:
@@ -71,7 +71,7 @@ I 49108 2023-05-26 16:18:01 - [Commands] Received from C-1 (version=GC command=9
 0000 | 96 00 0C 00 C7 32 CE 2A 57 00 00 00             |      2 *W
 I 49108 2023-05-26 16:18:01 - [Commands] Sending to C-1 (version=GC command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 11 11 11 11 32 AC 99 83 |   ,         2
-0010 | 30 50 4F 33 00 11 00 40 20 00 04 00 00 00 00 00 |    3    `
+0010 | 30 50 4F 33 00 51 00 40 20 00 04 00 00 00 00 00 |    3    `
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 49108 2023-05-26 16:18:02 - [Commands] Received from C-1 (version=GC command=D6 flag=00)
 0000 | D6 00 04 00                                     |
@@ -95,7 +95,7 @@ I 49108 2023-05-26 16:18:06 - [Commands] Sending to C-1 (version=GC command=97 f
 0000 | 97 01 04 00                                     |
 I 49108 2023-05-26 16:18:06 - [Commands] Sending to C-1 (version=GC command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 11 11 11 11 32 AC 99 83 |   ,         2
-0010 | 30 50 4F 33 00 11 00 44 20 00 00 00 00 00 00 00 |    3    `
+0010 | 30 50 4F 33 00 51 00 44 20 00 00 00 00 00 00 00 |    3    `
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 49108 2023-05-26 16:18:06 - [Commands] Received from C-1 (version=GC command=B1 flag=00)
 0000 | B1 00 04 00                                     |
@@ -146,11 +146,11 @@ I 49108 2023-05-26 16:18:08 - [Commands] Received from C-2 (version=GC command=9
 00A0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 00B0 | 00 00 00 00 00 00 00 00 00 00 00 00 4A 65 73 73 |             Jess
 00C0 | 00 00 00 00 00 00 00 00 00 00 00 00 32 AC 99 83 |   ,         2
-00D0 | 30 50 4F 33 00 11 00 44 20 00 00 00 00 00 00 00 |    3    `
+00D0 | 30 50 4F 33 00 51 00 44 20 00 00 00 00 00 00 00 |    3    `
 00E0 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 49108 2023-05-26 16:18:08 - [Commands] Sending to C-2 (version=GC command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 11 11 11 11 32 AC 99 83 |   ,         2
-0010 | 30 50 4F 33 00 11 00 44 20 00 00 00 00 00 00 00 |    3    `
+0010 | 30 50 4F 33 00 51 00 44 20 00 00 00 00 00 00 00 |    3    `
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 49108 2023-05-26 16:18:08 - [Commands] Sending to C-2 (version=GC command=83 flag=0F)
 0000 | 83 0F B8 00 33 00 00 33 01 00 00 00 00 00 00 00 |     3  3
@@ -363,7 +363,7 @@ I 49108 2023-05-26 16:18:08 - [Commands] Sending to C-2 (Jess) (version=GC comma
 0440 | 0D FF 05 03 01 01 00 04 00 FF FF FF             |
 I 49108 2023-05-26 16:18:08 - [Commands] Sending to C-2 (Jess) (version=GC command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 11 11 11 11 32 AC 99 83 |   ,         2
-0010 | 30 50 4F 33 00 13 00 44 20 00 00 00 00 00 00 00 |    3    `
+0010 | 30 50 4F 33 00 53 00 44 20 00 00 00 00 00 00 00 |    3    `
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 49108 2023-05-26 16:18:08 - [Commands] Received from C-2 (Jess) (version=GC command=60 flag=00)
 0000 | 60 00 1C 00 3F 06 00 00 00 00 00 80 0F 00 FF FF | `   ?
@@ -9999,7 +9999,7 @@ I 49108 2023-05-26 16:28:29 - [Commands] Received from C-3 (version=GC command=9
 00A0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 00B0 | 00 00 00 00 00 00 00 00 00 00 00 00 4A 65 73 73 |             Jess
 00C0 | 00 00 00 00 00 00 00 00 00 00 00 00 32 AC 99 83 |   ,         2
-00D0 | 30 50 4F 33 00 13 00 44 20 00 00 00 00 00 00 00 |    3    `
+00D0 | 30 50 4F 33 00 53 00 44 20 00 00 00 00 00 00 00 |    3    `
 00E0 | 00 00 00 00 00 00 FF FF 80 FF FF FF 00 00 00 00 |
 00F0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 0100 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
@@ -10009,7 +10009,7 @@ I 49108 2023-05-26 16:28:29 - [Commands] Received from C-3 (version=GC command=9
 0140 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 I 49108 2023-05-26 16:28:29 - [Commands] Sending to C-3 (version=GC command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 11 11 11 11 32 AC 99 83 |   ,         2
-0010 | 30 50 4F 33 00 13 00 44 20 00 00 00 00 00 00 00 |    3    `
+0010 | 30 50 4F 33 00 53 00 44 20 00 00 00 00 00 00 00 |    3    `
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 49108 2023-05-26 16:28:29 - [Commands] Sending to C-3 (version=GC command=07 flag=06)
 0000 | B1 00 20 00 32 30 32 34 3A 31 32 3A 32 39 3A 20 |     2024:12:29:
diff --git a/tests/GC-HeartSymbol.test.txt b/tests/GC-HeartSymbol.test.txt
index 355b7f41..e7aef6b7 100644
--- a/tests/GC-HeartSymbol.test.txt
+++ b/tests/GC-HeartSymbol.test.txt
@@ -59,7 +59,7 @@ I 23921 2024-03-03 21:20:43 - [Commands] Received from C-1 (version=GC_V3 comman
 0140 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 I 23921 2024-03-03 21:20:43 - [Commands] Sending to C-1 (version=GC_V3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 50 4F 33 00 11 00 40 20 00 00 00 00 00 00 00 | 0PO3   @
+0010 | 30 50 4F 33 00 51 00 40 20 00 00 00 00 00 00 00 | 0PO3   @
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 23921 2024-03-03 21:20:43 - [Commands] Sending to C-1 (version=GC_V3 command=D5 flag=00)
 0000 | B1 00 20 00 32 30 32 34 3A 31 32 3A 32 39 3A 20 |     2024:12:29:
@@ -72,7 +72,7 @@ I 23921 2024-03-03 21:20:43 - [Commands] Received from C-1 (version=GC_V3 comman
 0000 | 96 00 0C 00 C7 32 CE 2A 4B 03 00 00             |      2 *K
 I 23921 2024-03-03 21:20:43 - [Commands] Sending to C-1 (version=GC_V3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 50 4F 33 00 11 00 40 20 00 04 00 00 00 00 00 | 0PO3   @
+0010 | 30 50 4F 33 00 51 00 40 20 00 04 00 00 00 00 00 | 0PO3   @
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 23921 2024-03-03 21:20:43 - [Commands] Received from C-1 (version=GC_V3 command=D6 flag=00)
 0000 | D6 00 04 00                                     |
@@ -96,7 +96,7 @@ I 23921 2024-03-03 21:20:43 - [Commands] Sending to C-1 (version=GC_V3 command=9
 0000 | 97 01 04 00                                     |
 I 23921 2024-03-03 21:20:43 - [Commands] Sending to C-1 (version=GC_V3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 50 4F 33 00 11 00 44 20 00 00 00 00 00 00 00 | 0PO3   D
+0010 | 30 50 4F 33 00 51 00 44 20 00 00 00 00 00 00 00 | 0PO3   D
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 23921 2024-03-03 21:20:43 - [Commands] Received from C-1 (version=GC_V3 command=B1 flag=00)
 0000 | B1 00 04 00                                     |
@@ -145,11 +145,11 @@ I 23921 2024-03-03 21:20:44 - [Commands] Received from C-2 (version=GC_V3 comman
 00A0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 00B0 | 00 00 00 00 00 00 00 00 00 00 00 00 4A 65 73 73 |             Jess
 00C0 | 00 00 00 00 00 00 00 00 00 00 00 00 32 AC 99 83 |             2
-00D0 | 30 50 4F 33 00 11 00 44 20 00 00 00 00 00 00 00 | 0PO3   D
+00D0 | 30 50 4F 33 00 51 00 44 20 00 00 00 00 00 00 00 | 0PO3   D
 00E0 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 23921 2024-03-03 21:20:44 - [Commands] Sending to C-2 (version=GC_V3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 50 4F 33 00 11 00 44 20 00 00 00 00 00 00 00 | 0PO3   D
+0010 | 30 50 4F 33 00 51 00 44 20 00 00 00 00 00 00 00 | 0PO3   D
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 23921 2024-03-03 21:20:44 - [Commands] Sending to C-2 (version=GC_V3 command=83 flag=0F)
 0000 | 83 0F B8 00 33 00 00 33 01 00 00 00 00 00 00 00 |     3  3
@@ -371,7 +371,7 @@ I 23921 2024-03-03 21:20:44 - [Commands] Sending to C-2 (Jess) (version=GC_V3 co
 0440 | 0D FF 05 06 04 03 00 09 00 FF FF FF             |
 I 23921 2024-03-03 21:20:44 - [Commands] Sending to C-2 (Jess) (version=GC_V3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 50 4F 33 00 13 00 44 20 00 00 00 00 00 00 00 | 0PO3   D
+0010 | 30 50 4F 33 00 53 00 44 20 00 00 00 00 00 00 00 | 0PO3   D
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 23921 2024-03-03 21:20:44 - [Commands] Received from C-2 (Jess) (version=GC_V3 command=60 flag=00)
 0000 | 60 00 1C 00 3F 06 00 00 00 00 00 80 0F 00 FF FF | `   ?
diff --git a/tests/GC-PoisonRoom.test.txt b/tests/GC-PoisonRoom.test.txt
index fe19dec5..549daae7 100644
--- a/tests/GC-PoisonRoom.test.txt
+++ b/tests/GC-PoisonRoom.test.txt
@@ -59,7 +59,7 @@ I 56327 2024-03-03 23:38:31 - [Commands] Received from C-1 (version=GC_V3 comman
 0140 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 I 56327 2024-03-03 23:38:31 - [Commands] Sending to C-1 (version=GC_V3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 50 4F 33 00 11 00 40 20 00 00 00 00 00 00 00 | 0PO3   @
+0010 | 30 50 4F 33 00 51 00 40 20 00 00 00 00 00 00 00 | 0PO3   @
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 56327 2024-03-03 23:38:31 - [Commands] Sending to C-1 (version=GC_V3 command=D5 flag=00)
 0000 | B1 00 20 00 32 30 32 34 3A 31 32 3A 32 39 3A 20 |     2024:12:29:
@@ -72,7 +72,7 @@ I 56327 2024-03-03 23:38:31 - [Commands] Received from C-1 (version=GC_V3 comman
 0000 | 96 00 0C 00 C7 32 CE 2A 67 03 00 00             |      2 *g
 I 56327 2024-03-03 23:38:31 - [Commands] Sending to C-1 (version=GC_V3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 50 4F 33 00 11 00 40 20 00 04 00 00 00 00 00 | 0PO3   @
+0010 | 30 50 4F 33 00 51 00 40 20 00 04 00 00 00 00 00 | 0PO3   @
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 56327 2024-03-03 23:38:32 - [Commands] Received from C-1 (version=GC_V3 command=D6 flag=00)
 0000 | D6 00 04 00                                     |
@@ -96,7 +96,7 @@ I 56327 2024-03-03 23:38:32 - [Commands] Sending to C-1 (version=GC_V3 command=9
 0000 | 97 01 04 00                                     |
 I 56327 2024-03-03 23:38:32 - [Commands] Sending to C-1 (version=GC_V3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 50 4F 33 00 11 00 44 20 00 00 00 00 00 00 00 | 0PO3   D
+0010 | 30 50 4F 33 00 51 00 44 20 00 00 00 00 00 00 00 | 0PO3   D
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 56327 2024-03-03 23:38:32 - [Commands] Received from C-1 (version=GC_V3 command=B1 flag=00)
 0000 | B1 00 04 00                                     |
@@ -145,11 +145,11 @@ I 56327 2024-03-03 23:38:32 - [Commands] Received from C-2 (version=GC_V3 comman
 00A0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 00B0 | 00 00 00 00 00 00 00 00 00 00 00 00 4A 65 73 73 |             Jess
 00C0 | 00 00 00 00 00 00 00 00 00 00 00 00 32 AC 99 83 |             2
-00D0 | 30 50 4F 33 00 11 00 44 20 00 00 00 00 00 00 00 | 0PO3   D
+00D0 | 30 50 4F 33 00 51 00 44 20 00 00 00 00 00 00 00 | 0PO3   D
 00E0 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 56327 2024-03-03 23:38:32 - [Commands] Sending to C-2 (version=GC_V3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 50 4F 33 00 11 00 44 20 00 00 00 00 00 00 00 | 0PO3   D
+0010 | 30 50 4F 33 00 51 00 44 20 00 00 00 00 00 00 00 | 0PO3   D
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 56327 2024-03-03 23:38:32 - [Commands] Sending to C-2 (version=GC_V3 command=83 flag=0F)
 0000 | 83 0F B8 00 33 00 00 33 01 00 00 00 00 00 00 00 |     3  3
@@ -371,7 +371,7 @@ I 56327 2024-03-03 23:38:32 - [Commands] Sending to C-2 (Jess) (version=GC_V3 co
 0440 | 0D FF 05 06 04 03 00 09 00 FF FF FF             |
 I 56327 2024-03-03 23:38:32 - [Commands] Sending to C-2 (Jess) (version=GC_V3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 30 50 4F 33 00 13 00 44 20 00 00 00 00 00 00 00 | 0PO3   D
+0010 | 30 50 4F 33 00 53 00 44 20 00 00 00 00 00 00 00 | 0PO3   D
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 56327 2024-03-03 23:38:33 - [Commands] Received from C-2 (Jess) (version=GC_V3 command=60 flag=00)
 0000 | 60 00 1C 00 3F 06 00 00 00 00 00 80 0F 00 FF FF | `   ?
@@ -23185,7 +23185,7 @@ I 56327 2024-03-03 23:56:37 - [Commands] Received from C-4 (version=GC_V3 comman
 0140 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 I 56327 2024-03-03 23:56:37 - [Commands] Sending to C-4 (version=GC_V3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 00 00 4F 33 00 10 00 40 20 00 00 00 00 00 00 00 |    3   @
+0010 | 00 00 4F 33 00 50 00 40 20 00 00 00 00 00 00 00 |    3   @
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 56327 2024-03-03 23:56:37 - [Commands] Sending to C-4 (version=GC_V3 command=D5 flag=00)
 0000 | B1 00 20 00 32 30 32 34 3A 31 32 3A 33 30 3A 20 |     2024:12:30:
@@ -23198,7 +23198,7 @@ I 56327 2024-03-03 23:56:37 - [Commands] Received from C-4 (version=GC_V3 comman
 0000 | 96 00 0C 00 28 59 6C 2B 08 01 00 00             |     (Yl+
 I 56327 2024-03-03 23:56:37 - [Commands] Sending to C-4 (version=GC_V3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 00 00 4F 33 00 10 00 40 20 00 04 00 00 00 00 00 |    3   @
+0010 | 00 00 4F 33 00 50 00 40 20 00 04 00 00 00 00 00 |    3   @
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 56327 2024-03-03 23:56:38 - [Commands] Received from C-4 (version=GC_V3 command=D6 flag=00)
 0000 | D6 00 04 00                                     |
@@ -23222,7 +23222,7 @@ I 56327 2024-03-03 23:56:38 - [Commands] Sending to C-4 (version=GC_V3 command=9
 0000 | 97 01 04 00                                     |
 I 56327 2024-03-03 23:56:38 - [Commands] Sending to C-4 (version=GC_V3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 00 00 4F 33 00 10 00 44 20 00 00 00 00 00 00 00 |    3   D
+0010 | 00 00 4F 33 00 50 00 44 20 00 00 00 00 00 00 00 |    3   D
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 56327 2024-03-03 23:56:38 - [Commands] Received from C-4 (version=GC_V3 command=B1 flag=00)
 0000 | B1 00 04 00                                     |
@@ -23271,11 +23271,11 @@ I 56327 2024-03-03 23:56:38 - [Commands] Received from C-5 (version=GC_V3 comman
 00A0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
 00B0 | 00 00 00 00 00 00 00 00 00 00 00 00 4E 4F 20 44 |             NO D
 00C0 | 41 54 41 20 00 00 00 00 00 00 00 00 32 AC 99 83 | ATA         2
-00D0 | 00 00 4F 33 00 10 00 44 20 00 00 00 00 00 00 00 |    3   D
+00D0 | 00 00 4F 33 00 50 00 44 20 00 00 00 00 00 00 00 |    3   D
 00E0 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 56327 2024-03-03 23:56:38 - [Commands] Sending to C-5 (version=GC_V3 command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 1E B1 05 17 32 AC 99 83 |   ,         2
-0010 | 00 00 4F 33 00 10 00 44 20 00 00 00 00 00 00 00 |    3   D
+0010 | 00 00 4F 33 00 50 00 44 20 00 00 00 00 00 00 00 |    3   D
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 56327 2024-03-03 23:56:38 - [Commands] Sending to C-5 (version=GC_V3 command=83 flag=0F)
 0000 | 83 0F B8 00 33 00 00 33 01 00 00 00 00 00 00 00 |     3  3
diff --git a/tests/XB-ForestGame.test.txt b/tests/XB-ForestGame.test.txt
index 0a585c9d..999b0f6d 100644
--- a/tests/XB-ForestGame.test.txt
+++ b/tests/XB-ForestGame.test.txt
@@ -52,7 +52,7 @@ I 16496 2023-11-08 01:54:08 - [Commands] Received from C-1 (version=XB command=9
 0020 | 00 00 00 00                                     |
 I 16496 2023-11-08 01:54:08 - [Commands] Sending to C-1 (version=XB command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 E2 D4 45 39 32 AC 99 83 |   ,       E92
-0010 | 00 00 4F 34 00 91 00 40 20 00 00 00 00 00 00 00 |    4   B`
+0010 | 00 00 4F 34 00 D1 00 40 20 00 00 00 00 00 00 00 |    4   B`
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 16496 2023-11-08 01:54:08 - [Commands] Sending to C-1 (version=XB command=D5 flag=00)
 0000 | B1 00 20 00 32 30 32 34 3A 31 32 3A 32 39 3A 20 |     2024:12:29:
@@ -65,7 +65,7 @@ I 16496 2023-11-08 01:54:09 - [Commands] Received from C-1 (version=XB command=9
 0000 | 96 00 0C 00 7C 9C DA 2C 62 00 00 00             |     |  ,b
 I 16496 2023-11-08 01:54:09 - [Commands] Sending to C-1 (version=XB command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 E2 D4 45 39 32 AC 99 83 |   ,       E92
-0010 | 00 00 4F 34 00 91 00 40 20 00 04 00 00 00 00 00 |    4   @`
+0010 | 00 00 4F 34 00 D1 00 40 20 00 04 00 00 00 00 00 |    4   @`
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 16496 2023-11-08 01:54:13 - [Commands] Received from C-1 (version=XB command=D6 flag=00)
 0000 | D6 00 04 00                                     |
@@ -85,7 +85,7 @@ I 16496 2023-11-08 01:54:15 - [Commands] Sending to C-1 (version=XB command=97 f
 0000 | 97 01 04 00                                     |
 I 16496 2023-11-08 01:54:15 - [Commands] Sending to C-1 (version=XB command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 E2 D4 45 39 32 AC 99 83 |   ,       E92
-0010 | 00 00 4F 34 00 91 00 44 20 00 00 00 00 00 00 00 |    4   D`
+0010 | 00 00 4F 34 00 D1 00 44 20 00 00 00 00 00 00 00 |    4   D`
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 16496 2023-11-08 01:54:16 - [Commands] Received from C-1 (version=XB command=B1 flag=00)
 0000 | B1 00 04 00                                     |
@@ -147,12 +147,12 @@ I 16496 2023-11-08 01:54:17 - [Commands] Received from C-2 (version=XB command=9
 I 16496 2023-11-08 01:54:17 - [Commands] Sending to C-2 (version=XB command=9F flag=00)
 0000 | 9F 00 04 00                                     |
 I 16496 2023-11-08 01:54:18 - [Commands] Received from C-2 (version=XB command=9F flag=00)
-0000 | 9F 00 24 00 32 AC 99 83 00 00 4F 34 00 91 00 44 |   $ 2      4   D
+0000 | 9F 00 24 00 32 AC 99 83 00 00 4F 34 00 D1 00 44 |   $ 2      4   D
 0010 | 20 00 00 00 00 00 00 00 00 00 00 00 00 00 FF FF | `
 0020 | 80 FF FF FF                                     |
 I 16496 2023-11-08 01:54:18 - [Commands] Sending to C-2 (version=XB command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 E2 D4 45 39 32 AC 99 83 |   ,       E92
-0010 | 00 00 4F 34 00 91 00 44 20 00 00 00 00 00 00 00 |    4   D`
+0010 | 00 00 4F 34 00 D1 00 44 20 00 00 00 00 00 00 00 |    4   D`
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 16496 2023-11-08 01:54:18 - [Commands] Sending to C-2 (version=XB command=83 flag=0F)
 0000 | 83 0F B8 00 33 00 00 33 01 00 00 00 00 00 00 00 |     3  3
@@ -369,7 +369,7 @@ I 16496 2023-11-08 01:54:18 - [Commands] Sending to C-2 (Tali) (version=XB comma
 0480 | FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF |
 I 16496 2023-11-08 01:54:18 - [Commands] Sending to C-2 (Tali) (version=XB command=04 flag=00)
 0000 | 04 00 2C 00 00 00 01 00 E2 D4 45 39 32 AC 99 83 |   ,       E92
-0010 | 00 00 4F 34 00 93 00 44 20 00 00 00 00 00 00 00 |    4   D`
+0010 | 00 00 4F 34 00 D3 00 44 20 00 00 00 00 00 00 00 |    4   D`
 0020 | 00 00 00 00 00 00 FF FF 80 FF FF FF             |
 I 16496 2023-11-08 01:54:19 - [Commands] Received from C-2 (Tali) (version=XB command=60 flag=00)
 0000 | 60 00 1C 00 3F 06 00 00 00 00 00 80 0F 00 FF FF | `   ?