add timers
merge