Drag and drop improved