Reworked timed data to actually work in all scenarios.