Drag drop improved