Implement alerts

#141 
remove change