More work on classifier.