The self-healing buddy