add notifier and fix bug