Overwrite now accounts for extracting too