Re write (3/17)

Re write