added in checks for notices