Rewrite (see CHANGES.md)