improvements in distributor class