improved the notifications