refactoring main timeline assembly