moving distribute_setup to right spot