Partial rewrite