edited setup due to errors