Re write (14/17)

Re write