diff --git a/GameState.py b/GameState.py
index 94bf7e7..7920080 100644
--- a/GameState.py
+++ b/GameState.py
@@ -13,6 +13,10 @@ class GameState:
         self.specialDisplay.printCredits(self.credits)
         PLAYER_LAMPS.activateNext()
 
+    def nextPlayer(self):
+        nextPlayer = self.players[1].id
+        self.currentPlayer = nextPlayer
+
     @property
     def currentPlayer(self):
         return self.players[0]
diff --git a/PlayerState.py b/PlayerState.py
index 3e2c64d..25199f0 100644
--- a/PlayerState.py
+++ b/PlayerState.py
@@ -80,7 +80,7 @@ class PlayerState:
 
     def activate(self):
         self.isActive = True
-        self.reset()
+        self.resetBall()
 
     def deactivate(self):
         self.isActive = False
@@ -136,13 +136,17 @@ class PlayerState:
         Lamp("Right Advance Time").deactivate()
 
     def reset(self):
-        self.printSpecial()
-        self.upperPlayfieldTimer = None
-        self.upperPlayfieldTimeIter = iter(UPPER_PLAYFIELD_TIME)
+        self.resetBall()
         self.upperPlayfieldTime = next(self.upperPlayfieldTimeIter)
         self.replayBall = False
         self.hasBallScored = False
 
+
+    def resetBall(self):
+        self.printSpecial()
+        self.upperPlayfieldTimer = None
+        self.upperPlayfieldTimeIter = iter(UPPER_PLAYFIELD_TIME)
+
         self.resetBonus()
         self.resetTargets()
         self.resetBanks()