refactor timelines