re-committing rewrite