Some changes to ChainHeal - needs some testing