Add alerm and notification
merge