impriving basic notification implementation
little improvement