Rework health updating