Improved preprocessing.