edited setup, still needs work