Revamping the timers in state