More edits to the new filter