Added timeline and refined event