Many changes... work on classifier.