Added back distribute setup, it's important