New: rewriter