Rewriting still in progress