Complete system re-plumbing