New rewrite