Updated for whatsapp notifications