Add health timer update
Merge