fixed timeline issues