diff --git a/src/GameClass.java b/src/GameClass.java
index 3c7d2f4..6b51219 100644
--- a/src/GameClass.java
+++ b/src/GameClass.java
@@ -1,6 +1,6 @@
 public class GameClass {
 
     public static void main(String[] args){
-        while (RockPaperScissors.playerScore < 7 ) RockPaperScissors.runGame();
+        while (RockPaperScissors.playerScore < 7 && RockPaperScissors.computerScore < 7) RockPaperScissors.runGame();
     }
 }
diff --git a/src/RockPaperScissors.java b/src/RockPaperScissors.java
index a720eaf..cbfa671 100644
--- a/src/RockPaperScissors.java
+++ b/src/RockPaperScissors.java
@@ -77,7 +77,7 @@ public class RockPaperScissors {
 
     public static int letComputerChoose() {
         Random rgen = new Random();
-        int computerInput = rgen.nextInt(1,3);
+        int computerInput = rgen.nextInt(1,4);
         return computerInput;
     }