added notice check