improve statability
fix the notification