Switched from lists to queues