diff --git a/Helpers/HuntHelper.cs b/Helpers/HuntHelper.cs
index 2ba91b7..150f778 100644
--- a/Helpers/HuntHelper.cs
+++ b/Helpers/HuntHelper.cs
@@ -71,7 +71,7 @@ private static class Offsets
             [Offset("Search E8 ?? ?? ?? ?? 48 85 C0 74 ?? 0F B7 40 ?? 66 85 C0 74 ?? 40 FE CF TraceCall")]
             internal static IntPtr Client__ExdData__getMobHuntOrderType;
 
-            [Offset("Search E8 ?? ?? ?? ?? 48 8B F8 48 85 C0 0F 84 ?? ?? ?? ?? 0F B7 48 ?? TraceCall")]
+            [Offset("Search E8 ? ? ? ? 4C 8B E8 48 85 C0 0F 84 ? ? ? ? 48 8D 4D ? TraceCall")]
             internal static IntPtr Client__ExdData__getMobHuntTarget;
 
             [Offset("Search 49 83 F8 ?? 73 ?? 41 8B C0 Add 3 Read8")]
diff --git a/Helpers/ScreenshotHelper.cs b/Helpers/ScreenshotHelper.cs
index 9cd498f..f58e1b0 100644
--- a/Helpers/ScreenshotHelper.cs
+++ b/Helpers/ScreenshotHelper.cs
@@ -11,8 +11,7 @@ public static class ScreenshotHelper
         private static class Offsets
         {
             //7.1
-            //TODO: Update this offset
-            [Offset("Search E8 ? ? ? ? 84 C0 75 19 F3 0F 10 05 ? ? ? ? Add 1 TraceRelative")]
+            [Offset("Search E8 ? ? ? ? 84 C0 75 ? C6 05 ? ? ? ? ? E8 ? ? ? ? 48 89 05 ? ? ? ? Add 1 TraceRelative")]
             [OffsetCN("Search E8 ? ? ? ? 84 C0 75 19 F3 0F 10 05 ? ? ? ? Add 1 TraceRelative")]
             internal static IntPtr ScreenshotFunc;
 
@@ -23,23 +22,21 @@ private static class Offsets
             internal static IntPtr ScreenshotStruct;
 
             //7.1
-            //TODO: Update this offset
-            [Offset("Search C6 05 ? ? ? ? ? 48 83 C4 ? 5F C3 48 8B 4F ? Add 2 TraceRelative")]
+            [Offset("Search C6 05 ? ? ? ? ? E8 ? ? ? ? 48 8B 5C 24 ? Add 2 TraceRelative")]
             [OffsetCN("Search C6 05 ? ? ? ? ? 48 83 C4 ? 5F C3 48 8B 4F ? Add 2 TraceRelative")]
             internal static IntPtr ScreenshotState;
 
             [Offset("Search 48 8D 4B ? 48 8D 44 24 ? 48 3B C1 Add 3 Read8")]
             internal static int Filename;
 
-            [Offset("Search C6 43 ? ? B0 ? 48 83 C4 ? 5B C3 ? ? ? ? ? ? 40 53 Add 2 Read16")]
-            [OffsetDawntrail("Search C6 43 ? ? B0 ? 48 83 C4 ? 5B C3 ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? 40 53 48 81 EC ? ? ? ? Add 2 Read16")]
+            [Offset("Search C6 43 ? ? B0 ? 48 83 C4 ? 5B C3 ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? 40 53 48 81 EC ? ? ? ? Add 2 Read16")]
             internal static int Busy;
 
             //7.1
             //TODO: Update this offset
-            [Offset("Search F3 0F 10 15 ? ? ? ? 0F 57 C0 0F 2F D0 Add 4 TraceRelative")]
+            /*[Offset("Search F3 0F 10 15 ? ? ? ? 0F 57 C0 0F 2F D0 Add 4 TraceRelative")]
             [OffsetCN("Search F3 0F 10 15 ? ? ? ? 0F 57 C0 0F 2F D0 Add 4 TraceRelative")]
-            internal static IntPtr FloatThing;
+            internal static IntPtr FloatThing;*/
         }
 
         public static IntPtr ScreenshotStruct => Core.Memory.Read<IntPtr>(Offsets.ScreenshotStruct);
diff --git a/Memory/OffsetManager.cs b/Memory/OffsetManager.cs
index 47fc27c..b366ece 100644
--- a/Memory/OffsetManager.cs
+++ b/Memory/OffsetManager.cs
@@ -59,7 +59,7 @@ public static class OffsetManager
 
     public static ConcurrentDictionary<string, long> OffsetCache = new();
 
-    private const long _version = 25;
+    private const long _version = 26;
 
     private const bool _debug = false;
 
diff --git a/RemoteAgents/AgentInclusionShop.cs b/RemoteAgents/AgentInclusionShop.cs
index 496408e..893157b 100644
--- a/RemoteAgents/AgentInclusionShop.cs
+++ b/RemoteAgents/AgentInclusionShop.cs
@@ -30,8 +30,7 @@ internal static class Offsets
 
             //0x20
             //7.1
-            //TODO: Update this offset
-            [Offset("Search 8B 45 ? 3D ? ? ? ? 74 ? 3D ? ? ? ? 75 ? B2 ? Add 2 Read8")]
+            [Offset("Search 41 8B 44 24 ? 3D ? ? ? ? 74 ? 3D ? ? ? ? 75 ? Add 2 Read8")]
             [OffsetCN("Search 8B 45 ? 3D ? ? ? ? 74 ? 3D ? ? ? ? 75 ? B2 ? Add 2 Read8")]
             internal static int ShopKey;
 
@@ -46,8 +45,7 @@ internal static class Offsets
 
             //0x1223
             //7.1
-            //TODO: Update this offset
-            [Offset("Search 40 38 B9 ? ? ? ? 0F 86 ? ? ? ? 45 8B FE Add 3 Read32")]
+            [Offset("Search 40 38 B9 ? ? ? ? 0F 86 ? ? ? ? 4C 8B 6C 24 ? Add 3 Read32")]
             [OffsetCN("Search 40 38 B9 ? ? ? ? 0F 86 ? ? ? ? 45 8B FE Add 3 Read32")]
             internal static int NumberOfSubCategories;
 
@@ -104,8 +102,7 @@ internal static class Offsets
             internal static int SubCategoryEnabled;
 
             //7.1
-            //TODO: Update this offset
-            [Offset("Search 45 8B 64 B7 ? Add 4 Read8")]
+            [Offset("Search 47 8B 64 B5 ? Add 4 Read8")]
             [OffsetCN("Search 45 8B 64 B7 ? Add 4 Read8")]
             internal static int ItemStructAdjustment;
         }