diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs
index 8837d3c..9f2fba0 100644
--- a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs	
+++ b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs	
@@ -415,9 +415,17 @@ public class GameManagerRound1 : GameManagerBase
 		EnableInteraction("First Question");
 	}
 
-	private void NewLightningRoundQuestion(int Question)
+	private void LightningRoundCluesLoop()
 	{
-		DataDictionary CurrentQuestion = _CurrentQuestion["Questions"].DataList[Question - 1].DataDictionary;
+		DataList QuestionsList = _CurrentQuestion["Questions"].DataList;
+		if (_QuestionSubstage >= QuestionsList.Count)
+		{
+			_QuestionSubstage = 0;
+			EnableInteraction("End Lightning Round");
+			return;
+		}
+
+		DataDictionary CurrentQuestion = _CurrentQuestion["Questions"].DataList[_QuestionSubstage].DataDictionary;
 
 		HostCardLightningRoundInterface Interface =
 			(HostCardLightningRoundInterface)GetHostCardInterface(RoundSegmentType.LightningRound);
@@ -463,7 +471,9 @@ public class GameManagerRound1 : GameManagerBase
 			}
 
 			EndBuzzInPeriod();
-			EnableInteraction("Next Question");
+
+			_QuestionSubstage++;
+			AdvanceQuestion();
 		}
 		else
 		{
@@ -1296,23 +1306,23 @@ public class GameManagerRound1 : GameManagerBase
 	{
 		switch (_QuestionStage)
 		{
-			case 1: BeginLightningRound();			break;
-			case 2: NewLightningRoundQuestion(1);	break;
-			case 3: NewLightningRoundQuestion(2);	break;
-			case 4: NewLightningRoundQuestion(3);	break;
-			case 5: AdvanceToNextQuestion();		break;
+			case 1: BeginLightningRound();		break;
+			case 2: LightningRoundCluesLoop();	break;
+			case 3: AdvanceToNextQuestion();	break;
 			default: break;
 		}
 	}
 
 	private void AdvanceTheChase()
 	{
+		Debug.Log("The Chase is now advancing to stage " + _QuestionStage);
+
 		switch (_QuestionStage)
 		{
 			case 1: BeginTheChase();			break;
 			case 2: PlayTheChaseMusic();		break;
 			case 3: TheChaseCluesLoop();		break;
-			case 8: AdvanceToNextQuestion();	break;
+			case 4: AdvanceToNextQuestion();	break;
 			default: break;
 		}
 	}