optimize message and notify #269