new timeline code from Than