Slightly better scalability