Updates on timeline, still some bugs