Re write (6/17)

Re write