reworking some notify messages