clean up; use better stores filter;