changes to distributor to make it work with fan-in and vice-versa