big change to stick to default config