diff --git a/tacc.el b/tacc.el
index 56adfc7..7393aa7 100644
--- a/tacc.el
+++ b/tacc.el
@@ -49,7 +49,7 @@
 
 ;;; Code:
 
-;; TODOS: tacc-running? needs to be replaced by tacc-session? and tacc-live? depending on context
+;; TODOS: 
 ;;
 ;; ERROR: timer shutdown seems to leave things in a wrong state and buffer doesn't die properly
 ;;         Check on the logic of push-current, needs predicates rather than lazy if conditions
@@ -291,18 +291,18 @@ registered" sym-name)
 
 ;; 05.2 State checks
 
-
 (defun tacc-buffer ()
   "Gets the tacc-timer buffer if there is one"
   (get-buffer tacc-buffer-name))
 
-(defun tacc-live-state? (state)
-  "Checks if the state supplied indicates a live timer"
-  (cond ((eq state 'pause) nil)
-        ((eq state 'stop) nil)
-        ((eq state 'work) t)
-        ((eq state 'break) t)
-        ('t (signal 'tacc-error-illegal-buffer-state state))))
+(defun tacc-live-state? ()
+  "Checks if tacc-info's state indicates a live timer"
+  (let ((state (alist-get 'state tacc-info)))
+    (cond ((eq state 'pause) nil)
+          ((eq state 'stop) nil)
+          ((eq state 'work) t)
+          ((eq state 'break) t)
+          ('t (signal 'tacc-error-illegal-buffer-state state)))))
 
 (defun tacc-live? ()
   "Checks if there is a live timer running"