Update to the D&D control

combine our two controls in to a single one