Added improved filter.