distributor definition is also cruft, I'll clean it up