added filteration feature