diff --git a/gamedata/sdktools.games/engine.csgo.txt b/gamedata/sdktools.games/engine.csgo.txt
index e2b2c8cb..ae51bb27 100644
--- a/gamedata/sdktools.games/engine.csgo.txt
+++ b/gamedata/sdktools.games/engine.csgo.txt
@@ -125,7 +125,7 @@
 			"EntityFactoryFinder"
 			{
 				"library"	"server"
-				"windows"	"\xFF\x75\x2A\x83\xEC\x0C\xC7\x05\x2A\x2A\x2A\x2A\x2A\x2A\x2A\x2A\xB9\x2A\x2A\x2A\x2A\xE8\x2A\x2A\x2A\x2A\x68"
+				"windows"	"\xA1\x2A\x2A\x2A\x2A\xB9\x2A\x2A\x2A\x2A\x53\xFF\x50\x2A\xC7"
 			}
 			
 			"EntityFactoryCaller"
@@ -139,7 +139,7 @@
 		{
 			"EntityFactoryOffset"
 			{
-				"windows" 	"50"
+				"windows" 	"1"
 			}
 			"EntityFactoryCallOffset"
 			{
@@ -219,21 +219,21 @@
 		{
 			"GiveNamedItem"
 			{
-				"windows"	"448"
-				"linux"		"449"
-				"mac"		"449"
+				"windows"	"449"
+				"linux"		"450"
+				"mac"		"450"
 			}
 			"RemovePlayerItem"
 			{
-				"windows"	"292"
-				"linux"		"293"
-				"mac"		"293"
+				"windows"	"293"
+				"linux"		"294"
+				"mac"		"294"
 			}
 			"Weapon_GetSlot"
 			{
-				"windows"	"288"
-				"linux"		"289"
-				"mac"		"289"
+				"windows"	"289"
+				"linux"		"290"
+				"mac"		"290"
 			}
 			"Ignite"
 			{
@@ -255,9 +255,9 @@
 			}
 			"CommitSuicide"
 			{
-				"windows"	"498"
-				"linux"		"498"
-				"mac"		"498"
+				"windows"	"499"
+				"linux"		"499"
+				"mac"		"499"
 			}
 			"GetVelocity"
 			{
@@ -285,9 +285,9 @@
 			}
 			"WeaponEquip"
 			{
-				"windows"	"281"
-				"linux"		"282"
-				"mac"		"282"
+				"windows"	"282"
+				"linux"		"283"
+				"mac"		"283"
 			}
 			"Activate"
 			{
@@ -297,15 +297,15 @@
 			}
 			"PlayerRunCmd"
 			{
-				"windows"	"468"
-				"linux"		"469"
-				"mac"		"469"
+				"windows"	"469"
+				"linux"		"470"
+				"mac"		"470"
 			}
 			"GiveAmmo"
 			{
-				"windows"	"274"
-				"linux"		"275"
-				"mac"		"275"
+				"windows"	"275"
+				"linux"		"276"
+				"mac"		"276"
 			}
 		}
 	}
diff --git a/gamedata/sm-cstrike.games/game.csgo.txt b/gamedata/sm-cstrike.games/game.csgo.txt
index e063fc37..b7fb0c9f 100644
--- a/gamedata/sm-cstrike.games/game.csgo.txt
+++ b/gamedata/sm-cstrike.games/game.csgo.txt
@@ -84,14 +84,14 @@
 			"RoundRespawn"
 			{
 				"library"	"server"
-				"windows"	"\x55\x8B\xEC\x83\xEC\x08\x56\x8B\xF1\x8B\x0D\x2A\x2A\x2A\x2A\x57\x8B\x01\xFF\x50\x2A\x83"
+				"windows"	"\x55\x8B\xEC\x83\xEC\x0C\x53\x56\x8B\xF1\x8B\x0D\x2A\x2A\x2A\x2A\x57\x8B\x01"
 				"linux"		"\x55\x89\xE5\x57\x56\x53\x83\xEC\x4C\xA1\x2A\x2A\x2A\x2A\x8B\x5D\x08\x89\x04\x24"
 			}
 			"SwitchTeam"
 			{
 				"library"	"server"
-				"windows"	"\x55\x8B\xEC\x83\xEC\x10\x53\x56\x8B\x75\x08\x57\x8B\xF9\x85\xF6\x0F\x88\x2A\x2A\x2A\x2A\x3B\x35"
-				"linux"		"\x55\x89\xE5\x83\xEC\x68\x89\x75\xF8\x8B\x75\x0C\x89\x5D\xF4\x8B\x5D\x08\x89\x7D\xFC\x89\x34\x24\xE8\x2A\x2A\x2A\x2A\x85\xC0"
+				"windows"	"\x56\x57\x8B\xF9\x33\xF6\x66\x66\x0F\x1F\x84\x00\x00\x00\x00\x00\x8B\x0C\xF5\x2A\x2A\x2A\x2A\x8B\xD7\xE8\x2A\x2A\x2A\x2A\x85\xC0\x74\x2A\x46\x83\xFE\x19"
+				"linux"		"\x55\x89\xE5\x56\x53\x31\xDB\x83\xEC\x10\x8B\x75\x08\xEB\x2A\x90\x83\xC3\x01\x83\xFB\x19"
 			}
 			"HandleCommand_Buy_Internal"//Wildcard first 6 bytes for getting address for weapon price.
 			{
@@ -145,7 +145,7 @@
 			"SetClanTag"
 			{
 				"library"	"server"
-				"windows"	"\x55\x8B\xEC\x8B\x55\x08\x85\xD2\x74\x2A\x8D\x81\x88\x21\x00\x00"
+				"windows"	"\x55\x8B\xEC\x8B\x55\x08\x85\xD2\x74\x2A\x8D\x81\x5C\x29\x00\x00"
 				"linux"		"\x55\x89\xE5\x83\xEC\x18\x8B\x45\x0C\x85\xC0\x74\x2A\x89\x44\x24\x04\x8B\x45\x08\xC7\x44\x24\x08\x10\x00\x00\x00"
 			}
 			// Since it's not possible to make a unique signature for CCSWeaponInfo::GetWeaponInfo, this is instead a signature to a