added some config control