Refactored distributor stuff