Now also working with filter.