optimized the configuration and more