diff --git a/OpenParrot/src/Functions/Games/APM3/APM3.cpp b/OpenParrot/src/Functions/Games/APM3/APM3.cpp
index 9117864..5f416ff 100644
--- a/OpenParrot/src/Functions/Games/APM3/APM3.cpp
+++ b/OpenParrot/src/Functions/Games/APM3/APM3.cpp
@@ -598,7 +598,7 @@ char __fastcall Input_isOffNow(unsigned int a1)
 int __fastcall Input_isOn(unsigned int buttonId)
 {
 #ifdef _DEBUG
-	info(true, "Input_isOn");
+	info(true, "Input_isOn id: %u", buttonId);
 #endif
 	return g_APM3IOValues[buttonId];
 }
@@ -606,7 +606,7 @@ int __fastcall Input_isOn(unsigned int buttonId)
 char __fastcall Input_isOnNow(unsigned int buttonId)
 {
 #ifdef _DEBUG
-	info(true, "Input_isOnNow");
+	info(true, "Input_isOnNow id: %u", buttonId);
 #endif
 	return g_APM3IOValues[buttonId];
 }
@@ -1032,69 +1032,70 @@ static InitFunction initFunc([]()
 }, GameID::Pengoe5);
 
 static InitFunction initFuncPengoe511([]()
-	{
-		HookAPM3();
-		strcpy(APM3GameId, "SDFH");
+{
+	HookAPM3();
+	strcpy(APM3GameId, "SDFH");
 
-		__int64 mainModuleBase = (__int64)GetModuleHandle(0);
+	__int64 mainModuleBase = (__int64)GetModuleHandle(0);
 
-		// Skip joysticks
-		injector::MakeRET(mainModuleBase + 0x16A7C0); // CC 48 89 5C 24 10 48 89 6C 24 18 48 89 74 24 20 57 48 83 EC 40
-		// Skip keyboard
-		injector::MakeRET(mainModuleBase + 0x16ADB0); // 48 89 5C 24 08 48 89 6C 24 10 48 89 74 24 18 57 41 54 41 55 41 56 41 57 48 81 EC A0 00 00 00
+	// Skip joysticks
+	injector::MakeRET(mainModuleBase + 0x16A7C0); // CC 48 89 5C 24 10 48 89 6C 24 18 48 89 74 24 20 57 48 83 EC 40
+	// Skip keyboard
+	injector::MakeRET(mainModuleBase + 0x16ADB0); // 48 89 5C 24 08 48 89 6C 24 10 48 89 74 24 18 57 41 54 41 55 41 56 41 57 48 81 EC A0 00 00 00
 
-		injector::MakeRET(mainModuleBase + 0x24EB0); // 4C 89 44 24 18 4C 89 4C 24 20 53 55 56 57 48 83 EC 38 49 8B F0 48 8D 6C 24 78 48 8B DA 48 8B F9
+	injector::MakeRET(mainModuleBase + 0x24EB0); // 4C 89 44 24 18 4C 89 4C 24 20 53 55 56 57 48 83 EC 38 49 8B F0 48 8D 6C 24 78 48 8B DA 48 8B F9
 
-	}, GameID::Pengoe511);
+}, GameID::Pengoe511);
 
 static InitFunction initTestFunc([]()
-	{
-		HookAPM3();
-		strcpy(APM3GameId, "SDFH");
-		__int64 mainModuleBase = (__int64)GetModuleHandle(0);
-		
-		// Skip joysticks
-		injector::MakeRET(mainModuleBase + 0x158820);
-		// Skip keyboard
-		injector::MakeRET(mainModuleBase + 0x158E10);
+{
+	HookAPM3();
+	strcpy(APM3GameId, "SDFH");
+	__int64 mainModuleBase = (__int64)GetModuleHandle(0);
 
-		Sequence_isTestReturnValue = 1;
+	// Skip joysticks
+	injector::MakeRET(mainModuleBase + 0x158820);
+	// Skip keyboard
+	injector::MakeRET(mainModuleBase + 0x158E10);
 
-		injector::MakeRET(mainModuleBase + 0x240C0);
+	Sequence_isTestReturnValue = 1;
 
-	}, GameID::Pengoe5_Test);
+	injector::MakeRET(mainModuleBase + 0x240C0);
+
+}, GameID::Pengoe5_Test);
 
 static InitFunction initVF5Func([]()
-	{
-		HookAPM3();
-		strcpy(APM3GameId, "SDHF");
-		__int64 mainModuleBase = (__int64)GetModuleHandle(0);
+{
+	HookAPM3();
+	strcpy(APM3GameId, "SDHF");
+	__int64 mainModuleBase = (__int64)GetModuleHandle(0);
 
-	}, GameID::VF5Esports);
+}, GameID::VF5Esports);
 
 static InitFunction initVF5TestFunc([]()
-	{
-		HookAPM3();
-		strcpy(APM3GameId, "SDHF");
-		__int64 mainModuleBase = (__int64)GetModuleHandle(0);
+{
+	HookAPM3();
+	strcpy(APM3GameId, "SDHF");
+	__int64 mainModuleBase = (__int64)GetModuleHandle(0);
 
+	if (strstr(GetCommandLineA(), "-tptest") != NULL)
 		Sequence_isTestReturnValue = 1;
 
-	}, GameID::VF5EsportsTest);
+}, GameID::VF5EsportsTest);
 	
 static InitFunction initGoonyaFunc([]()
-	{
-		HookAPM3();
-		strcpy(APM3GameId, "SDGX");
-		__int64 mainModuleBase = (__int64)GetModuleHandle(0);
+{
+	HookAPM3();
+	strcpy(APM3GameId, "SDGX");
+	__int64 mainModuleBase = (__int64)GetModuleHandle(0);
 
-	}, GameID::GoonyaFighter);
+}, GameID::GoonyaFighter);
 	
 static InitFunction initPuyoFunc([]()
-	{
-		HookAPM3();
-		strcpy(APM3GameId, "SDFF");
-		__int64 mainModuleBase = (__int64)GetModuleHandle(0);
+{
+	HookAPM3();
+	strcpy(APM3GameId, "SDFF");
+	__int64 mainModuleBase = (__int64)GetModuleHandle(0);
 
-	}, GameID::PuyoPuyoEsports);
+}, GameID::PuyoPuyoEsports);
 #endif
\ No newline at end of file
diff --git a/OpenParrot/src/Utility/GameID.h b/OpenParrot/src/Utility/GameID.h
index 831f3c8..82524d4 100644
--- a/OpenParrot/src/Utility/GameID.h
+++ b/OpenParrot/src/Utility/GameID.h
@@ -98,12 +98,12 @@ enum class GameID
 	LinuxEmulation,
 	RadikalBikers,
 	Pengoe5,
-        Pengoe5_Test,
-        VF5Esports,
+	Pengoe5_Test,
+	VF5Esports,
 	GoonyaFighter,
 	PuyoPuyoEsports,
-        SFV,
+	SFV,
 	TappingSkillTest,
 	Pengoe511,
-		VF5EsportsTest
+	VF5EsportsTest
 };
\ No newline at end of file