updated data prep