Updated For New Notification System