Compeltely changed the notifications capture logic.