Re write (16/17)

Re write