Filtering adapter revised;