Re-working notification code again