Drag and drop reworking