diff --git a/models/match.py b/models/match.py
index a57176b..d1fd914 100644
--- a/models/match.py
+++ b/models/match.py
@@ -49,21 +49,28 @@ class Match:
         
         self.round = self.current_tick["total_rounds_played"].values[0]
         
-        if self.round >= 12:
-            self.team_1.set_t()
-            self.team_2.set_ct()
-            self.team_1.score = int(self.current_tick[self.current_tick["team_num"] == 3]["team_rounds_total"].values[0])
-            self.team_2.score = int(self.current_tick[self.current_tick["team_num"] == 2]["team_rounds_total"].values[0])
-        else:
-            self.team_1.set_ct()
-            self.team_2.set_t()
-            self.team_1.score = int(self.current_tick[self.current_tick["team_num"] == 2]["team_rounds_total"].values[0])
-            self.team_2.score = int(self.current_tick[self.current_tick["team_num"] == 3]["team_rounds_total"].values[0])
+        self.team_1.score = int(self.current_tick[self.current_tick["team_num"] == self.team_1.id]["team_rounds_total"].values[0])
+        self.team_2.score = int(self.current_tick[self.current_tick["team_num"] == self.team_2.id]["team_rounds_total"].values[0])
+
+    def _update_team_ids(self) -> None:
+        # get random player from each team
+        if self.current_tick.empty:
+            return
+
+        for team in self.get_teams():
+            random_player = team.players[0]
+            player_team_id = self.current_tick[self.current_tick["player_steamid"] == random_player.steam_id]["team_num"].values[0]
+
+            if player_team_id == 2:
+                team.set_t()
+            elif player_team_id == 3:
+                team.set_ct()
 
     def next_tick(self) -> None:
         self.tick += 1
         self.current_tick = self.game_info[self.game_info["tick"] == self.tick]
         self._update_player_positions()
+        self._update_team_ids()
         self._update_round()
 
     def set_tick(self, tick: int) -> None:
diff --git a/models/team.py b/models/team.py
index 2792090..c091e4e 100644
--- a/models/team.py
+++ b/models/team.py
@@ -7,7 +7,7 @@ class Team:
     def __init__(self):
         self.players = []
         self.score = 0
-        self.set_t()
+        self.id = 1
 
     def add_player(self, player: Player):
         self.players.append(player)
@@ -16,9 +16,9 @@ class Team:
         self.players.remove(player)
 
     def set_ct(self):
-        self.is_ct = True
+        self.id = 3
         self.colour = CT_COLOUR
 
     def set_t(self):
-        self.is_ct = False
+        self.id = 2
         self.colour = T_COLOUR
\ No newline at end of file
diff --git a/states/start_menu.py b/states/start_menu.py
index f559893..54cb984 100644
--- a/states/start_menu.py
+++ b/states/start_menu.py
@@ -91,8 +91,8 @@ class StartMenu(GameState):
         players = demo_parser.parse_player_info()
 
         team_1 = Team()
-        team_1.set_ct()
         team_2 = Team()
+        team_2.set_ct()
         m = Match(map_name, game_info, team_1, team_2, self.options)
         for index, row in players.iterrows():
             if row["team_number"] == 2: