Drag and Drop fixes puzzels