Fix architecture (added checking for winners)
Same fixes