filter updates
merge conflict
fiilter changes, hopefully for the better