gutted and replaced

No better way to put it. So many changes that's its not worth
describing.