refactoring, filtering on tools implemented