edited setup