Added two timelines among other changes