Updated to Rewrite 2.0.0.Final