Added custom notifications and alerting

fixed