More rewriting