Much improved config.