refactor
modify timeline