Rewrite, 1st pass