Update to properly allow the option of clearing notification