Slightly better configuration