I found a better way to manage notifications ...