Re write (15/17)

Re write