continuing the rewrite