changed structure of data collection to easily support multiple data sets