Updated winner logic