Make Timeline more efficient