adapted to using queues instead of one single topic