Added timeline and functionality