Added timeline and timelineEnd