fixed the dnd after refactoring