Started to rework preprocessing