Timeline optimization

Slight