More cosmetic & add SendAlert