cleaned up timelines