Small changes to rand_samp & all_data_one_entity