Further work on classifier.