changed to work with the new filter methods.