ALmost good to go with rewrite