most of Joe's RabbitMQ changes