improve setup process