updated data selection for token