Refactored New Distributor