updated for queues and sub channels