jh - updated win conditions