Changes to data handling, almost ready to process datasets