updated data prep a bit more