This is done in  `_add_filter` now right?