Drag, clone and drop

Slight changes with better performance.