Progress on rewrite