Fixed Timeline Updating