more changes around data preparation