Rewrite continued