Re write (2/17)

Re write