continued on rewrite