Improve timeline