Updates to data and time for getting data aligned to events ...