Updated for whats notifications