Re writing (23/28)

Re writing