updated to add more exclusions