Add Toby's changes to intergrate with Rabbit