Work on pre-processing steps