Complete day-after rewrite