new timeline code
merge