Some improvements on timeline