diff --git a/src/mind_reader/state_machines/session/machine.py b/src/mind_reader/state_machines/session/machine.py
index 54c81b3..9b3c938 100644
--- a/src/mind_reader/state_machines/session/machine.py
+++ b/src/mind_reader/state_machines/session/machine.py
@@ -172,10 +172,12 @@ class SessionStateMachine:
         except IndexError:
             return None
 
-    def get_last_setter_move(self) -> ArrowDirection | None:
-        index = self.get_setter_step_number() - 1
-        return self.get_setter_move(index)
-
-    def get_last_guesser_move(self, player: Player) -> ArrowDirection | None:
-        index = self.get_guesser_step_number(player) - 1
-        return self.get_guesser_move(player, index)
+    @property
+    def current_index(self) -> int:
+        setter_step_number = len(self._setter_moves)
+        if setter_step_number:
+            if self._phase == SessionPhase.WAITING_FOR_SETTER:
+                return setter_step_number
+            else:
+                return setter_step_number - 1
+        return 0