before rename & rewrite