More rewrite progress