Working in alerts.
Macro refactor.