Update timeline
Fix timeline
Merge pull request #23 from tomzabek/feature/timeline_56185984

[#56185984] Timeline