after adding support for multiple queues