try a new rewrite