some changes in setup