improved classify