controlled and fixed same dnd-functions(not completed yet)