Continued general rewrite