I believe BFD is nice and neat internally now