removed dependency on filter