Use new callback in place of timers
Use newer API when possible