added smarter exclusion