more optimizations to tourney