new config and some changes