added flag for using classifier (or not)