Changed to new timer system.