WinnerCalc small modifications