some setup changes 2