Working on pre-processing