fixes timeline
Merge branch 'timeline' into staging