more configuration and changes