Drag&Drop update, but still poor