add better classification