diff --git a/events/BonusEvent.py b/events/BonusEvent.py
index 9ce2d4d..2199c61 100644
--- a/events/BonusEvent.py
+++ b/events/BonusEvent.py
@@ -8,4 +8,4 @@ class BonusEvent(Event):
 
     def trigger(self, target):
         super().trigger(target)
-        self.playerState.advanceBonus()
+        self.playerState().advanceBonus()
diff --git a/events/BottomLeftBankEvent.py b/events/BottomLeftBankEvent.py
index ee44556..a21c53b 100644
--- a/events/BottomLeftBankEvent.py
+++ b/events/BottomLeftBankEvent.py
@@ -9,5 +9,5 @@ class BottomLeftBankEvent(BankEvent):
   def trigger(self, target):
     super().trigger(target)
     playerState = self.playerState()
-    playerState.advanceLeftOrangeSpecial()
-    playerState.advanceUpperPlayfieldTime()
+    playerState().advanceLeftOrangeSpecial()
+    playerState().advanceUpperPlayfieldTime()
diff --git a/events/BottomRightBankEvent.py b/events/BottomRightBankEvent.py
index 4b1c594..df5698e 100644
--- a/events/BottomRightBankEvent.py
+++ b/events/BottomRightBankEvent.py
@@ -9,6 +9,6 @@ class BottomRightBankEvent(BankEvent):
   def trigger(self, target):
     super().trigger(target)
     playerState = self.playerState()
-    playerState.advanceRightOrangeSpecial()
-    if playerState.upperPlayfieldTime < 30:
-      playerState.advanceUpperPlayfieldTime()
+    playerState().advanceRightOrangeSpecial()
+    if playerState().upperPlayfieldTime < 30:
+      playerState().advanceUpperPlayfieldTime()
diff --git a/events/EndBallEvent.py b/events/EndBallEvent.py
index 93b3d0b..c171c04 100644
--- a/events/EndBallEvent.py
+++ b/events/EndBallEvent.py
@@ -11,7 +11,7 @@ class EndBallEvent(Event):
 
     def trigger(self, target):
         super().trigger(target)
-        if self.playerState().replayBall or not self.playerState.hasBallScored:
+        if self.playerState().replayBall or not self.playerState().hasBallScored:
             StartBallEvent().trigger(None)
             return
 
diff --git a/events/SpecialEvent.py b/events/SpecialEvent.py
index dc6e47d..094c5a8 100644
--- a/events/SpecialEvent.py
+++ b/events/SpecialEvent.py
@@ -7,13 +7,13 @@ class SpecialEvent(Event):
         self.playerState = playerState
 
     def replay(self):
-        self.playerState.setReplayBall()
+        self.playerState().setReplayBall()
 
     def extra_ball(self):
-        self.playerState.addBall()
+        self.playerState().addBall()
 
     def points(self):
-        self.playerState.addPoints(self.points)
+        self.playerState().addPoints(self.points)
 
     def super_bonus(self):
         pass
diff --git a/events/SpinnerEvent.py b/events/SpinnerEvent.py
index 6d42b67..eeae408 100644
--- a/events/SpinnerEvent.py
+++ b/events/SpinnerEvent.py
@@ -20,10 +20,10 @@ class SpinnerEvent(Event):
         playerState = self.playerState()
         timePassed = time() - self.activationTime
         if 1 <= timePassed < 1.5:
-            playerState.addPoints(100000)
+            playerState().addPoints(100000)
         elif 1.5 <= timePassed < 2:
-            playerState.addPoints(150000)
+            playerState().addPoints(150000)
         elif 2 <= timePassed < 5:
-            playerState.addPoints(200000)
+            playerState().addPoints(200000)
         elif timePassed >= 5:
-            playerState.addPoints(500000)
+            playerState().addPoints(500000)
diff --git a/events/TunnelEvent.py b/events/TunnelEvent.py
index 578debe..620672d 100644
--- a/events/TunnelEvent.py
+++ b/events/TunnelEvent.py
@@ -15,11 +15,11 @@ class TunnelEvent(Event):
 
     def scoreBonusTunnelPoints(self):
         playerState = self.playerState()
-        if playerState.tunnelLit == 2:
-            playerState.addPoints(10000)
-        elif playerState.tunnelLit == 3:
-            playerState.addPoints(20000)
-        elif playerState.tunnelLit == 4:
-            playerState.addPoints(40000)
-        elif playerState.tunnelLit == 5:
-            playerState.addPoints(190000)
+        if playerState().tunnelLit == 2:
+            playerState().addPoints(10000)
+        elif playerState().tunnelLit == 3:
+            playerState().addPoints(20000)
+        elif playerState().tunnelLit == 4:
+            playerState().addPoints(40000)
+        elif playerState().tunnelLit == 5:
+            playerState().addPoints(190000)