Did some more optimizations on Tournament