changed all classifier logic