Added controlpoints and timers