more improvements on timeline