updated and finished data collection and formatting