Classifier code upgraded