Updates to notification logic changes