Updating end game conditions to not use counter as counter was
unreliable