Now it should use the new classifier correctly
Now it should use it for real