improved handling of win and lose