diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index d0ef53b3..83c639cf 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -988,10 +988,16 @@ struct FFXIVIpcExamine :
   char level;
   uint16_t padding;
   uint16_t titleId;
-  //char grandCompany;
-  //char grandCompanyRank;
+  char grandCompany;
+  char grandCompanyRank;
 
-  char unknown[56];
+  char unknown[6];
+  uint32_t u6_fromPSpawn;
+  uint32_t u7_fromPSpawn;
+  char padding1[8];
+  uint64_t mainWeaponModel;
+  uint64_t secWeaponModel;
+  char unknown2[16];
   struct ItemData
   {
     uint32_t catalogId;
diff --git a/src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp
index 3d97b534..cf52481a 100644
--- a/src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp
@@ -57,12 +57,17 @@ void examineHandler( Core::Entity::Player& player, uint32_t targetId )
       strcpy( packet->data().name, pPlayer->getName().c_str() );
       packet->data().classJob = static_cast< uint8_t >( pPlayer->getClass() );
       packet->data().level = pPlayer->getLevel();
+
       packet->data().unkFlag1 = 4;
       packet->data().unkFlag2 = 1;
-      packet->data().titleId = pPlayer->getTitle();
 
-      //packet->data().grandCompany = 1;
-      //packet->data().grandCompanyRank = 2;
+      packet->data().titleId = pPlayer->getTitle();
+      packet->data().grandCompany = 1;
+      packet->data().grandCompanyRank = 10;
+
+      packet->data().mainWeaponModel = pPlayer->getModelMainWeapon();
+      packet->data().secWeaponModel = pPlayer->getModelSubWeapon();
+
       memcpy( packet->data().look, pPlayer->getLookArray(), sizeof( packet->data().look ) );
       packet->data().models[ 0 ] = pPlayer->getModelForSlot( Common::GearSetSlot::Head );
       packet->data().models[ 1 ] = pPlayer->getModelForSlot( Common::GearSetSlot::Body );