added more drag and drop functions
merge