Many changes to data handling and analysis