Re write (10/17)

Re write