Re write (8/17)

Re write