Reworking notifications