working on setup 2.4