Add an HA guard and use it