Updates to support new alert (nondestructive version).