Updated to use timers 2.1 when it is available.