updated to check proper queues