Modified flter logic