Small changes to get two timelines working nice together (just a tes)