changed array to list on the data source