Re write (5/17)

Re write