setup improved