reverting new filter as it slowed things down :(