Overhauled win conditions