reworked notification a bit