nextTurn optimizations
More enhancements