improve setup