Cheeky bit of dbd mods in b and s