More DND and refactoring