refactored setup(...)