Now uses proper preprocessing.