major progress on classifier