Changed to use soft filtering instead of hard filtering