diff --git a/eoptasks.py b/eoptasks.py
index fa5c474..a4fdd7e 100755
--- a/eoptasks.py
+++ b/eoptasks.py
@@ -408,7 +408,7 @@ else:
         servers_info[server.name] = {'status': '', 'display_name': server.display_name}
 
     def send_status():
-        current_windows = [x.name for x in session.list_windows()]
+        current_windows = [x.name for x in session.windows]
         for server in all_servers:
             server_info = servers_info[server.name]
             if server.name in current_windows:
@@ -418,7 +418,7 @@ else:
         send_status_message(tmux_session_name, {'@type': 'servers-info', 'info': servers_info})
 
     def handle_expects():
-        for win in session.list_windows():
+        for win in session.windows:
             try:
                 server = [x for x in all_servers if x.name == win.name][0]
             except IndexError:
@@ -444,7 +444,7 @@ else:
                     server.key_automation = server.key_automation[1:]
 
     while selected_servers:
-        current_clusters = [cluster_name(x.name) for x in session.list_windows()]
+        current_clusters = [cluster_name(x.name) for x in session.windows]
         for server in selected_servers[:]:
             if cluster_name(server.name) in current_clusters:
                 continue
@@ -461,7 +461,7 @@ else:
             break
         else:
             time.sleep(0.1)
-        while len(session.list_windows()) > 10:
+        while len(session.windows) > 10:
             send_status()
             handle_expects()
             time.sleep(0.1)
@@ -478,7 +478,7 @@ else:
         elif percentage >= 0.25:
             status_window.rename_window('🌒')
 
-    while len(session.list_windows()) > 1:
+    while len(session.windows) > 1:
         send_status()
         handle_expects()
         time.sleep(0.1)