continuing rewrite