some changes inf conf and logic