Re write (12/17)

Re write