Made 31 slightly more efficient