Next_Notification replaced with next_notification
tests passing