changes according to new timeline design