more classes, and simple plain detector