New preprocessing, 2 classes untested