Preproc

Preprocessing updates.