diff --git a/hbc/meta.xml b/hbc/meta.xml
index c897172..a103f40 100644
--- a/hbc/meta.xml
+++ b/hbc/meta.xml
@@ -2,8 +2,8 @@
 <app version="1">
   <name>Visual Boy Advance GX</name>
   <coder>Tantric</coder>
-  <version>2.2.7</version>
-  <release_date>20120707</release_date>
+  <version>2.2.8</version>
+  <release_date>20120729</release_date>
   <short_description>GBA/GBC/GB Emulator</short_description>
   <long_description>A port of Visual Boy Advance - M to the Wii.</long_description>
   <ahb_access />
diff --git a/readme.txt b/readme.txt
index a62189a..ce2dbaa 100644
--- a/readme.txt
+++ b/readme.txt
@@ -27,6 +27,10 @@ With it you can play GBA/Game Boy Color/Game Boy games on your Wii/GameCube.
 |0Oื๘oท                         UPDATE HISTORY                        ทo๘ืO0|
 `จ•จจจจจ จจจจจจจจจจจจจจจจ จจจจจจจจจจจจจจจ จจจจจจจจจจจจจจจจจจจจ จจจจจจจจจจจจจ'
 
+[2.2.8 - July 29, 2012]
+
+* Fixed lag with GameCube controllers
+
 [2.2.7 - July 7, 2012]
 
 * Fixed PAL support
diff --git a/source/input.cpp b/source/input.cpp
index 45012ba..142d0fd 100644
--- a/source/input.cpp
+++ b/source/input.cpp
@@ -133,8 +133,6 @@ void ResetControls(int wiiCtrl)
  *
  * Scans pad and wpad
  ***************************************************************************/
-static int padsConnected = 0;
-static u64 prev, now;
 
 void
 UpdatePads()
@@ -143,17 +141,7 @@ UpdatePads()
 	WPAD_ScanPads();
 	#endif
 
-	now = gettime();
-
-	if(!padsConnected && diff_sec(prev, now) < 2)
-		return;
-
-	prev = now;
-
-	padsConnected = PAD_ScanPads();
-
-	if(!padsConnected)
-		return;
+	PAD_ScanPads();
 
 	int i = 3;
 	do {
@@ -367,12 +355,12 @@ u32 StandardMovement(unsigned short chan)
 u32 StandardDPad(unsigned short pad)
 {
 	u32 J = 0;
-	u32 jp = PAD_ButtonsHeld(pad);
+	u32 jp = userInput[pad].pad.btns_h;
 #ifdef HW_RVL
 	u32 exp_type;
 	if ( WPAD_Probe(pad, &exp_type) != 0 )
 		exp_type = WPAD_EXP_NONE;
-	u32 wp = WPAD_ButtonsHeld(pad);
+	u32 wp = userInput[pad].wpad->btns_h;
 	if (wp & WPAD_BUTTON_RIGHT)
 		J |= VBA_RIGHT;
 	if (wp & WPAD_BUTTON_LEFT)
@@ -408,7 +396,7 @@ u32 StandardSideways(unsigned short pad)
 {
 	u32 J = 0;
 #ifdef HW_RVL
-	u32 wp = WPAD_ButtonsHeld(pad);
+	u32 wp = userInput[pad].wpad->btns_h;
 
 	if (wp & WPAD_BUTTON_RIGHT)
 		J |= VBA_UP;
@@ -448,7 +436,7 @@ u32 StandardClassic(unsigned short pad)
 {
 	u32 J = 0;
 #ifdef HW_RVL
-	u32 wp = WPAD_ButtonsHeld(pad);
+	u32 wp = userInput[pad].wpad->btns_h;
 
 	if (wp & WPAD_CLASSIC_BUTTON_RIGHT)
 		J |= VBA_RIGHT;
@@ -482,7 +470,7 @@ u32 StandardClassic(unsigned short pad)
 u32 StandardGamecube(unsigned short pad)
 {
 	u32 J = 0;
-	u32 jp = PAD_ButtonsHeld(pad);
+	u32 jp = userInput[pad].pad.btns_h;
 	if (jp & PAD_BUTTON_UP)
 		J |= VBA_UP;
 	if (jp & PAD_BUTTON_DOWN)
@@ -511,7 +499,7 @@ u32 StandardGamecube(unsigned short pad)
 u32 DecodeGamecube(unsigned short pad)
 {
 	u32 J = 0;
-	u32 jp = PAD_ButtonsHeld(pad);
+	u32 jp = userInput[pad].pad.btns_h;
 	for (u32 i = 0; i < MAXJP; ++i)
 	{
 		if (jp & btnmap[CTRLR_GCPAD][i])
@@ -912,8 +900,6 @@ bool MenuRequested()
 
 u32 GetJoy(int pad)
 {
-	UpdatePads();
-
 	// request to go back to menu
 	if (MenuRequested())
 	{
diff --git a/source/vbagx.h b/source/vbagx.h
index 41264f5..0e5c886 100644
--- a/source/vbagx.h
+++ b/source/vbagx.h
@@ -16,7 +16,7 @@
 #include "utils/FreeTypeGX.h"
 
 #define APPNAME 		"Visual Boy Advance GX"
-#define APPVERSION 		"2.2.7"
+#define APPVERSION 		"2.2.8"
 #define APPFOLDER 		"vbagx"
 #define PREF_FILE_NAME 	"settings.xml"
 #define PAL_FILE_NAME 	"palettes.xml"
diff --git a/source/vbasupport.cpp b/source/vbasupport.cpp
index b2e3244..5d7ae85 100644
--- a/source/vbasupport.cpp
+++ b/source/vbasupport.cpp
@@ -440,6 +440,7 @@ void systemOnSoundShutdown()
 ****************************************************************************/
 bool systemReadJoypads()
 {
+	UpdatePads();
 	return true;
 }
 
diff --git a/update.xml b/update.xml
index 6d702ce..dc37241 100644
--- a/update.xml
+++ b/update.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<app version="2.2.7">
-<file url="http://vba-wii.googlecode.com/files/Visual%20Boy%20Advance%20GX%202.2.7.zip"></file>
+<app version="2.2.8">
+<file url="http://vba-wii.googlecode.com/files/Visual%20Boy%20Advance%20GX%202.2.8.zip"></file>
 </app>