optimize and test rewrite