Reworking the end of preprocessing (scale/filter)