diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 1dc26c87..ad8d9a88 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -1003,24 +1003,15 @@ namespace Sapphire::Network::Packets::Server
     uint8_t sightseeing21To80Unlock;
     uint8_t sightseeingHeavenswardUnlock;
     uint8_t unknown9E[26];
-    uint32_t exp[Common::CLASSJOB_SLOTS];
+    uint32_t exp[32];
     uint32_t pvpTotalExp;
     uint32_t unknownPvp124;
     uint32_t pvpExp;
     uint32_t pvpFrontlineOverallRanks[3];
     uint32_t unknown138;
-    uint16_t levels[Common::CLASSJOB_SLOTS];
-    /*
-    uint16_t unknown178[8];
-    uint16_t fishingRecordsFishId[33];
-    uint16_t fishingRecordsFishLength[33];
-    uint16_t beastExp[17];
-    uint16_t unknown21C[6];
-    uint16_t pvpFrontlineWeeklyRanks[3];
-    uint16_t unknownMask22C[8];
-    */
+    uint16_t levels[32];
     uint8_t unknown194[218];
-    uint8_t companionName[21];
+    char companionName[21];
     uint8_t companionDefRank;
     uint8_t companionAttRank;
     uint8_t companionHealRank;
@@ -1029,34 +1020,27 @@ namespace Sapphire::Network::Packets::Server
     uint8_t unknown281[23];
     char name[32];
     uint8_t unknown293[16];
-    uint8_t unknown2A3;
+    uint8_t unknown2A3[16];
     uint8_t unlockBitmask[64];
     uint8_t aetheryte[26];
     uint16_t favoriteAetheryteIds[4];
     uint16_t freeAetheryteId;
     uint16_t psPlusFreeAetheryteId;
-    uint8_t discovery[472];
+    uint8_t discovery[480];
     uint8_t howto[36];
     uint8_t unknown554[4];
     uint8_t minions[60];
     uint8_t chocoboTaxiMask[12];
-    uint8_t watchedCutscenes[154];
+    uint8_t watchedCutscenes[159];
     uint8_t companionBardingMask[12];
-    uint8_t unknownMask64E[23];
     uint8_t companionEquippedHead;
     uint8_t companionEquippedBody;
     uint8_t companionEquippedLegs;
-    uint8_t fishingGuideMask[161];
-    uint8_t fishingSpotVisited[38];
-    uint8_t unknown694[34];
-    uint8_t unknown6B6[7];
-    uint8_t unknownPvp6BD[3];
-    uint8_t beastRank[17];
-    uint8_t unknownPvp6CE[12];
+    uint8_t unknownMask[287];
     uint8_t pose[7];
     uint8_t unknown6DF[3];
     uint8_t challengeLogComplete[13];
-    uint8_t secretRecipeBookMask[10];
+    uint8_t secretRecipeBookMask[12];
     uint8_t unknownMask6F7[29];
     uint8_t relicCompletion[12];
     uint8_t sightseeingMask[37];
@@ -1070,10 +1054,7 @@ namespace Sapphire::Network::Packets::Server
     uint8_t orchestrionMask[87];
     uint8_t hallOfNoviceCompletion[3];
     uint8_t animaCompletion[11];
-    uint8_t unknown85E[16];
-    uint8_t unknown86E[4];
-    uint8_t unknown872[18];
-    uint8_t unknown880;
+    uint8_t unknown85E[41];
     uint8_t unlockedRaids[28];
     uint8_t unlockedDungeons[18];
     uint8_t unlockedGuildhests[10];
@@ -1084,10 +1065,7 @@ namespace Sapphire::Network::Packets::Server
     uint8_t clearedGuildhests[10];
     uint8_t clearedTrials[12];
     uint8_t clearedPvp[5];
-    uint8_t unknown948[6];
-    uint8_t unknown94C[2];
-    uint8_t unknown94E[2];
-    uint8_t unknownA06[2];
+    uint8_t unknown948[15];
   };