Re write (4/17)

Re write