Branching to fix the DnD functionality