More chat rewriting