diff --git a/README.md b/README.md
index 20e7b2a..89566cf 100644
--- a/README.md
+++ b/README.md
@@ -5,4 +5,4 @@ UnknownCheats thread: https://www.unknowncheats.me/forum/apex-legends/406426-kvm
 
 Bone IDs reference: https://www.unknowncheats.me/wiki/Apex_Legends_Bones_and_Hitboxes
 
-Game version (Steam & Origin): v3.0.33.21
+Game version (Steam & Origin): v3.0.39.35
diff --git a/apex_dma/offsets.h b/apex_dma/offsets.h
index 2f86252..1eb710a 100644
--- a/apex_dma/offsets.h
+++ b/apex_dma/offsets.h
@@ -5,11 +5,11 @@
 
 #if VERSION == STEAM
 
-    #define OFFSET_ENTITYLIST			0x1d88fc8
-    #define OFFSET_LOCAL_ENT			0x0213a5c0 + 0x8 //.?AVC_GameMovement@@ + 0x8
-    #define OFFSET_NAME_LIST            0xbd28ca0
-    #define OFFSET_THIRDPERSON          0x01d18740 + 0x6c //thirdperson_override + 0x6c
-    #define OFFSET_TIMESCALE            0x016cdc80 //host_timescale
+    #define OFFSET_ENTITYLIST			0x1e54dc8
+    #define OFFSET_LOCAL_ENT			0x22048C0 + 0x8 //.?AVC_GameMovement@@ + 0x8
+    #define OFFSET_NAME_LIST            0xbe95d60
+    #define OFFSET_THIRDPERSON          0x01de45d0 + 0x6c //thirdperson_override + 0x6c
+    #define OFFSET_TIMESCALE            0x01799bd0 //host_timescale
 
     #define OFFSET_TEAM					0x044c //m_iTeamNum
     #define OFFSET_HEALTH				0x043c //m_iHealth
@@ -17,32 +17,32 @@
     #define OFFSET_NAME					0x589 //m_iName
     #define OFFSET_SIGN_NAME			0x580 //m_iSignifierName
     #define OFFSET_ABS_VELOCITY         0x140 //m_vecAbsVelocity
-    #define OFFSET_VISIBLE_TIME         0x1a80 //CPlayer!lastVisibleTime
-    #define OFFSET_ZOOMING      		0x1c61 //m_bZooming
-    #define OFFSET_THIRDPERSON_SV       0x36e0 //m_thirdPersonShoulderView
-    #define OFFSET_YAW                  0x22c4 - 0x8 //m_currentFramePlayer.m_ammoPoolCount - 0x8
+    #define OFFSET_VISIBLE_TIME         0x1A70 //CPlayer!lastVisibleTime
+    #define OFFSET_ZOOMING      		0x1c51 //m_bZooming
+    #define OFFSET_THIRDPERSON_SV       0x36e8 //m_thirdPersonShoulderView
+    #define OFFSET_YAW                  0x22bc - 0x8 //m_currentFramePlayer.m_ammoPoolCount - 0x8
 
     #define OFFSET_LIFE_STATE			0x798  //m_lifeState, >0 = dead
     #define OFFSET_BLEED_OUT_STATE		0x2750 //m_bleedoutState, >0 = knocked
 
     #define OFFSET_ORIGIN				0x014c //m_vecAbsOrigin
     #define OFFSET_BONES				0x0e98 + 0x48 //m_nForceBone + 0x48
-    #define OFFSET_STUDIOHDR            0x10f0 //CBaseAnimating!m_pStudioHdr
-    #define OFFSET_AIMPUNCH				0x24c0 //m_currentFrameLocalPlayer.m_vecPunchWeapon_Angle
-    #define OFFSET_CAMERAPOS			0x1f58 //CPlayer!camera_origin
-    #define OFFSET_VIEWANGLES			0x25bc - 0x14 //m_ammoPoolCapacity - 0x14
+    #define OFFSET_STUDIOHDR            0x10e8 //CBaseAnimating!m_pStudioHdr
+    #define OFFSET_AIMPUNCH				0x24b8 //m_currentFrameLocalPlayer.m_vecPunchWeapon_Angle
+    #define OFFSET_CAMERAPOS			0x1f50 //CPlayer!camera_origin
+    #define OFFSET_VIEWANGLES			0x25b4 - 0x14 //m_ammoPoolCapacity - 0x14
     #define OFFSET_BREATH_ANGLES		OFFSET_VIEWANGLES - 0x10
-    #define OFFSET_OBSERVER_MODE		0x34ec //m_iObserverMode
-    #define OFFSET_OBSERVING_TARGET		0x34f8 //m_hObserverTarget
+    #define OFFSET_OBSERVER_MODE		0x34f4 //m_iObserverMode
+    #define OFFSET_OBSERVING_TARGET		0x3500 //m_hObserverTarget
 
-    #define OFFSET_MATRIX				0x11a350
-    #define OFFSET_RENDER				0x7401cd0
+    #define OFFSET_MATRIX				0x11A350
+    #define OFFSET_RENDER				0x743BCA0
 
-    #define OFFSET_WEAPON				0x1a24 //m_latestPrimaryWeapons
-    #define OFFSET_BULLET_SPEED         0x1f50 //CWeaponX!m_flProjectileSpeed
-    #define OFFSET_BULLET_SCALE         0x1f58 //CWeaponX!m_flProjectileScale
-    #define OFFSET_ZOOM_FOV             0x16c0 + 0xb8 //m_playerData + m_curZoomFOV
-    #define OFFSET_AMMO                 0x1644 //m_ammoInClip
+    #define OFFSET_WEAPON				0x1a14 //m_latestPrimaryWeapons
+    #define OFFSET_BULLET_SPEED         0x1F3C //CWeaponX!m_flProjectileSpeed
+    #define OFFSET_BULLET_SCALE         0x1F44 //CWeaponX!m_flProjectileScale
+    #define OFFSET_ZOOM_FOV             0x16b0 + 0xb8 //m_playerData + m_curZoomFOV
+    #define OFFSET_AMMO                 0x1634 //m_ammoInClip
 
     #define OFFSET_ITEM_GLOW            0x2c0 //m_highlightFunctionBits
 
@@ -53,11 +53,11 @@
 
 #elif VERSION == ORIGIN
 
-    #define OFFSET_ENTITYLIST			0x1d88fc8
-    #define OFFSET_LOCAL_ENT			0x0213a5c0 + 0x8 //.?AVC_GameMovement@@ + 0x8
-    #define OFFSET_NAME_LIST            0xbd28ca0
-    #define OFFSET_THIRDPERSON          0x01d18740 + 0x6c //thirdperson_override + 0x6c
-    #define OFFSET_TIMESCALE            0x016cdc80 //host_timescale
+    #define OFFSET_ENTITYLIST			0x1e54dc8
+    #define OFFSET_LOCAL_ENT			0x22048C0 + 0x8 //.?AVC_GameMovement@@ + 0x8
+    #define OFFSET_NAME_LIST            0xbe95d60
+    #define OFFSET_THIRDPERSON          0x01de45d0 + 0x6c //thirdperson_override + 0x6c
+    #define OFFSET_TIMESCALE            0x01799bd0 //host_timescale
 
     #define OFFSET_TEAM					0x044c //m_iTeamNum
     #define OFFSET_HEALTH				0x043c //m_iHealth
@@ -65,32 +65,32 @@
     #define OFFSET_NAME					0x589 //m_iName
     #define OFFSET_SIGN_NAME			0x580 //m_iSignifierName
     #define OFFSET_ABS_VELOCITY         0x140 //m_vecAbsVelocity
-    #define OFFSET_VISIBLE_TIME         0x1a80 //CPlayer!lastVisibleTime
-    #define OFFSET_ZOOMING      		0x1c61 //m_bZooming
-    #define OFFSET_THIRDPERSON_SV       0x36e0 //m_thirdPersonShoulderView
-    #define OFFSET_YAW                  0x22c4 - 0x8 //m_currentFramePlayer.m_ammoPoolCount - 0x8
+    #define OFFSET_VISIBLE_TIME         0x1A70 //CPlayer!lastVisibleTime
+    #define OFFSET_ZOOMING      		0x1c51 //m_bZooming
+    #define OFFSET_THIRDPERSON_SV       0x36e8 //m_thirdPersonShoulderView
+    #define OFFSET_YAW                  0x22bc - 0x8 //m_currentFramePlayer.m_ammoPoolCount - 0x8
 
     #define OFFSET_LIFE_STATE			0x798  //m_lifeState, >0 = dead
     #define OFFSET_BLEED_OUT_STATE		0x2750 //m_bleedoutState, >0 = knocked
 
     #define OFFSET_ORIGIN				0x014c //m_vecAbsOrigin
     #define OFFSET_BONES				0x0e98 + 0x48 //m_nForceBone + 0x48
-    #define OFFSET_STUDIOHDR            0x10f0 //CBaseAnimating!m_pStudioHdr
-    #define OFFSET_AIMPUNCH				0x24c0 //m_currentFrameLocalPlayer.m_vecPunchWeapon_Angle
-    #define OFFSET_CAMERAPOS			0x1f58 //CPlayer!camera_origin
-    #define OFFSET_VIEWANGLES			0x25bc - 0x14 //m_ammoPoolCapacity - 0x14
+    #define OFFSET_STUDIOHDR            0x10e8 //CBaseAnimating!m_pStudioHdr
+    #define OFFSET_AIMPUNCH				0x24b8 //m_currentFrameLocalPlayer.m_vecPunchWeapon_Angle
+    #define OFFSET_CAMERAPOS			0x1f50 //CPlayer!camera_origin
+    #define OFFSET_VIEWANGLES			0x25b4 - 0x14 //m_ammoPoolCapacity - 0x14
     #define OFFSET_BREATH_ANGLES		OFFSET_VIEWANGLES - 0x10
-    #define OFFSET_OBSERVER_MODE		0x34ec //m_iObserverMode
-    #define OFFSET_OBSERVING_TARGET		0x34f8 //m_hObserverTarget
+    #define OFFSET_OBSERVER_MODE		0x34f4 //m_iObserverMode
+    #define OFFSET_OBSERVING_TARGET		0x3500 //m_hObserverTarget
 
-    #define OFFSET_MATRIX				0x11a350
-    #define OFFSET_RENDER				0x7401cd0
+    #define OFFSET_MATRIX				0x11A350
+    #define OFFSET_RENDER				0x743BCA0
 
-    #define OFFSET_WEAPON				0x1a24 //m_latestPrimaryWeapons
-    #define OFFSET_BULLET_SPEED         0x1f50 //CWeaponX!m_flProjectileSpeed
-    #define OFFSET_BULLET_SCALE         0x1f58 //CWeaponX!m_flProjectileScale
-    #define OFFSET_ZOOM_FOV             0x16c0 + 0xb8 //m_playerData + m_curZoomFOV
-    #define OFFSET_AMMO                 0x1644 //m_ammoInClip
+    #define OFFSET_WEAPON				0x1a14 //m_latestPrimaryWeapons
+    #define OFFSET_BULLET_SPEED         0x1F3C //CWeaponX!m_flProjectileSpeed
+    #define OFFSET_BULLET_SCALE         0x1F44 //CWeaponX!m_flProjectileScale
+    #define OFFSET_ZOOM_FOV             0x16b0 + 0xb8 //m_playerData + m_curZoomFOV
+    #define OFFSET_AMMO                 0x1634 //m_ammoInClip
 
     #define OFFSET_ITEM_GLOW            0x2c0 //m_highlightFunctionBits