som needs to be tested
Fix bug in main timeline