More plumbing, polishing