added more DnD functionality