Some changes for timeline