updated data gathering