fix notify
fix confirm