Now rewrite (20/31)

Now rewrite