minor changes to fit topics and queues