changed data to table instead of list