Added Filtering
Added filtering