Updated drag and drop