Change some pre-processing methods