More work rewriting