Added preprocess part