Added their_state tracking