new version to include filters and excludes