Done. But I think we want either orig contents + diff or orig contents + new contents.