Combined 2 filters into 1, kept old for legacy