Improved the filter