Added unclassified conditionally and fixed bug