improved setup process