Merged mjanssen's timeline updates