Added Filter - modified logic