Improve Queues Section