working on setup 2.1