diff --git a/gamedata/endtouch.games.txt b/gamedata/endtouch.games.txt
index 1318e04..1971f33 100644
--- a/gamedata/endtouch.games.txt
+++ b/gamedata/endtouch.games.txt
@@ -1,23 +1,19 @@
 "Games"
 {
-	"#default"
+	"csgo"
 	{
- 		"Addresses"
+		"Signatures"
 		{
-			"PhysicsMarkEntityAsTouchedAddress"
+			"PhysicsCheckForEntityUntouch"
 			{
-				"windows"
-				{
-					"signature" "PhysicsMarkEntityAsTouched"
-				}
-				
-				"linux"
-				{
-					"signature" "PhysicsMarkEntityAsTouched"
-				}
+				"windows"	"\x55\x8B\xEC\x83\xEC\x08\x56\x8B\xF1\x8B\x86\xD0\x00\x00\x00"
+				"linux"		"\x55\x89\xE5\x57\x56\x53\x83\xEC\x2C\x8B\x5D\x08\xC7\x44\x24\x04\x01\x00\x00\x00\x89\x1C\x24"
 			}
 		}
-
+		
+	}
+	"cstrike"
+	{
 		"Signatures"
 		{
 			"PhysicsCheckForEntityUntouch"
@@ -25,27 +21,6 @@
 				"windows"	"\x55\x8B\xEC\x51\x56\x8B\xF1\x8B\x86\x38\x03\x00\x00"
 				"linux"		"@_ZN11CBaseEntity28PhysicsCheckForEntityUntouchEv"
 			}
-
-			"PhysicsMarkEntityAsTouched"
-			{
-				"windows"	"\x55\x8B\xEC\x53\x8B\x5D\x08\x56\x8B\xF1\x3B\xF3"
-				"linux"		"@_ZN11CBaseEntity26PhysicsMarkEntityAsTouchedEPS_"
-			}
-
-			"DisableTouchFuncs"
-			{
-				"windows"	"\x80\x3D\x00\x00\x00\x00\x00\x75\x14\x53\x8B\xCE\xE8\x00\x00\x00\x00\x8B\xC7"
-				"linux"		"@_ZN11CBaseEntity21sm_bDisableTouchFuncsE"
-			}
-		}
-
-		"Offsets"
-		{
-			"OS"
-			{
-				"windows"	"1"
-				"linux"		"2"
-			}
 		}
 	}
 }
diff --git a/scripting/BareTimer.sp b/scripting/BareTimer.sp
index 7cf338d..f7b0d4b 100644
--- a/scripting/BareTimer.sp
+++ b/scripting/BareTimer.sp
@@ -14,7 +14,7 @@ public Plugin myinfo =
 {
 	name = "Barebones Timer",
 	author = "rumour",
-	description = "This is just a very simple example to use with the EndTouchFix and does not account for tick fraction",
+	description = "This is just a very simple example and does not account for tick fraction",
 	version = "",
 	url = ""
 };
diff --git a/scripting/EndTouchFix.sp b/scripting/EndTouchFix.sp
index e2bfb57..5e16fe3 100644
--- a/scripting/EndTouchFix.sp
+++ b/scripting/EndTouchFix.sp
@@ -7,11 +7,8 @@
 #pragma newdecls required
 
 #define EFL_CHECK_UNTOUCH (1<<24)
-#define WINDOWS 1
 
 Handle PhysicsCheckForEntityUntouch;
-Address PhysicsMarkEntityAsTouched;
-int OS;
 bool LateLoad;
 
 public Plugin myinfo =
@@ -32,10 +29,6 @@ public void OnPluginStart()
 		SetFailState("Failed to load game_data");
 	}
 	
-	OS = game_data.GetOffset("OS");
-	
-	PhysicsMarkEntityAsTouched = game_data.GetAddress("PhysicsMarkEntityAsTouchedAddress");
-	
 	StartPrepSDKCall(SDKCall_Entity);
 	if(!PrepSDKCall_SetFromConf(game_data, SDKConf_Signature, "PhysicsCheckForEntityUntouch"))
 	{
@@ -76,24 +69,10 @@ bool GetCheckUntouch(int client)
 
 public Action PostThink(int client)
 {
-	int disable_touch_funcs;
-	
-	if(OS == WINDOWS)
+	if(GetCheckUntouch(client))
 	{
-		disable_touch_funcs = LoadFromAddress(PhysicsMarkEntityAsTouched + view_as<Address>(0x3430B2), NumberType_Int8);
-	}
-	else
-	{
-		disable_touch_funcs = LoadFromAddress(PhysicsMarkEntityAsTouched + view_as<Address>(0x7E4064), NumberType_Int8);
-	}
-	
-	if(!disable_touch_funcs)
-	{
-		if(GetCheckUntouch(client))
-		{
-			SDKCall(PhysicsCheckForEntityUntouch, client);
-		}
-	}
+		SDKCall(PhysicsCheckForEntityUntouch, client);
+	}	
 	
 	return Plugin_Continue;
 }
\ No newline at end of file