Sorted out the notifications