Make the alert optional
Seperate out our data and alert.