more of the rewrite