C2 mohamed notifications update

@HebaElSobky please review all scenarioes