finish filter with Brian
Merge conflicts fix