Finished Rewrite