filtering at a usable point
Merge branch 'filter'