Major changes to rewriting effort