Added more CSV preparation steps.