first pass on filters
fix merge conflict