My changes to data gathering