Re written (30/33)

Re written