reworked notifications