updated to allow exclusion list