modified some stuff for the integraton with the classifier