Changes to evaluateWin and discard