working on setup 2.0