Small changes to 1vsAll