Updated Notification code, via Mte90 on GitHub