Now rewrite (8/31)

Now rewrite