More rewrite added