Changed how setup works