changed to use queue for server list