#249 refactored excludes method