added other filtering