EDITING: Drag and Drop optimizations